[Libreoffice-commits] .: 4 commits - configure.in solenv/bin solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Sat May 21 15:02:41 PDT 2011
configure.in | 36 ++++++++++++++++++++++--------------
solenv/bin/build.pl | 8 --------
solenv/bin/deliver.pl | 7 -------
solenv/inc/_tg_shl.mk | 40 ++++++++++++++++++++--------------------
solenv/inc/tg_shl.mk | 4 ++--
solenv/inc/wntgcci.mk | 30 +++++++++++++++++++++---------
6 files changed, 65 insertions(+), 60 deletions(-)
New commits:
commit 6e5d7116a9ff6cb5079bcef1ecf5cfad272c333b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun May 22 01:02:27 2011 +0300
Use more libraries that MinGW does include
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index c3e0cb2..45d7346 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -180,7 +180,7 @@ SHELL32LIB=-lshell32
GDI32LIB=-lgdi32
OLE32LIB=-lole32
OLEAUT32LIB=-loleaut32
-UUIDLIB=$(WINDOWS_SDK_HOME)$/lib$/uuid.lib
+UUIDLIB=-luuid
WINSPOOLLIB=-lwinspool
IMM32LIB=-limm32
VERSIONLIB=-lversion
@@ -192,14 +192,26 @@ USER32LIB=-luser32
LIBCMT=-lmsvcrt
COMDLG32LIB=-lcomdlg32
COMCTL32LIB=-lcomctl32
-CRYPT32LIB=$(WINDOWS_SDK_HOME)$/lib$/crypt32.lib
-GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib
-DBGHELPLIB=$(WINDOWS_SDK_HOME)$/lib$/dbghelp.lib
-MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib
-DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib
-SHLWAPILIB=$(WINDOWS_SDK_HOME)$/lib$/shlwapi.lib
-URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib
+CRYPT32LIB=-lcrypt32
+DDRAWLIB=-lddraw
+SHLWAPILIB=-lshlwapi
WININETLIB=-lwininet
OLDNAMESLIB=-lmoldname
-MSIMG32LIB=$(WINDOWS_SDK_HOME)$/lib$/msimg32.lib
+MSIMG32LIB=-lmsimg32
PROPSYSLIB=-lpropsys
+
+# Libraries that neither mingw.org or mingw-w64 have.
+# Thus have to use the Windows SDK ones.
+GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib
+MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib
+URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib
+
+# Libraries that mingw-w64 has but mingw.org doesn't. At least the OBS MinGW
+# cross-compiler is based on mingw-w64. When using MinGW natively on Windows
+# (which as such I don't think we want to support) let's use the Windows SDK
+# libraries.
+.IF "$(CROSS_COMPILING)"=="YES"
+DBGHELPLIB=-ldbghelp
+.ELSE
+DBGHELPLIB=$(WINDOWS_SDK_HOME)$/lib$/dbghelp.lib
+.ENDIF
commit f45895346675b7ebbb403dfda7b19591f1dd2a50
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun May 22 01:01:19 2011 +0300
Improve system libcurl configury for cross-compilation
diff --git a/configure.in b/configure.in
index 8d20326..3e928df 100755
--- a/configure.in
+++ b/configure.in
@@ -4898,22 +4898,30 @@ if test -n "$with_system_curl" -o -n "$with_system_libs" && \
AC_MSG_RESULT([external])
SYSTEM_CURL=YES
- AC_PATH_PROG( CURLCONFIG, curl-config)
- if test -z "$CURLCONFIG"; then
- AC_MSG_ERROR([install curl to run this script])
- fi
-
- # check curl version
- AC_MSG_CHECKING([whether curl is >= 7.13.1])
- if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
- "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
- "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
- AC_MSG_ERROR([no, you need at least curl 7.13,1])
+ if test "$cross_compiling" = "yes"; then
+ PKG_CHECK_MODULES(CURL, libcurl)
+ curl_version=`$PKG_CONFIG --modversion libcurl`
else
- AC_MSG_RESULT([yes])
+ AC_PATH_PROG(CURLCONFIG, curl-config)
+ if test -z "$CURLCONFIG"; then
+ AC_MSG_ERROR([install curl to run this script])
+ fi
+ CURL_LIBS=`$CURLCONFIG --libs`
+ CURL_CFLAGS=`$CURLCONFIG --cflags`
+ curl_version=`$CURLCONFIG --version`
fi
- CURL_LIBS=`$CURLCONFIG --libs`
- CURL_CFLAGS=`$CURLCONFIG --cflags`
+
+ AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
+ case $curl_version in
+ dnl brackets doubled below because Autoconf uses them as m4 quote characters,
+ dnl so they need to be doubled to end up in the configure script
+ 7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
+ AC_MSG_RESULT([yes, you have $curl_version])
+ ;;
+ *)
+ AC_MSG_ERROR([no, you have $curl_version])
+ ;;
+ esac
else
AC_MSG_RESULT([internal])
SYSTEM_CURL=NO
commit 8a05f8857c3b0af254a4f34ae36c8d5c46e159fe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun May 22 00:59:10 2011 +0300
Put comments at start of line so they aren't shell comment recipe lines
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 1d93a76..f6b7cda 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -268,10 +268,10 @@ $(SHL1TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL1DEFAULTRES) $(MISC)/$(SHL1DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc $(SHL1DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL1DEFAULTRES)"!=""
@@ -743,10 +743,10 @@ $(SHL2TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL2DEFAULTRES) $(MISC)/$(SHL2DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc $(SHL2DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL2DEFAULTRES)"!=""
@@ -1218,10 +1218,10 @@ $(SHL3TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL3DEFAULTRES) $(MISC)/$(SHL3DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc $(SHL3DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL3DEFAULTRES)"!=""
@@ -1693,10 +1693,10 @@ $(SHL4TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL4DEFAULTRES) $(MISC)/$(SHL4DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc $(SHL4DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL4DEFAULTRES)"!=""
@@ -2168,10 +2168,10 @@ $(SHL5TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL5DEFAULTRES) $(MISC)/$(SHL5DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc $(SHL5DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL5DEFAULTRES)"!=""
@@ -2643,10 +2643,10 @@ $(SHL6TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL6DEFAULTRES) $(MISC)/$(SHL6DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc $(SHL6DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL6DEFAULTRES)"!=""
@@ -3118,10 +3118,10 @@ $(SHL7TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL7DEFAULTRES) $(MISC)/$(SHL7DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc $(SHL7DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL7DEFAULTRES)"!=""
@@ -3593,10 +3593,10 @@ $(SHL8TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL8DEFAULTRES) $(MISC)/$(SHL8DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc $(SHL8DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL8DEFAULTRES)"!=""
@@ -4068,10 +4068,10 @@ $(SHL9TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL9DEFAULTRES) $(MISC)/$(SHL9DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc $(SHL9DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL9DEFAULTRES)"!=""
@@ -4543,10 +4543,10 @@ $(SHL10TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL10DEFAULTRES) $(MISC)/$(SHL10DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc $(SHL10DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL10DEFAULTRES)"!=""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 1ba56e3..e94a952 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -297,10 +297,10 @@ $(SHL$(TNR)TARGETN) : \
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
.IF "$(RCFLAGSOUTRES)"!=""
- # rc, takes separate flag naming output file, source .rc file last
+# rc, takes separate flag naming output file, source .rc file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL$(TNR)DEFAULTRES) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
.ELSE
- # windres, just takes output file last
+# windres, just takes output file last
$(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc $(SHL$(TNR)DEFAULTRES)
.ENDIF
.ENDIF # "$(SHL$(TNR)DEFAULTRES)"!=""
commit df4bcdcf121fde796bdc2732f4f6f0f8423b9504
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 21 20:18:34 2011 +0300
Drop pointless version printout
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 9dda986..d4b842b 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -71,14 +71,6 @@
};
#### script id #####
- ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
- my $id_str = ' $Revision: 275224 $ ';
- my $script_rev = 0;
- $id_str =~ /Revision:\s+(\S+)\s+\$/
- ? ($script_rev = $1) : ($script_rev = "-");
-
- print "$script_name -- version: $script_rev\n";
-
#########################
# #
# Global Variables #
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 534accb..dcc82a8 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -43,11 +43,6 @@ use File::Spec;
( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-$id_str = ' $Revision: 275594 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
- ? ($script_rev = $1) : ($script_rev = "-");
-
-
#### globals ####
### valid actions ###
@@ -141,8 +136,6 @@ use sigtrap 'handler' => \&cleanup_and_die, 'normal-signals';
parse_options();
-print "$script_name -- version: $script_rev\n" if !$opt_silent;
-
if ( ! $opt_delete ) {
if ( $ENV{GUI} eq 'WNT' ) {
if ($ENV{COM} eq 'GCC') {
More information about the Libreoffice-commits
mailing list