Makefile.gbuild | 5 +++++
Makefile.in | 10 +++++-----
config_host.mk.in | 1 -
config_host_lang.mk.in | 7 ++++---
4 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 96e55121e5265775d2063ffa479d87513e58f42f
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu Dec 15 18:38:35 2022 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Dec 16 13:51:31 2022 +0000
create pocheck convenience target
it's usually run bypassing all the dependencies & make parsing using
LD_LIBRARY_PATH=instdir/program make cmd cmd='ALL_LANGS="$(ALL_LANGS)"
workdir/LinkTarget/Executable/pocheck'
but it doesn't hurt to also have it as a dedicated target
Change-Id: I742373eb0e4d87ea22c80da0dcaaba7116cd2937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144250
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit d117e3a45e662ac45b96c940459101376445a811)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144268
diff --git a/Makefile.gbuild b/Makefile.gbuild
index 37e787abe1b9..88279b16c7ff 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -62,4 +62,9 @@ create-partial-info:
$(eval MAR_NAME_PREFIX :=
$(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID))
MBSDIFF=$(WORKDIR)/LinkTarget/Executable/mbsdiff
MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_partial_update.py
"$(WORKDIR)" "$(MAR_NAME_PREFIX)" "$(UPDATE_CONFIG)" "$(PLATFORM)" "$(BUILDID)"
+# also possible to bypass the dependencies/the gbuild processing by just
running
+# LD_LIBRARY_PATH=instdir/program make cmd cmd='ALL_LANGS="$(ALL_LANGS)"
workdir/LinkTarget/Executable/pocheck'
+pocheck: | $(call gb_Executable_get_runtime_target,pocheck)
+ ALL_LANGS="$(ALL_LANGS)" $(call gb_Executable_get_command,pocheck) 2>&1
| tee $${POCHECK_LOG:-/tmp/pocheck.log}
+
# vim: set noet sw=4 ts=4:
diff --git a/Makefile.in b/Makefile.in
index 74acf9542e94..321df930b915 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -293,7 +293,7 @@ endif
build-non-l10n-only build-l10n-only check debugrun translations packageinfo
coverage $(gb_Top_MODULE_CHECK_TARGETS): build
-help showmodules gbuildtojson:
+help showmodules gbuildtojson pocheck:
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild $@
cross-toolset: bootstrap fetch install-gdb-printers
commit 744aebf5ed57b1bd50a031e5e5d9dd4334a7409e
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu Dec 15 16:26:11 2022 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Dec 16 13:51:22 2022 +0000
don't export the various language lists and consolidate them
this further frees the environment for Windows builders, to reduce the
risk of running into "environment is too large for exec" errors when
attempting to use xargs in a recipe.
Change-Id: I7e0b97163372018edb12329f24bb1dfafeefc526
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144235
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 183f5e38ee775f2e8c57bd061db80baf7da3b4c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144265
Tested-by: Jenkins
diff --git a/Makefile.in b/Makefile.in
index a326701b92eb..74acf9542e94 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -320,7 +320,7 @@ endif
define gb_Top_DoInstall
echo "$(1) in $(INSTALLDIR) ..." && \
-$(SRCDIR)/solenv/bin/ooinstall $(2) "$(INSTALLDIR)"
+WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/solenv/bin/ooinstall $(2)
"$(INSTALLDIR)"
endef
@@ -358,7 +358,7 @@ test-install: build
ifeq ($(OS_FOR_BUILD),WNT)
cd $(SRCDIR)/instsetoo_native && $(MAKE) LIBO_TEST_INSTALL=TRUE
$(GMAKE_OPTIONS)
else
- @$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
+ @WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/solenv/bin/ooinstall
$(TESTINSTALLDIR)
ifeq ($(OS),MACOSX)
#
# Create Resources/*.lproj directories for languages supported by macOS
@@ -449,10 +449,10 @@ endif
touch $@
distro-pack-install: install
- $(SRCDIR)/bin/distro-install-clean-up
+ WITH_LANG_LIST="$(WITH_LANG_LIST)"
WITH_POOR_HELP_LOCALIZATIONS="$(WITH_POOR_HELP_LOCALIZATIONS)"
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
$(SRCDIR)/bin/distro-install-sdk
- $(SRCDIR)/bin/distro-install-file-lists
+ WITH_LANG_LIST="$(WITH_LANG_LIST)"
$(SRCDIR)/bin/distro-install-file-lists
install-package-%:
$(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
diff --git a/config_host.mk.in b/config_host.mk.in
index 9cc66b5b6000..4068f1917c8f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -730,7 +730,6 @@ export WITH_KRB5=@WITH_KRB5@
export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
export WITH_LOCALES=@WITH_LOCALES@
export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
-export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
export WITH_THEMES=@WITH_THEMES@
export WITH_WEBDAV=@WITH_WEBDAV@
export WORKDIR=@WORKDIR@
diff --git a/config_host_lang.mk.in b/config_host_lang.mk.in
index dbd641499599..f6052bfcefcf 100644
--- a/config_host_lang.mk.in
+++ b/config_host_lang.mk.in
@@ -3,6 +3,7 @@
# 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@
+ALL_LANGS=@ALL_LANGS@
+WITH_LANG=@WITH_LANG@
+WITH_LANG_LIST=@WITH_LANG_LIST@
+WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
