.gitignore | 4 ++++
config_host.mk.in | 6 +++---
config_host_lang.mk.in | 8 ++++++++
configure.ac | 15 +++++++++++++++
solenv/gbuild/Extension.mk | 4 ++--
solenv/gbuild/Helper.mk | 3 +++
6 files changed, 35 insertions(+), 5 deletions(-)
New commits:
commit eff289ce454bb8e5c03fdecef184a30a86f3d506
Author: David Tardon <dtar...@redhat.com>
Date: Wed Mar 25 17:49:24 2015 +0100
correctly rebuild extension desc. l10ns when langs change
Change-Id: I4fb99c446f1ea0892d9210885d9d93f3dfe24ceb
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index a314003..bcfa256 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -71,13 +71,13 @@ $(call gb_Extension__get_preparation_target,%) :
mkdir -p $(dir $@) && touch $@)
ifeq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_workdir,%)/description.xml :
+$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Helper_LANGSTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),CPY,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_Extension_get_workdir,$*) && \
cp -f $(LOCATION)/description.xml $@)
else
-$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS)
+$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS)
$(gb_Helper_LANGSTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
$(call gb_Helper_abbreviate_dirs,\
commit f47e0bed6e4df408cfca1452be984a0a1b64956f
Author: David Tardon <dtar...@redhat.com>
Date: Wed Mar 25 17:48:55 2015 +0100
gbuild: allow to react on change in configured langs
Change-Id: I15492fcc687a21b740dc2d97a47485e2e760055f
diff --git a/.gitignore b/.gitignore
index 80968e3..ae1d141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,12 @@
/config_host.mk
/config_host.mk.last
/config_host.mk.stamp
+/config_host_lang.mk
+/config_host_lang.mk.last
+/config_host_lang.mk.stamp
/config_build
/config_build.mk
+/config_build_lang.mk
/configure
/lo.xcent
/Makefile
diff --git a/config_host.mk.in b/config_host.mk.in
index a242077..40a1989 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -16,7 +16,6 @@ export BUILDDIR=@BUILDDIR@
export ABW_CFLAGS=$(gb_SPACE)@ABW_CFLAGS@
export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@
export ALLOC=@ALLOC@
-export ALL_LANGS=@ALL_LANGS@
export ANDROID_APP_ABI=@ANDROID_APP_ABI@
export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
@@ -624,8 +623,6 @@ export WITH_GALLERY_BUILD=@WITH_GALLERY_BUILD@
export WITH_GSSAPI=@WITH_GSSAPI@
export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@
export WITH_KRB5=@WITH_KRB5@
-export WITH_LANG=@WITH_LANG@
-export WITH_LANG_LIST=@WITH_LANG_LIST@
export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
export WITH_LOCALES=@WITH_LOCALES@
export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
@@ -654,6 +651,9 @@ export XSLTPROC=@XSLTPROC@
export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
+# lang-related stuff
+include config_$(gb_Side)_lang.mk
+
# tarball names
# does use some of the variables defined above
include @SRC_ROOT@/download.lst
diff --git a/config_host_lang.mk.in b/config_host_lang.mk.in
new file mode 100644
index 0000000..dbd6414
--- /dev/null
+++ b/config_host_lang.mk.in
@@ -0,0 +1,8 @@
+ # language-related config variables for LibreOffice
+ # this file is intended to be able to be included in a Makefile
+ # and not to be sourced in a shell session
+ #
+
+export ALL_LANGS=@ALL_LANGS@
+export WITH_LANG=@WITH_LANG@
+export WITH_LANG_LIST=@WITH_LANG_LIST@
diff --git a/configure.ac b/configure.ac
index 11b942c..459a458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4448,6 +4448,7 @@ if test "$cross_compiling" = "yes"; then
solenv/bin/getcompver.awk \
solenv/inc/langlist.mk \
config_host.mk.in \
+ config_host_lang.mk.in \
Makefile.in \
lo.xcent.in \
instsetoo_native/util/openoffice.lst.in \
@@ -4499,6 +4500,7 @@ if test "$cross_compiling" = "yes"; then
2>&1 | sed -e 's/^/ /'
test -f ./config_host.mk 2>/dev/null || exit
cp config_host.mk ../config_build.mk
+ cp config_host_lang.mk ../config_build_lang.mk
mv config.log ../config.Build.log
mkdir -p ../config_build
mv config_host/*.h ../config_build
@@ -12902,8 +12904,12 @@ AC_SUBST(LO_PATH)
if test -f config_host.mk; then
config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
fi
+if test -f config_host_lang.mk; then
+ config_lang_md5=`$MD5SUM config_host_lang.mk | sed "s/ .*//"`
+fi
AC_CONFIG_FILES([config_host.mk
+ config_host_lang.mk
Makefile
lo.xcent
instsetoo_native/util/openoffice.lst
@@ -12949,6 +12955,15 @@ else
echo > config_host.mk.stamp
fi
+# touch the config lang timestamp file
+if test ! -f config_host_lang.mk.stamp; then
+ echo > config_host_lang.mk.stamp
+elif test "$config_lang_md5" = `$MD5SUM config_host_lang.mk | sed "s/ .*//"`;
then
+ echo "Configuration unchanged - avoiding scp2 stamp update"
+else
+ echo > config_host_lang.mk.stamp
+fi
+
if test "$STALE_MAKE" = "TRUE" -a "$build_os" = "cygwin"; then
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 62817f5..253d6db 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -25,6 +25,9 @@ gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
# general purpose empty dummy target
gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY
+# target for reacting to changes in the list of configured languages
+gb_Helper_LANGSTARGET := $(BUILDDIR)/config_$(gb_Side)_lang.mk.stamp
+
.PHONY : $(WORKDIR)/Misc/PHONY
$(gb_Helper_MISCDUMMY) :
@mkdir -p $(dir $@) && touch $@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
