[Libreoffice-commits] .: configure.in download .gitignore Makefile.in post_download.in set_soenv.in solenv/bin solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Mon May 16 16:27:59 PDT 2011
.gitignore | 1 -
Makefile.in | 32 ++++++++++++++++----------------
configure.in | 8 ++++----
download | 7 ++++---
post_download.in | 6 +++---
set_soenv.in | 3 ++-
solenv/bin/relocate | 2 +-
solenv/inc/settings.mk | 6 +++---
solenv/inc/startup/startup.mk | 2 +-
solenv/inc/tg_ext.mk | 2 +-
10 files changed, 35 insertions(+), 34 deletions(-)
New commits:
commit ec51434ee1709540c899b250e0bb4c2bef7b3b24
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue May 17 02:22:19 2011 +0300
More cross-compiling work
AC_SUBST also EXEEXT_FOR_BUILD and use that in Makefile.in.
As winemv.set.sh is now called WindowsMSVCEnv.Set.sh, with capital E
and S like all the others, we can simplify the glob pattern for the
Set.sh file.
Don't attempt to download and/or run unpackers for dependencies
relevant only when using MSVC if using MinGW.
Misc other Windows host vs. build fixes.
diff --git a/.gitignore b/.gitignore
index 14df675..c17ae1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,6 @@
/install
/downloaded
/*.Set.sh
-/winenv.set.sh
/ID
/tags
/docs
diff --git a/Makefile.in b/Makefile.in
index 54e93cf..9b9dcbf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,14 +8,14 @@ else
GBUILD_OPT:=--gmake
endif
-all: Makefile dmake/dmake at EXEEXT@ src.downloaded
+all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
cd instsetoo_native && \
build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
install:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
echo "Installing in $${prefix:- at prefix@}..." && \
ooinstall "$${prefix:- at prefix@}" && \
echo "" && \
@@ -23,27 +23,27 @@ install:
echo "$${prefix:- at prefix@}/program/soffice"
dev-install:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
ooinstall -l @abs_builddir@/install && \
echo "" && \
echo "Developer installation finished, you can now execute:" && \
echo "@abs_builddir@/install/program/soffice"
-distclean: dmake/dmake at EXEEXT@
- @. ./*[Ee]nv.[Ss]et.sh && \
+distclean: dmake/dmake at EXEEXT_FOR_BUILD@
+ @. ./*Env.Set.sh && \
dmake distclean
-clean: dmake/dmake at EXEEXT@
- @. ./*[Ee]nv.[Ss]et.sh && \
+clean: dmake/dmake at EXEEXT_FOR_BUILD@
+ @. ./*Env.Set.sh && \
dmake clean && \
if [ -n "$$USE_GMAKE" ] ; then make -f GNUmakefile.mk -sr clean ; fi
-dmake/dmake at EXEEXT@:
- @. ./*[Ee]nv.[Ss]et.sh && \
+dmake/dmake at EXEEXT_FOR_BUILD@:
+ @. ./*Env.Set.sh && \
./bootstrap
src.downloaded: ooo.lst download
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
fetch: src.downloaded
@@ -51,20 +51,20 @@ fetch: src.downloaded
Makefile: configure.in set_soenv.in Makefile.in
./autogen.sh
-check: Makefile dmake/dmake at EXEEXT@ fetch
- @. ./*[Ee]nv.[Ss]et.sh && \
+check: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ fetch
+ @. ./*Env.Set.sh && \
cd smoketestoo_native && \
export SAL_USE_VCLPLUGIN="svp" && \
build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
id:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
create-ids
tags:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
create-tags
docs:
- @. ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*Env.Set.sh && \
mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
diff --git a/configure.in b/configure.in
index fbffd51..5b652d2 100755
--- a/configure.in
+++ b/configure.in
@@ -1292,11 +1292,11 @@ fi
AC_SUBST(CROSS_COMPILING)
if test "$build_os" = "cygwin"; then
- BUILD_EXEEXT=.exe
+ EXEEXT_FOR_BUILD=.exe
else
- BUILD_EXEEXT=
+ EXEEXT_FOR_BUILD=
fi
-
+AC_SUBST(EXEEXT_FOR_BUILD)
dnl ===================================================================
dnl check for required programs (grep, awk, sed, bash)
@@ -5932,7 +5932,7 @@ if test "$_os" = "WINNT" ; then
if test "$build_os" = "cygwin"; then
with_nsis_path=`cygpath -u "$with_nsis_path"`
fi
- if test -e "$with_nsis_path/makensis$BUILD_EXEEXT"; then
+ if test -e "$with_nsis_path/makensis$EXEEXT_FOR_BUILD"; then
NSIS_PATH="$with_nsis_path"
elif test "$build_os" = "cygwin"; then
nsistest=`./oowintool --nsis-dir`;
diff --git a/download b/download
index a4c71d7..c8a5ad8 100755
--- a/download
+++ b/download
@@ -28,7 +28,7 @@
# environment setup yet?
if [ -z "$TARFILE_LOCATION" ]; then
- . ./*[Ee]nv.[Ss]et.sh
+ . ./*Env.Set.sh
fi
# we want to clone if we are in the bootstrap git repo and clone does not exist yet
@@ -173,7 +173,7 @@ for i in $filelist ; do
fi
done
-if [ "$GUI" = "WNT" ]; then
+if [ "$COM" = "MSC" ]; then
downloaditem "http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US/" "dbghinst.EXE" "096f1d53d9ba09cde27d6f7c2ea6cc47"
downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd"
@@ -201,7 +201,8 @@ if [ ! -z "$failed" ]; then
exit 1
fi
-if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then
+if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
+ # This can be run only on Windows itself (Cygwin)
TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
chmod a+w $TARFILE_LOCATION/tmp
if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbghinst.EXE ]; then
diff --git a/post_download.in b/post_download.in
index ff639f8..fc4207e 100755
--- a/post_download.in
+++ b/post_download.in
@@ -21,7 +21,7 @@ case "$host_os" in
gnu)
_os=GNU
;;
- cygwin*) # Windows
+ cygwin*|mingw32*) # Windows
_os=WINNT
;;
darwin*) # Mac OS X or iOS
@@ -69,7 +69,7 @@ fi
dnl ===================================================================
dnl Windows builds - use oowintool to copy CRT dlls and manifest
dnl ===================================================================
-if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
+if test "$COM" = "MSC"; then
if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
:
else
@@ -95,7 +95,7 @@ fi
dnl ===================================================================
dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/
dnl ===================================================================
-if test "$_os" = "WINNT"; then
+if test "$COM" = "MSC"; then
AC_MSG_CHECKING([for vcredist_x86.exe])
if test -e ./external/vcredist/vcredist_x86.exe; then
AC_MSG_RESULT([found])
diff --git a/set_soenv.in b/set_soenv.in
index fe5e640..826a11f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -665,7 +665,8 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
# At the moment this implies the use of tcsh
# WTF does that mean?
$FLIPCMD = "slfl.pl";
- $PATH_SEPERATOR = ';' if '@build_os@' eq 'cygwin';
+ $PATH_SEPERATOR = ';';
+ $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin';
$outfile = "WindowsMinGWEnv.Set.sh";
$COMPATH = PathFormat('@COMPATH@/bin');
$COMPATH =~ s/\/bin$//i;
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
index 4e9fe68..6a5cfb9 100755
--- a/solenv/bin/relocate
+++ b/solenv/bin/relocate
@@ -45,7 +45,7 @@ sub sniff_set($)
opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
while ($fname = readdir ($dirhandle)) {
- $fname =~ /[Ss]et.sh$/ && last;
+ $fname =~ /Set.sh$/ && last;
}
closedir ($dirhandle);
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 80c6b72..04dfd34 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -320,11 +320,11 @@ dbgutil=
# ---------------------------------------------------------------------------
DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI_FOR_BUILD)"=="WNT"
posix_PWD:=/cygdrive/$(PWD:s/://)
-.ELSE #GUI)"=="WNT"
+.ELSE
posix_PWD:=$(PWD)
-.ENDIF #GUI)"=="WNT"
+.ENDIF
.IF "$(TMP)"!=""
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index bd028d8..da4f38e 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -42,7 +42,7 @@ OS_variable_needed
# Customize macro definitions based on seting of OS.
# This must come before the default macro definitions which follow.
-.IF "$(OS)" == "WNT"
+.IF "$(OS_FOR_BUILD)" == "WNT"
.INCLUDE: $(INCFILENAME:d)wnt/macros.mk
.END
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index d219302..65dfe4a 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -39,7 +39,7 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
.EXPORT : LDFLAGS
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI_FOR_BUILD)"=="WNT"
PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH)
.ELSE # "$(GUI)"=="WNT"
PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
More information about the Libreoffice-commits
mailing list