[Libreoffice-commits] .: 5 commits - bootstrap config_host.mk.in configure.in connectivity/source download .gitignore set_soenv.in solenv/bin solenv/gbuild
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Dec 24 19:42:25 PST 2011
.gitignore | 2
bootstrap | 9 ++++
config_host.mk.in | 5 ++
configure.in | 31 +++------------
connectivity/source/drivers/mozab/bootstrap/makefile.mk | 1
connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 1
download | 2
set_soenv.in | 13 +++---
solenv/bin/create-ids | 2
solenv/bin/create-tags | 2
solenv/bin/lo_proxy_start | 4 -
solenv/gbuild/extensions/post_AuxTargets.mk | 2
solenv/gbuild/extensions/post_BuildplTargets.mk | 2
solenv/gbuild/extensions/post_SpeedUpTargets.mk | 14 +++---
solenv/gbuild/source_and_rerun.mk | 2
15 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 8b18c70b994e8239f2f0dfd549fcc27feceb413c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 24 19:51:57 2011 -0600
clean-up remnant obsolete CALL_CDECL
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index c4c1d21..c259fa9 100755
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -24,7 +24,6 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-CALL_CDECL=TRUE
PRJ=..$/..$/..$/..
PRJINC=..$/..$/..
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index 810be9b..60992c8 100755
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -24,7 +24,6 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-CALL_CDECL=TRUE
#mozilla specific stuff.
MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
commit c201ede9f9634cf67be219d751fe467d69cb67ee
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 24 19:44:03 2011 -0600
do not export SUNTEMPLATE_LANG. Not used anywhere
diff --git a/configure.in b/configure.in
index b676254..405e64e 100644
--- a/configure.in
+++ b/configure.in
@@ -8282,7 +8282,6 @@ dnl Test whether to include Sun Professional Template Pack
dnl ===================================================================
AC_MSG_CHECKING([for Sun Professional Template Pack integration (only supported languages displayed)])
if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
- SUNTEMPLATES_LANG=""
AC_MSG_RESULT([no integration])
else
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK"
@@ -8321,7 +8320,6 @@ else
done
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
fi
-AC_SUBST(SUNTEMPLATES_LANG)
AC_SUBST(SUNTEMPLATES_DE_PACK)
AC_SUBST(SUNTEMPLATES_EN_US_PACK)
AC_SUBST(SUNTEMPLATES_ES_PACK)
diff --git a/set_soenv.in b/set_soenv.in
index b639ba6..1a765cd 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1763,7 +1763,6 @@ ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
ToFile( "OOOBLOGGER_EXTENSION_PACK", "@OOOBLOGGER_EXTENSION_PACK@","e" );
-ToFile( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
commit 6419c7ff2378e58c25c2da44e317d76d547fc99c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 24 19:41:45 2011 -0600
binned XAU_LIBS from configure.in. Not used anywhere.
diff --git a/configure.in b/configure.in
index 516d46b..b676254 100644
--- a/configure.in
+++ b/configure.in
@@ -6393,8 +6393,6 @@ elif test "$_os" != "WINNT" -a "$_os" != "Android" -a "$_os" != "iOS"; then
CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
- dnl Check if the XauDisposeAuth symbol is provided by libXau.
- AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
else
x_includes="no_x_includes"
x_libraries="no_x_libraries"
@@ -6420,7 +6418,6 @@ else
XLIB="$x_libraries"
fi
AC_SUBST(XLIB)
-AC_SUBST(XAU_LIBS)
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "Android" -a "$_os" != "iOS"; then
dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 2e02ce1..b639ba6 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1943,7 +1943,6 @@ ToFile( "SYSTEM_LIBEXTTEXTCAT", "@SYSTEM_LIBEXTTEXTCAT@", "e" );
ToFile( "SYSTEM_LIBEXTTEXTCAT_DATA","@SYSTEM_LIBEXTTEXTCAT_DATA@","e" );
ToFile( "LIBEXTTEXTCAT_CFLAGS", "@LIBEXTTEXTCAT_CFLAGS@", "e" );
ToFile( "LIBEXTTEXTCAT_LIBS", "@LIBEXTTEXTCAT_LIBS@", "e" );
-ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" );
ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
ToFile( "MERGELIBS", "@MERGELIBS@", "e" );
commit 3a9779239efb82c630f960c547bc8df0444eb75d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 24 19:40:11 2011 -0600
binned --enable-static-gtk... no used anywhere.
diff --git a/configure.in b/configure.in
index b0e09b5..516d46b 100644
--- a/configure.in
+++ b/configure.in
@@ -625,12 +625,6 @@ AC_ARG_ENABLE(gio,
[Determines whether to use the GIO support.]),
,enable_gio=no)
-AC_ARG_ENABLE(static-gtk,
- AS_HELP_STRING([--enable-static-gtk],
- [Modules that are linked against GTK+ libraries use the static libraries
- instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ libraries.)]),
-,)
-
AC_ARG_ENABLE(build-mozilla,
AS_HELP_STRING([--disable-build-mozilla],
[Use this option if you do not want to build the Mozilla components from
@@ -9547,16 +9541,6 @@ INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
AC_MSG_RESULT([$INSTALLDIR])
AC_SUBST(INSTALLDIR)
-AC_MSG_CHECKING([whether to statically link to Gtk])
-if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
- ENABLE_STATIC_GTK="TRUE"
- AC_MSG_RESULT([yes])
-else
- ENABLE_STATIC_GTK="FALSE"
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_STATIC_GTK)
-
# ===================================================================
# De- or increase default verbosity of build process
# ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 6b97f3b..2e02ce1 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1414,7 +1414,6 @@ ToFile( "GTK3_LIBS", "@GTK3_LIBS@", "e" );
ToFile( "GTHREAD_CFLAGS", "@GTHREAD_CFLAGS@", "e" );
ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" );
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
-ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" );
commit fd9366c85cdb627886901b7c09ef267b294d5d98
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 24 19:25:58 2011 -0600
prep work to eliminated Env.*.sh, introduce config_{host,build}.mk
This introduce config_host.mk and config_build.mk
generated from config_host.mk.in
The intent is for that file to be both sourcable in a shell and includable
in a gnu Makefile.
Eventually all the environment set-up will be in config_host.mk.in
and so there won't be a need to source anything in shell before make.
diff --git a/.gitignore b/.gitignore
index 705ddbd..11ed5b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,8 @@
/config.log
/config.status
/config.parms
+/config_host.mk
+/config_build.mk
/configure
/desktop/scripts/soffice.sh
/makefile.mk
diff --git a/bootstrap b/bootstrap
index 26ade9a..9faa842 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,5 +1,14 @@
#!/bin/sh
+if test -z "${SRC_ROOT}"; then
+ if test -f ./config_build.mk ; then
+ . ./config_build.mk
+ else
+ if test -f ./config_host.mk ; then
+ . ./config_host.mk
+ fi
+ fi
+fi
if test -z "${SOLARENV}"; then
if test -f ./Env.Build.sh ; then
. ./Env.Build.sh
diff --git a/config_host.mk.in b/config_host.mk.in
new file mode 100644
index 0000000..35b9779
--- /dev/null
+++ b/config_host.mk.in
@@ -0,0 +1,5 @@
+ # config variable for LibreOffice
+ # this file is intented to be able to be included in a Makefile
+ # or to be sourced in a shell session
+ #
+export SRC_ROOT="@SRC_ROOT@"
diff --git a/configure.in b/configure.in
index 8ef3cdb..b0e09b5 100644
--- a/configure.in
+++ b/configure.in
@@ -2240,6 +2240,7 @@ if test "$cross_compiling" = "yes"; then
bin/repo-list.in \
build_env.in \
config.guess \
+ config_host.mk.in \
configure \
ooo.lst.in \
oowintool \
@@ -2271,8 +2272,11 @@ if test "$cross_compiling" = "yes"; then
$sub_conf_opts \
2>&1 | sed -e 's/^/ /'
test -f ./Env.Host.sh 2>/dev/null || exit
+ test -f ./config_host.mk 2>/dev/null || exit
+ cp config_host.mk ../config_build.mk
cp Env.Host.sh ../Env.Build.sh
cp config.log ../config.Build.log
+ . ./config_host.mk
. ./Env.Host.sh
for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
SYSTEM_LIBXSLT; do
@@ -2295,8 +2299,10 @@ if test "$cross_compiling" = "yes"; then
done
)
test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
+ test -f config_build.mk || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
+ perl -pi -e 's,/CONF-FOR-BUILD,,g' config_build.mk
eval `cat CONF-FOR-BUILD/build-config`
AC_MSG_RESULT([checking for BUILD platform configuration... done])
rm -rf CONF-FOR-BUILD
@@ -9746,7 +9752,7 @@ else
echo > set_soenv.last
fi
-AC_CONFIG_FILES([ooo.lst set_soenv bin/repo-list desktop/scripts/soffice.sh build_env])
+AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list desktop/scripts/soffice.sh build_env])
AC_OUTPUT
# make sure this is executable
@@ -9765,6 +9771,6 @@ dnl Run the set_soenv script to setup the Env.Host.sh script that sets
dnl environment variables for the build.
chmod +x set_soenv
-./set_soenv
+. ./config_host.mk && ./set_soenv
dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/download b/download
index 279263c..a154876 100755
--- a/download
+++ b/download
@@ -28,7 +28,7 @@
# environment setup yet?
if [ -z "$TARFILE_LOCATION" ]; then
- . ./Env.Host.sh
+ . ./config_host.mk && . ./Env.Host.sh
fi
# we want to clone if we are in the bootstrap git repo and clone does not exist yet
diff --git a/set_soenv.in b/set_soenv.in
index b88c0cf..6b97f3b 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -741,8 +741,8 @@ print "done\n";
#
# If the directory does not exist something is strange.
# 1. LibreOffice build home directory.
-chomp($SRC_ROOT = `pwd`);
-$SRC_ROOT = PathFormat($SRC_ROOT);
+# SRC_ROOT should already be in the env due to config_host.mk
+$SRC_ROOT = $ENV{"SRC_ROOT"};
CheckPathExist( $SRC_ROOT );
@@ -1337,7 +1337,6 @@ open( OUT, ">$SRC_ROOT/$outfile" ) ||
# Write file header.
CreateFileHeader( *OUT, $UPD, $platform, "sh/bash/ksh", "#" );
-ToFile( "SRC_ROOT", $SRC_ROOT, "e" );
ToFile( "OOO_SHELL", $OOO_SHELL, "e" );
ToFile( "JAVA_HOME", $JAVA_HOME, "e" );
ToFile( "L10N_MODULE", $L10N_MODULE, "e" );
@@ -2135,6 +2134,11 @@ sub CreateFileHeader
print { $filehandle } "$comment 2. source $outfile $newline";
print { $filehandle } "$comment #################################################################";
print { $filehandle } $newline;
+ print { $filehandle } 'if test -z "$SRC_ROOT" ; then';
+ print { $filehandle } $newline;
+ print { $filehandle } " . $SRC_ROOT/config_host.mk $newline";
+ print { $filehandle } "fi $newline";
+ print { $filehandle } $newline;
}
#---------------------------------------------------------
# Function name: ToFile
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index 5b43d20..8744a38 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -2,7 +2,7 @@
# create ID file for the whole LibO tree. run it in toplevel dir
-. ./Env.Host.sh
+./config_host.mk && . ./Env.Host.sh
# --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc)
if [ "$1" = "--with-outpath" ]; then
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index c93bcd9..4d0f2bd 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -1,6 +1,6 @@
#!/usr/bin/env sh
-. ./Env.Host.sh
+./config_host.mk && . ./Env.Host.sh
omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
diff --git a/solenv/bin/lo_proxy_start b/solenv/bin/lo_proxy_start
index 67dcabf..8aabf28 100755
--- a/solenv/bin/lo_proxy_start
+++ b/solenv/bin/lo_proxy_start
@@ -12,8 +12,8 @@ if [ -z "$SRC_ROOT" ] ; then
SRC_ROOT=$($bin_dir/lo_find_src_root) || exit 1
fi
if [ -z "$SOLARINC" ] ; then
- if [ -e "$SRC_ROOT/config.mk" ] ; then
- . "$SRC_ROOT/config.mk"
+ if [ -e "$SRC_ROOT/config_host.mk" ] ; then
+ . "$SRC_ROOT/config_host.mk"
fi
if [ -e "$SRC_ROOT/Env.Host.sh" ] ; then
. "$SRC_ROOT/Env.Host.sh"
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index 72414b7..354a91b 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -78,7 +78,7 @@ clean-build:
distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
- cd $(SRCDIR) && rm -rf Env.Host.sh autogen.lastrun autom4te.cache \
+ cd $(SRCDIR) && rm -rf config_host.mk config_build.mk Env.Host.sh Env.Build.sh autogen.lastrun autom4te.cache \
bin/repo-list build_env config.log config.status \
desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index b2e650d..4b60eb2 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -117,7 +117,7 @@ build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(I
$(call gb_BuildplTarget_command,instsetoo_native,--all)
cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
- source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all)
+ source $(SRCDIR)/config_build.mk && source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all)
# experimental callcatcher target
# http://www.skynet.ie/~caolan/Packages/callcatcher.html
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 0abbe5e..f6df03b 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -1,24 +1,24 @@
# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#
+#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
+#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
-#
+#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
-#
+#
# Major Contributor(s):
# [ Copyright (C) 2011 Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (initial developer) ]
-#
+#
# All Rights Reserved.
-#
+#
# For minor contributions see the git repository.
-#
+#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk
index a2aaea0..4d8101a 100644
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@@ -21,7 +21,7 @@ endif
source-env-and-recurse:
@$(gb_SourceEnvAndRecurse_reconfigure) && \
- if test -f $(SRCDIR)/config.mk ; then . $(SRCDIR)/config.mk; fi && \
+ if test -f $(SRCDIR)/config_host.mk ; then . $(SRCDIR)/config_host.mk; fi && \
if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \
if test -z "$${SOLARENV}"; then echo "no configuration found and could not create one" && exit 1; fi && \
$(gb_SourceEnvAndRecurse_buildpl) && \
More information about the Libreoffice-commits
mailing list