bin/distro-install-clean-up | 3 --- bin/distro-install-desktop-integration | 3 --- bin/distro-install-file-lists | 3 --- bin/distro-install-sdk | 3 --- config_host.mk.in | 4 ++-- config_host.mk.source | 12 ------------ configure.ac | 4 ++-- download | 2 +- 8 files changed, 5 insertions(+), 29 deletions(-)
New commits: commit 06b68aaf9bb9cd4084ca78ff69cb30b947d8f996 Author: Norbert Thiebaud <[email protected]> Date: Wed Nov 14 05:16:32 2012 -0600 allow to override PARALLELISM and CHECK_PARALLELISM at make time this allow for CHECK_PARALLELISM=1 make check Change-Id: Id7dee09440dda54588965a846f950176d2b4c671 diff --git a/config_host.mk.in b/config_host.mk.in index 57db3f3..8e4c7df 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -62,7 +62,7 @@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ export CDR_TARBALL=@CDR_TARBALL@ @x_CFLAGS@ export CFLAGS=@CFLAGS@ -export CHECK_PARALLELISM=@CHECK_PARALLELISM@ +export CHECK_PARALLELISM?=@CHECK_PARALLELISM@ export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@ export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@ @@ -211,7 +211,7 @@ export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@ export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@ export GIT_LINK_SRC=@GIT_LINK_SRC@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@ -export PARALLELISM=@PARALLELISM@ +export PARALLELISM?=@PARALLELISM@ export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@ export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@ @x_GNUCP@ export GNUCOPY=@GNUCP@ commit 7c319154f85c9905842c2f0adb32d1ffda980ba7 Author: Norbert Thiebaud <[email protected]> Date: Wed Nov 14 05:13:47 2012 -0600 stop sourcing config_host wholesale, use get_config_variables instead Change-Id: I1390da403a2f0aab0f4e8323daa9f2fad4ba2550 diff --git a/config_host.mk.source b/config_host.mk.source deleted file mode 100644 index 786e271..0000000 --- a/config_host.mk.source +++ /dev/null @@ -1,12 +0,0 @@ -# this script allows to correctly source config_host.mk into existing shell -# -# Usage: -# -# source ./config_host.mk.source - -temp_conf=`mktemp config_host.mk.XXXXXX` -sed -n -e 's/$(gb_SPACE)/ /g' \ - -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/p' \ - -e 's/^\s*export\s\+\([A-Z0-9_]*\)?=\(.*\)$/export \1="${\1:-\2}"/p' config_host.mk >$temp_conf -source ./$temp_conf -rm $temp_conf diff --git a/configure.ac b/configure.ac index 55ed524..1acf4b5 100644 --- a/configure.ac +++ b/configure.ac @@ -4077,7 +4077,6 @@ if test "$cross_compiling" = "yes"; then tar cf - \ config.guess \ config_host.mk.in \ - config_host.mk.source \ configure \ ooo.lst.in \ oowintool \ @@ -4134,7 +4133,8 @@ if test "$cross_compiling" = "yes"; then test -f ./config_host.mk 2>/dev/null || exit cp config_host.mk ../config_build.mk cp config.log ../config.Build.log - . ./config_host.mk.source + . ./bin/get_config_variables COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR + for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ PYTHON SYSTEM_LIBXSLT; do VV='$'$V commit 5e026220bcc5947d33536a333192d1844b78253e Author: Norbert Thiebaud <[email protected]> Date: Wed Nov 14 05:03:05 2012 -0600 bin/distro-install* are called from Makefile so the env is already there Change-Id: I11242a896297f71ce0977c5ffeadf5f64f61455e diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up index 170ceb9..701c9ff 100755 --- a/bin/distro-install-clean-up +++ b/bin/distro-install-clean-up @@ -1,9 +1,6 @@ #!/bin/sh if test -z "${SRC_ROOT}"; then - source ./config_host.mk.source -fi -if test -z "${SOLARENV}"; then echo "distro-install-clean-up: No environment set!" exit 1 fi diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index c5482a8..ab7da92 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -1,9 +1,6 @@ #!/bin/sh if test -z "${SRC_ROOT}"; then - source ./config_host.mk.source -fi -if test -z "${SOLARENV}"; then echo "distro-install-clean-up: No environment set!" exit 1 fi diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index ce31590..9a9375d 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -1,9 +1,6 @@ #!/bin/sh if test -z "${SRC_ROOT}"; then - source ./config_host.mk.source -fi -if test -z "${SOLARENV}"; then echo "distro-install-clean-up: No environment set!" exit 1 fi diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk index 7184f35..7b1504e 100755 --- a/bin/distro-install-sdk +++ b/bin/distro-install-sdk @@ -1,9 +1,6 @@ #!/bin/sh if test -z "${SRC_ROOT}"; then - source ./config_host.mk.source -fi -if test -z "${SOLARENV}"; then echo "distro-install-clean-up: No environment set!" exit 1 fi commit 02b013cf9efd76c770f95e6d4c050c828f280003 Author: Norbert Thiebaud <[email protected]> Date: Wed Nov 14 04:23:50 2012 -0600 use get_config_variables in ./download Change-Id: Ibe36598dfc6aa5205d43556c5e809be8c716f626 diff --git a/download b/download index 6e8762a..c6e94d2 100755 --- a/download +++ b/download @@ -30,7 +30,7 @@ set -o pipefail # environment setup yet? if [ -z "$TARFILE_LOCATION" ]; then - . ./config_host.mk.source + . ./bin/get_config_variables TARFILE_LOCATION GIT_LINK_SRC GIT_NEEDED_SUBMODULES COM CPUNAME VCVER DBGHELP_DLL SRC_ROOT OXYGENOFFICE_PACK fi # we want to clone if we are in the bootstrap git repo and clone does not exist yet _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
