subject:"core.git\: solenv\/gbuild"

core.git: solenv/gbuild

2024-06-05 Thread Olivier Hallot (via logerrit)

 solenv/gbuild/HelpTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 870200f9ce451dfbb6188d4c2a024f59adb09f47
Author: Olivier Hallot 
AuthorDate: Wed Jun 5 07:52:50 2024 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jun 5 17:42:16 2024 +0200

Simplify make.clean in helpcontent2 gbuild

Change-Id: I795aa46943b4433624dfc04e9962e2a40528d188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168470
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 7047a36d7e6d..2e6c5d9e01e7 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -71,7 +71,7 @@ $(call gb_HelpTranslatePartTarget_get_target,%) : 
$(gb_HelpTranslatePartTarget_D
 
 clear_HelpTranslatePartTarget:
$(call gb_Output_announce,clear HelpTranslatePartTarget,$(false),HPX,1)
-   rm -rf  $(call gb_HelpTranslatePartTarget_workdir)
+   rm -rf $(gb_HelpTranslatePartTarget_workdir)
 
 # Translate a set of .xhp files from one directory.
 #

core.git: solenv/gbuild

2024-06-05 Thread Olivier Hallot (via logerrit)

 solenv/gbuild/HelpTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea67891bb9a554efb93f43ae73fc6a9a58dcc040
Author: Olivier Hallot 
AuthorDate: Tue Jun 4 15:26:44 2024 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jun 5 12:07:28 2024 +0200

Fix make 'clean' command in helpcontents2/

Change-Id: I1bc66a8f4a4c258983e1fa141cc106bd52c27dfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168412
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 2a629fcbd129..7047a36d7e6d 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -71,7 +71,7 @@ $(call gb_HelpTranslatePartTarget_get_target,%) : 
$(gb_HelpTranslatePartTarget_D
 
 clear_HelpTranslatePartTarget:
$(call gb_Output_announce,clear HelpTranslatePartTarget,$(false),HPX,1)
-   rm -rf  $(call gb_HelpTranslatePartTarget_get_workdir)
+   rm -rf  $(call gb_HelpTranslatePartTarget_workdir)
 
 # Translate a set of .xhp files from one directory.
 #

core.git: solenv/gbuild

2024-06-04 Thread Andrea Gelmini (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d947d39bedbae88b19be99fd3b43c612a25ea500
Author: Andrea Gelmini 
AuthorDate: Mon Jun 3 15:49:26 2024 +0200
Commit: Julien Nabet 
CommitDate: Tue Jun 4 08:58:45 2024 +0200

Fix typo

Change-Id: I2c8899e5ab779dbd94c5096c72e2fbb09e40d4ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168377
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 67aa47320c6c..ce1a1ed7ea5e 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -104,7 +104,7 @@ gb_AFLAGS := $(AFLAGS)
 
 # C4706: assignment within conditional expression
 
-# build-time penalty is to high for ci use/disable when JENKINS_HOME is set
+# build-time penalty is too high for ci use/disable when JENKINS_HOME is set
 MSVC_ANALYZE_FLAGS := $(if 
$(JENKINS_HOME),,-analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset)
 
 gb_FilterOutClangCFLAGS += $(MSVC_ANALYZE_FLAGS)

core.git: solenv/gbuild

2024-06-03 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c2f9689cd489f44122b50d7c0d7841c47381df99
Author: Christian Lohmaier 
AuthorDate: Mon Jun 3 11:55:14 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 13:08:43 2024 +0200

disable MSVC -analyse when run in CI - build time penalty is too much

times went from 55min to 88min when doing a single build

Change-Id: I9304eae9f2326c206bd571e7b8a3ef861206282f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168362
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 506cfbe7d30a..67aa47320c6c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -104,7 +104,8 @@ gb_AFLAGS := $(AFLAGS)
 
 # C4706: assignment within conditional expression
 
-MSVC_ANALYZE_FLAGS := -analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset
+# build-time penalty is to high for ci use/disable when JENKINS_HOME is set
+MSVC_ANALYZE_FLAGS := $(if 
$(JENKINS_HOME),,-analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset)
 
 gb_FilterOutClangCFLAGS += $(MSVC_ANALYZE_FLAGS)

core.git: solenv/gbuild

2024-05-10 Thread Michael Stahl (via logerrit)

 solenv/gbuild/Rdb.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit baaeca870f5c8ae40d33eff2b530bd4b3670ee45
Author: Michael Stahl 
AuthorDate: Wed May 8 14:53:05 2024 +0200
Commit: Michael Stahl 
CommitDate: Fri May 10 10:08:41 2024 +0200

gbuild: don't create empty services.rdb on "make postprocess"

Since commit db3a61cd958f4a70417929cf8e1fa9bfd0bfe5a3 "make
postprocess.clea; make postprocess" will result in an empty
services.rdb, because the components are added in makefiles in other
modules.  Detect the problem and tell the user to run top-level make.

Change-Id: Iab1a15efa5a4c9bb3e90e44f82a9510dff724c80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167354
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 136e1c2ee4dd..fff774dcb5b8 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -10,6 +10,7 @@
 gb_Rdb__get_install_target = $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/$(1).rdb
 
 define gb_Rdb__command
+$(if $(COMPONENTS),,$(call gb_Output_error,Rdb without components: partial 
build of module postprocess is not possible currently - only top-level make 
works))
 $(call gb_Helper_abbreviate_dirs,\
RESPONSEFILE=$(call gb_var2file,$(shell $(call gb_MKTEMP)),\
 \

core.git: solenv/gbuild

2024-05-07 Thread Noel Grandin (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c87077f653739d00ed5237d54838c1a454d65c4f
Author: Noel Grandin 
AuthorDate: Tue May 7 12:49:07 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue May 7 14:40:58 2024 +0200

fix Windows incremental build

after
commit 4c86718e78c6b18c84774e48ca025694364c251a
Author: Christian Lohmaier 
Date:   Thu Apr 18 12:45:01 2024 +0200
initial support for running autogen.sh inside wsl from git-bash

otherwise we end up with mixed cygwin/windows paths in our .d
files, which the make executable we use will not like.

Change-Id: Ia1325793f47657a23774c216df319ae6afd6d638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167269
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 871bbfdc6189..1ab191f27776 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -243,7 +243,7 @@ gb_COMPILERDEBUGOPTFLAGS :=
 ifeq ($(gb_FULLDEPS),$(true))
 gb_COMPILERDEPFLAGS := -showIncludes
 define gb_create_deps
-| $(call gb_Helper_cyg_path,$(GBUILDDIR)/platform/filter-showIncludes.awk 
-vdepfile=$(1) -vobjectfile=$(2) -vsourcefile=$(3)); exit $${PIPESTATUS[0]}
+| $(GBUILDDIR)/platform/filter-showIncludes.awk -vdepfile=$(1) 
-vobjectfile=$(2) -vsourcefile=$(3); exit $${PIPESTATUS[0]}
 endef
 else
 gb_COMPILERDEPFLAGS :=

core.git: solenv/gbuild

2024-05-04 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/TargetLocations.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6efe3a7a83bf5e110cbe84c225ca4f0a6364a906
Author: Christian Lohmaier 
AuthorDate: Sat May 4 14:30:50 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Sat May 4 16:28:40 2024 +0200

turn gb_HelpTranslatePartTarget_get_workdir into error

separate commit since that macro is used in helpcontent submodule

Change-Id: I2525b03eadf75b108499701f7f576634619cbf1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167123
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f36a036106a7..dc659c1e4b4d 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -98,7 +98,7 @@ gb_HelpTarget_get_workdir = $(error please use plain 
gb_HelpTarget_workdir)
 gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget
 gb_HelpTranslatePartTarget_get_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/done
 gb_HelpTranslatePartTarget_get_translated_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp
-gb_HelpTranslatePartTarget_get_workdir = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)
+gb_HelpTranslatePartTarget_get_workdir = $(error please use plain 
gb_HelpTranslatePartTarget_workdir instead)
 gb_HelpTranslatePartTarget_workdir := $(WORKDIR)/HelpTranslatePartTarget
 gb_HelpTranslateTarget_get_target = $(WORKDIR)/HelpTranslateTarget/$(1).done
 gb_HelpTreeTarget_get_target = $(WORKDIR)/HelpTreeTarget/$(1).tree

core.git: solenv/gbuild

2024-05-03 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/TargetLocations.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 83c2ef7c78d1453cc0419fd27a8c1418f90c12a3
Author: Christian Lohmaier 
AuthorDate: Thu May 2 11:31:59 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 3 16:07:04 2024 +0200

turn gb_CustomTarget_get_workdir into error and remove old _repo_targets

separate commit since help submodule also uses the macro.

actually turn it into make error to prevent reintroducing it

the repo_target ones are from way back when the whole repo was
split up in many different ones and not used for many years,
no point in having those as errors

Change-Id: I9fd42529d08ea7859b33f8570936f06039cfa184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167006
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 1db26abd9e4e..725390a8feed 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -55,9 +55,8 @@ gb_ComponentTarget_get_target_for_build = 
$(WORKDIR_FOR_BUILD)/ComponentTarget/$
 gb_Configuration_get_preparation_target = 
$(WORKDIR)/Configuration/$(1).prepared
 gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
 gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
-gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
 gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
-gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
+gb_CustomTarget_get_workdir = $(error please use plain gb_CustomTarget_workdir 
instead)
 gb_CustomTarget_workdir := $(WORKDIR)/CustomTarget
 gb_DescriptionTranslateTarget_get_target = 
$(WORKDIR)/DescriptionTranslateTarget/$(1).xml
 gb_Dictionary_get_target = $(WORKDIR)/Dictionary/$(1).done
@@ -109,7 +108,6 @@ gb_InternalUnoApi_get_target = 
$(WORKDIR)/InternalUnoApi/$(1).done
 gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1))
 gb_Jar_get_classsetname = Jar/$(1)
 gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
-gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
 gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done
 gb_JunitTest_get_classsetname = JunitTest/$(1)
 gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done

core.git: solenv/gbuild

2024-04-29 Thread Caolán McNamara (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9fb7afe13aa24464eecfee82c3e81e53017d74d
Author: Caolán McNamara 
AuthorDate: Mon Apr 29 09:42:14 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 29 14:17:30 2024 +0200

ofz#68265 fix oss-fuzz build failure

Change-Id: I73087235d87253f4c8375fa0c0492c6258701571
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166827
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index e3e84181664a..29a1942faa7b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -41,7 +41,7 @@ ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
 gb_COMPILEROPTFLAGS := -O2
 endif
 
-gb_COMPILEROPTFLAGS += $(HARDENING_OPT_CFLAGS)
+gb_COMPILEROPTFLAGS += $(if $(ENABLE_HARDENING_FLAGS),$(HARDENING_OPT_CFLAGS))
 
 gb_AFLAGS := $(AFLAGS)

core.git: solenv/gbuild

2024-04-27 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 47bebbdcf1bdca0ad6da48514a3befa473dd7d7b
Author: Noel Grandin 
AuthorDate: Sat Apr 27 19:27:44 2024 +0200
Commit: Noel Grandin 
CommitDate: Sat Apr 27 20:45:28 2024 +0200

fix mergelibs build

since
commit 828c1999e08c5bfad0a1d0e6e5ab07ee8bbc427e
Author: Noel Grandin 
Date:   Wed Apr 10 16:50:51 2024 +0100
move writerfilter inside sw

Change-Id: I1c8b37510ccdd640937669f36c8086f5f65183f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166782
Reviewed-by: Noel Grandin 
Tested-by: Jenkins

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cc7b9d5e9d25..3c780ec65199 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -184,7 +184,6 @@ gb_MERGE_LIBRARY_LIST += \
solver \
storagefd \
svgfilter \
-   sw_writerfilter \
t602filter \
textconversiondlgs \
$(call gb_Helper_optional,XMLHELP,ucpchelp1) \

core.git: solenv/gbuild

2024-04-26 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/Trace.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1e5496e4daf469840d5bcc31fede4d4d66aebfe
Author: Christian Lohmaier 
AuthorDate: Fri Apr 26 14:53:17 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 21:44:23 2024 +0200

gbuild trace: disable flock for wsl-as-helper case

Change-Id: Ie5db3fcc6fccedb214aec472852d8d82813fb984
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166744
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk
index a92f842e1dec..d1cba301469e 100644
--- a/solenv/gbuild/Trace.mk
+++ b/solenv/gbuild/Trace.mk
@@ -37,7 +37,7 @@ ifneq ($(gb_TRACE),)
 gb_Trace_Timestamp := $(if $(filter MACOSX,$(OS)),$$(date 
+%s)0,$$(date +%s%N))
 # macOS also doesn't provide flock, so skip that part on mac
 # The (flock;cat) part is to minimize lock time.
-gb_Trace_Flock := $(if $(filter MACOSX,$(OS)),,| ( flock 1; cat ))
+gb_Trace_Flock := $(if $(MSYSTEM)$(filter MACOSX,$(OS)),,| ( flock 1; cat ))
 # call gb_Trace_AddMark,marktype,detail,type,extra
 define gb_Trace__AddMark
 echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": 
$(gb_Trace_Timestamp),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," 
$(gb_Trace_Flock) >>$(gb_TRACE)

core.git: solenv/gbuild

2024-04-24 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/platform/windows.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 497fc304d49577df43842d56eb3ccbe6875fcafd
Author: Christian Lohmaier 
AuthorDate: Tue Jul 11 18:30:20 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Apr 24 15:51:34 2024 +0200

windows: set CONFIG_SHELL for external configure runs

Change-Id: I9cb03692524eced35935ad1979027f7b196e5ed6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166329
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index dc7a76d1515c..797680038320 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -19,6 +19,8 @@ gb_Helper_LIBRARY_PATH_VAR := PATH
 
 gb_MKTEMP := mktemp --tmpdir=$(TMPDIR) gbuild.XX
 
+gb_RUN_CONFIGURE := CONFIG_SHELL=$(shell cygpath -ms /bin/sh)
+
 # define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
 # current baseline is Windows 7 (NT 6.1)
 # for _WIN32_IE, if _WIN32_WINNT >= 0x0600 the derived value from

core.git: solenv/gbuild

2024-04-22 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/LinkTarget.mk |   11 ---
 solenv/gbuild/PrecompiledHeaders.mk |   10 --
 solenv/gbuild/gbuild.mk |3 +++
 3 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit df62514556b4220a4c099c00a34f28dd7fe88626
Author: Christian Lohmaier 
AuthorDate: Tue Jul 11 18:27:36 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:33:46 2024 +0200

add generic %/.dir target that can be used in order-only prerequisites

Change-Id: I7a919004100ff6319806bbdf016fda6a3a39661a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166327
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 85139659c634..f4d15f411516 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -279,11 +279,6 @@ endif
 # Note: if the *Object_dep_target does not exist it will be created by
 # concat-deps as PHONY
 ifeq ($(gb_FULLDEPS),$(true))
-$(dir $(call gb_CObject_get_dep_target,%)).dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CObject_get_dep_target,%))%/.dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_CObject_get_dep_target,%) :
$(if $(wildcard $@),touch $@)
@@ -342,12 +337,6 @@ $(call gb_CxxObject_get_target,%) : $(call 
gb_CxxObject_get_source,$(SRCDIR),%)
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(dir $(call gb_CxxObject_get_dep_target,%)).dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CxxObject_get_dep_target,%))%/.dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_CxxObject_get_dep_target,%) :
$(if $(wildcard $@),touch $@)
 
diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 60445c28efbe..429ea57de201 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -25,8 +25,8 @@ gb_PrecompiledHeader__get_debugdir = $(if $(call 
gb_target_symbols_enabled,$(1))
 
 # $(call gb_PrecompiledHeader_generate_timestamp_rule,linktargetmakefilename)
 define gb_PrecompiledHeader_generate_timestamp_rule
-$(call gb_LinkTarget_get_pch_timestamp,$(1)) :
-   mkdir -p $$(dir $$@) && touch $$@
+$(call gb_LinkTarget_get_pch_timestamp,$(1)) : | $(dir $(call 
gb_LinkTarget_get_pch_timestamp,$(1))).dir
+   touch $$@
 
 endef
 
@@ -46,10 +46,8 @@ gb_PrecompiledHeader_flags_for_flags_file := $$(sort 
$(gb_PrecompiledHeader_cxxf
 # $(call 
gb_PrecompiledHeader_generate_rules,pchtarget,linktarget,linktargetmakefilename,pchcxxfile,compiler)
 define gb_PrecompiledHeader_generate_rules
 
-$(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) :
-   $$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $$(dir $$@) && \
-   echo "$$(call gb_PrecompiledHeader_get_target,$(1),$(3)) : 
$$(gb_Helper_PHONY)" > $$@)
+$(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) : | $(dir $(call 
gb_PrecompiledHeader_get_dep_target,$(1),$(3))).dir
+   echo "$$(call gb_PrecompiledHeader_get_target,$(1),$(3)) : 
$$(gb_Helper_PHONY)" > $$@
 
 # keep the flags the PCH was built with in a separate file, update the file if 
and only if the flags
 # change, and make the PCH depend on it => the PCH will be rebuilt on any 
flags change
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a36b2b758479..2f5704896d42 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -373,4 +373,7 @@ ifneq ($(CCACHE_DEPEND_MODE),)
 gb_COMPILER_SETUP += CCACHE_DEPEND=1
 endif
 
+$(WORKDIR)/%/.dir:
+   mkdir -p $(@D) && touch $@
+
 # vim: set noet sw=4:

core.git: solenv/gbuild

2024-04-22 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/Extension.mk |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 5511a7b77bcceb812737533de1184c5d009f0a78
Author: Christian Lohmaier 
AuthorDate: Mon Jul 24 12:49:46 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:32:51 2024 +0200

avoid exceeding command-line length limits when using zip

to package an Extension. With all languages enabled one can reach the
limit with longish buildpaths

Change-Id: I8943d6570ded57761350311fb34a0cf469d3ce83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166326
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 4342859e415f..200e7d9e2a4f 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -89,17 +89,20 @@ $(call gb_Extension_get_workdir,%)/description.xml : 
$(gb_Extension_XRMEXDEPS) $
-o $@ \
-m $${MERGEINPUT} \
-l all) && \
-   rm -rf $${MERGEINPUT}
+   rm -f $${MERGEINPUT}
$(call gb_Trace_EndRange,$*/description.xml,XRM)
 
 endif
 
 # rule to create oxt package in workdir
 # --filesync makes sure that all files in the oxt package will be removed that 
no longer are in $(FILES)
+# TODO: kinda pointless/ineffective to copy from one point in workdir to 
another, also makes the command
+# very long when building with all languages (nlpsolver extension for 
example), hence read list via pipe
 $(call gb_Extension_get_target,%) : \
$(call gb_Extension_get_workdir,%)/description.xml
$(call gb_Output_announce,$*,$(true),OXT,3)
$(call gb_Trace_StartRange,$*,OXT)
+   RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst 
$(WHITESPACE),$(NEWLINE),$(sort $(FILES && \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \
$(if $(LICENSE),$(call 
gb_Extension_get_rootdir,$*)/registration) && \
@@ -108,10 +111,8 @@ $(call gb_Extension_get_target,%) : \
$(if $(LICENSE),cp -f $(LICENSE) $(call 
gb_Extension_get_rootdir,$*)/registration &&) \
$(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp 
$(foreach lang,$(gb_Extension_TRANS_LANGS),$(call 
gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call 
gb_Extension_get_rootdir,$*) &&) \
cd $(call gb_Extension_get_rootdir,$*) && \
-   ZIPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(sort 
$(FILES))) && \
-   $(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
-   $(call gb_Extension_get_target,$*) \
-   `cat $${ZIPFILES} | tr -d ' '` && rm $${ZIPFILES})
+   cat $$RESPONSEFILE | $(gb_Extension_ZIPCOMMAND) -rX --filesync 
--must-match \
+   $(call gb_Extension_get_target,$*) --names-stdin) && rm 
-f $$RESPONSEFILE
$(call gb_Trace_EndRange,$*,OXT)
 
 # set file list and location of manifest and description files

core.git: solenv/gbuild

2024-04-22 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80a6564e071033fd64536cb6c538cd422a82c86a
Author: Christian Lohmaier 
AuthorDate: Wed Aug 2 16:11:10 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:30:48 2024 +0200

com_MSC_class: set MAKE=nmake in gb_NMAKE_VARS

Change-Id: I485a486efba39c12c52d7461f4b235163f009042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166325
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index eccc64e1b2f1..7e6b5e8d3b57 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -673,7 +673,7 @@ gb_NMAKE_VARS = \
INCLUDE="$(gb_ExternalProject_INCLUDE)" \
LIB="$(ILIB)" \
MAKEFLAGS= \
-   MAKE=
+   MAKE=nmake
 
 # InstallScript class

core.git: solenv/gbuild

2024-04-22 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/HelpTarget.mk |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 44f48621a600b4b013115e2671c657725b77883c
Author: Christian Lohmaier 
AuthorDate: Thu Apr 11 12:04:15 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:29:36 2024 +0200

help: don't use clean targets as .PHONY targets

Change-Id: Ic86270980823efb8dafd9d00ce33f986203cd975
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166323
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 75cb22153d91..98baa661e908 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -69,14 +69,9 @@ $(call gb_HelpTranslatePartTarget_get_target,%) : 
$(gb_HelpTranslatePartTarget_D
$(call gb_HelpTranslatePartTarget__command,$@,$*,$^)
$(call gb_Trace_EndRange,$*,HPX)
 
-.PHONY : $(call gb_HelpTranslatePartTarget_get_clean_target,%)
-$(call gb_HelpTranslatePartTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),HPX,1)
-   $(call gb_Helper_abbreviate_dirs,\
-   rm -rf \
-   $(call gb_HelpTranslatePartTarget_get_target,$*) \
-   $(call gb_HelpTranslatePartTarget_get_workdir,$*) \
-   )
+clear_HelpTranslatePartTarget:
+   $(call gb_Output_announce,clear HelpTranslatePartTarget,$(false),HPX,1)
+   rm -rf  $(call gb_HelpTranslatePartTarget_get_workdir)
 
 # Translate a set of .xhp files from one directory.
 #
@@ -145,7 +140,7 @@ define gb_HelpTranslateTarget__make_part
 $(call gb_HelpTranslatePartTarget_HelpTranslatePartTarget,$(2),$(3),$(wildcard 
$(gb_POLOCATION)/$(3)/$(patsubst %/,%,$(4)).po))
 
 $(call gb_HelpTranslateTarget_get_target,$(1)) : $(call 
gb_HelpTranslatePartTarget_get_target,$(2))
-$(call gb_HelpTranslateTarget_get_clean_target,$(1)) : $(call 
gb_HelpTranslatePartTarget_get_clean_target,$(2))
+$(call gb_HelpTranslateTarget_get_clean_target,$(1)) : 
clear_HelpTranslatePartTarget
 
 endef

core.git: solenv/gbuild

2024-04-22 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |3 ---
 solenv/gbuild/platform/windows.mk  |2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit a7a4984b58cf7cb84b0157ca68ee9191043ca65b
Author: Christian Lohmaier 
AuthorDate: Tue Aug 8 12:42:42 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:28:56 2024 +0200

configure already sets TMPDIR to mixed path

Change-Id: I72070b054fb505c25f03ff46e7e663d1c1733ad8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166322
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2f1b653bef47..e75fdcc171b1 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -17,9 +17,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-# set tmpdir to some mixed case path, suitable for native tools
-gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m 
/tmp))
-
 # please make generic Windows modifications to windows.mk
 include $(GBUILDDIR)/platform/windows.mk
 
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 57f906ad1c53..dc7a76d1515c 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -17,7 +17,7 @@ gb_Helper_get_rcfile = $(1).ini
 
 gb_Helper_LIBRARY_PATH_VAR := PATH
 
-gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XX
+gb_MKTEMP := mktemp --tmpdir=$(TMPDIR) gbuild.XX
 
 # define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
 # current baseline is Windows 7 (NT 6.1)

core.git: solenv/gbuild

2024-04-22 Thread Caolán McNamara (via logerrit)

 solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk |3 +++
 solenv/gbuild/platform/LINUX_X86_64_GCC.mk|2 ++
 solenv/gbuild/platform/com_GCC_defs.mk|6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 196c22e88138796fb1204610bd5d4ad8b8cd8a85
Author: Caolán McNamara 
AuthorDate: Mon Apr 22 09:03:08 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 22 11:27:51 2024 +0200

generic is x86_64-specific

Change-Id: Ic9912cdebfc75816c54495db4fef68ebeed32c50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166417
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk 
b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
index 1880b3bad1e4..371fec46751d 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
@@ -10,6 +10,9 @@
 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DPPC
 
+gb_COMPILEROPTFLAGS := -O2 \
+  $(if $(filter 
powerpc64le-unknown-linux-gnu,$(HOST_PLATFORM)),-mtune=powerpc64le)
+
 include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk 
b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
index c1a1cfd6..3249b4b9a572 100644
--- a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
@@ -9,6 +9,8 @@
 
 #please make generic modifications to unxgcc.mk or linux.mk
 
+gb_COMPILEROPTFLAGS := -O2 -mtune=generic
+
 include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 903424972824..a09ee850e96a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -38,11 +38,11 @@ endif
 gb_COMPILER_SETUP :=
 
 ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
-gb_COMPILEROPTFLAGS := \
-   -O2 -mtune=generic \
-   $(if $(HARDENING_OPT_CFLAGS),$(HARDENING_OPT_CFLAGS))
+gb_COMPILEROPTFLAGS := -O2
 endif
 
+gb_COMPILEROPTFLAGS += $(HARDENING_OPT_CFLAGS)
+
 gb_AFLAGS := $(AFLAGS)
 
 gb_COMPILERDEFS := \

core.git: solenv/gbuild

2024-04-19 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78c613d7df5138f7da9132a6e4aabb1e78321e90
Author: Stephan Bergmann 
AuthorDate: Fri Apr 19 12:31:42 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 19 21:21:24 2024 +0200

Emscripten: Drop unused, deprecated EXPORTED_RUNTIME_METHODS

Linking Executable/soffice.html kept warning about

> warning: JS library symbol '$allocateUTF8' is deprecated. Please open a 
bug if you have a continuing need for this symbol [-Wdeprecated]
> warning: deprecated item in EXPORTED_RUNTIME_METHODS: printErr use err 
instead.
> em++: warning: warnings in JS library compilation [-Wjs-compiler]

printErr had been introduced in f090004c5f236275ca5142fc578f0375872c0336 
"WASM
adapt link and debug flags" and allocateUTF8 had been introduced in
ce60a3dd4dbff0dcb5b82c9053ae5d90f8ac929d "Add LOKit functions and whitelist
export for it to WASM", but in both cases no code seems to ever have made 
use of
either of those two methods, before or after.

Change-Id: I1e81ca6ddad748d91653f709c272328cc8f2b679
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166296
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 5d960db61087..64713ec66fd1 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -25,7 +25,7 @@ gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s 
PTHREAD_POOL_SIZE=4
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
-gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","allocateUTF8","printErr","ccall","cwrap","addOnPreMain"$(if
 
$(ENABLE_DBGUTIL),$(COMMA)"addOnPostRun"),"registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
+gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain"$(if
 
$(ENABLE_DBGUTIL),$(COMMA)"addOnPostRun"),"registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 gb_Executable_EXT := .html

core.git: solenv/gbuild

2024-03-21 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/gbuild.help.txt |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 70c3e8d89983320e4815d92dd232a2840432f620
Author: Stephan Bergmann 
AuthorDate: Wed Mar 20 13:31:28 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 22:01:42 2024 +0100

Fix text layout in gbuild.help.txt

...left inconsistent by recent 76a986da868c52e9bd1cc6d219ed8f9441afd32b 
"Drop
upper-case DBGLEVEL, consolidate on lower-case dbglevel"

Change-Id: Ie10c011f2942a013e90c75e0fadd123695d97374
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165131
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index fc857b734a4d..fb12142d4aff 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -113,8 +113,7 @@ INTERACTIVE VARIABLES:
DEBUG / debug   If not empty, build as with --enable-debug.
ENABLE_SYMBOLS / enable_symbols
If not empty, build as with --enable-symbols.
-   dbglevel
-   If not empty, force the debug level to the specified 
value. The
+   dbglevelIf not empty, force the debug level to the specified 
value. The
debug level is passed to the source code through 
OSL_DEBUG_LEVEL
macro.
0 = no debug (as with --disable-debug)

core.git: solenv/gbuild

2024-03-21 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03ab46c8a189b751ed1acffd0b575fae584c1d00
Author: Stephan Bergmann 
AuthorDate: Wed Mar 20 20:59:34 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 16:30:16 2024 +0100

Use ENABLE_DEBUG as a better indicator for "debug build"

...than gb_DEBUGLEVEL as had been chosen by
448008d64c643d5a1aa2dc5479efcd709a50 "only enable windows incremental
linking for debug builds"

Change-Id: Iabd2904596b3ac2a9d1c55d074cc929572615265
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165077
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 3ebbbabd49f9..6c3182b54aa4 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -323,7 +323,7 @@ endef
 gb_Windows_PE_TARGETTYPEFLAGS := \
-release \
-opt:noref \
-   $(if $(filter 0,$(gb_DEBUGLEVEL)), -incremental:no) \
+   $(if $(ENABLE_DEBUG),, -incremental:no) \
$(if $(filter NO,$(LIBRARY_X64)), -safeseh) \
-nxcompat \
-dynamicbase \

core.git: solenv/gbuild

2024-03-21 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9da95ca43dc10cda99d985a6365aec2ede3be4f
Author: Stephan Bergmann 
AuthorDate: Wed Mar 20 17:57:49 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 11:35:00 2024 +0100

Assume this hack is actually needed for --enable-optimized

...and not for whatever dbglevel is set.  (The latest claim that this hack 
is
still needed at all is in the 2020-12-14 commit message
e0a90aa3239621958bddbb30f98163e8c1ef857f "The workaround for MSVC C4702 is 
still
needed".)

Change-Id: Ia73be9417f2d738b0356e36b978beff019388ae1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165073
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index fa6a2d45bd58..2f1b653bef47 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -175,7 +175,7 @@ ifneq ($(COM_IS_CLANG),TRUE)
 # https://lists.freedesktop.org/archives/libreoffice/2018-July/080532.html
 # https://lists.freedesktop.org/archives/libreoffice/2018-August/080776.html
 gb_CXXFLAGS += \
-   $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4702) \
+   $(if $(ENABLE_OPTIMIZED),-wd4702) \
 
 endif

core.git: solenv/gbuild

2024-03-21 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/gbuild.help.txt |2 +-
 solenv/gbuild/gbuild.mk   |6 --
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 76a986da868c52e9bd1cc6d219ed8f9441afd32b
Author: Stephan Bergmann 
AuthorDate: Wed Mar 20 13:31:28 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 08:03:08 2024 +0100

Drop upper-case DBGLEVEL, consolidate on lower-case dbglevel

Change-Id: I89e0121ba3d63852e39bf4d6141b0dc15b2408f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165057
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index c677541309f5..fc857b734a4d 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -113,7 +113,7 @@ INTERACTIVE VARIABLES:
DEBUG / debug   If not empty, build as with --enable-debug.
ENABLE_SYMBOLS / enable_symbols
If not empty, build as with --enable-symbols.
-   DBGLEVEL / dbglevel
+   dbglevel
If not empty, force the debug level to the specified 
value. The
debug level is passed to the source code through 
OSL_DEBUG_LEVEL
macro.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f14e9f1a1ed4..eb80cfa368f5 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -123,12 +123,6 @@ ifeq ($(gb_ENABLE_DBGUTIL),$(true))
 gb_DEBUGLEVEL := 1
 endif
 
-ifneq ($(strip $(DBGLEVEL)),)
-gb_DEBUGLEVEL := $(strip $(DBGLEVEL))
-ifeq ($(origin DBGLEVEL),command line)
-gb_ENABLE_SYMBOLS_FOR := all
-endif
-endif
 ifneq ($(strip $(dbglevel)),)
 gb_DEBUGLEVEL := $(strip $(dbglevel))
 ifeq ($(origin dbglevel),command line)

core.git: solenv/gbuild

2024-03-19 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 5d283f4224d73c89242099d1d4ccbfd6df9c2a82
Author: Stephan Bergmann 
AuthorDate: Tue Mar 19 12:15:36 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 19 17:43:31 2024 +0100

Exclude Library_postgresql-sdbc-impl from --enable-mergelibs=more again

...which had been added there with ae17922b7d0f797129dd5fbd5514d691ac9ebeaa 
"add
more libs into --enable-mergelibs=more build".  But:  For one, I'm not quite
sure why the postgresql-sdbc functionality is split into two libraries
Library_postgresql-sdbc and Library_postgresql-sdbc-impl, but there's 
supposedly
a reason why the latter should stay in a dynamic library of its own?  And 
for
another, at least my --enable-ldap --enable-mergelibs=more
--without-system-openldap etc. Linux build now started to crash during exit 
of
CppunitTest_sd_export_tests-ooxml2 with

> Invalid free() / delete / delete[] / realloc()
>at 0x4845B2C: free (vg_replace_malloc.c:985)
>by 0x1C5C11E3: ber_memfree_x (memory.c:152)
>by 0x62895DC6: ldap_int_destroy_global_options (init.c:543)
>by 0x40010F1: _dl_call_fini (dl-call_fini.c:43)
>by 0x400506D: _dl_fini (dl-fini.c:114)
>by 0x4EE7FD5: __run_exit_handlers (exit.c:111)
>by 0x4EE811D: exit (exit.c:141)
>by 0x4ECF150: (below main) (libc_start_call_main.h:74)
>  Address 0x103070f1f7f00 is not stack'd, malloc'd or (recently) free'd

apparently because there are two competing at-exit calls to
ldap_int_destroy_global_options in both LO's
workdir/UnpackedTarball/openldap/libraries/libldap/init.c in
instdir/program/libmergedlo.so (where that code ends up now, instead of in a
library of its own that would apparently not happen to be loaded for this 
test)
and in

/usr/src/debug/openldap-2.6.6-1.fc39.x86_64/openldap-2.6.6/libraries/libldap/init.c
in my (Fedora 39) system's /usr/lib64/libldap.so.2 (which apparently 
happens to
get loaded into the process due to whatever other dependency).

Change-Id: I5f4b944dfe2e09df2c6d33fc31d4dded4a453c60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165025
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 2c2e59479465..68b9e5245e68 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -168,9 +168,7 @@ gb_MERGE_LIBRARY_LIST += \
OGLTrans \
odbc \
pdffilter \
-   $(if $(BUILD_POSTGRESQL_SDBC), \
-   postgresql-sdbc \
-   postgresql-sdbc-impl) \
+   $(if $(BUILD_POSTGRESQL_SDBC),postgresql-sdbc) \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
rpt \

core.git: solenv/gbuild

2024-03-11 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7206092764496cdd28e20749004667a659a0e4aa
Author: Noel Grandin 
AuthorDate: Mon Mar 11 10:29:20 2024 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 11 15:33:10 2024 +0100

add rpt libs to enable-mergelibs=more

Change-Id: I2b9acf1a897c962a60ec0c955ae6e9c6bea8ff8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164656
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index e558790ed38f..5c4db5957080 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -173,6 +173,9 @@ gb_MERGE_LIBRARY_LIST += \
postgresql-sdbc-impl) \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
+   rpt \
+   rptui \
+   rptxml \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
sdbc2 \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \

core.git: solenv/gbuild

2024-03-05 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 48ff49b9ff1f4a38a5f28dbde7aa5c743348f9ed
Author: Noel Grandin 
AuthorDate: Tue Mar 5 15:03:00 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Mar 5 20:35:46 2024 +0100

add sdbt to --enable-mergelibs=more

Change-Id: Ib916270a32aa6f3c0f2d6a8ec43f99241f74b972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164426
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index d20c49057bf6..aa925cbc91a8 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -175,6 +175,7 @@ gb_MERGE_LIBRARY_LIST += \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
sdbc2 \
+   $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
slideshow \
$(if $(filter WNT,$(OS)), \
smplmail \

core.git: solenv/gbuild

2024-03-05 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5ee9b98a1eeb2f433e88cf3a630ab9d2e9aae5ef
Author: Noel Grandin 
AuthorDate: Tue Mar 5 14:45:10 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Mar 5 18:31:58 2024 +0100

add dbase,dbaxml to --enable-mergelibs=more

Change-Id: Ia0898c820cfcddf981f414b33a2854c3917edca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164424
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 4b207daa9c02..d20c49057bf6 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -136,6 +136,9 @@ gb_MERGE_LIBRARY_LIST += \
date \
dba \
dbahsql \
+   $(call gb_Helper_optional,DBCONNECTIVITY, \
+   dbase \
+   dbaxml) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
dlgprov \

core.git: solenv/gbuild

2024-03-05 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a082762fb3f41237df6385ab27f7a75d6ff92690
Author: Noel Grandin 
AuthorDate: Tue Mar 5 13:49:03 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Mar 5 15:03:46 2024 +0100

add dbahsql,dba to --enable-mergelibs=more

Change-Id: Iaabb3356ced33186eeb2bd545bebb20918010638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164419
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index c2709218c6ad..7b8b8c5f3685 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -134,6 +134,8 @@ gb_MERGE_LIBRARY_LIST += \
$(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
cui \
date \
+   dba \
+   dbahsql \
$(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
dlgprov \
$(if $(ENABLE_EVOAB2),evoab) \

core.git: solenv/gbuild

2024-03-04 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9b12ca7776533ab33b87943a7966ace1d3230def
Author: Noel Grandin 
AuthorDate: Mon Mar 4 15:40:01 2024 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 4 20:25:18 2024 +0100

add wpftcalc to --enable-mergelibs=more

Change-Id: I3f3bba92202e833066b1ef2e9f76ae34698a6b16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164361
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 2d1a397c757a..c2709218c6ad 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -182,6 +182,7 @@ gb_MERGE_LIBRARY_LIST += \
$(if $(ENABLE_LIBCMIS),ucpcmis1) \
$(if $(WITH_WEBDAV),ucpdav1) \
ucppkg1 \
+   wpftcalc \
wpftdraw \
wpftimpress \
wpftwriter \

core.git: solenv/gbuild

2024-03-01 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1cd0d13e9bb0c30d0a472acd95da727c571d843b
Author: Noel Grandin 
AuthorDate: Fri Mar 1 13:14:11 2024 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 2 06:28:28 2024 +0100

add wpft* to --enable-mergedlibs=more

Change-Id: I1168eb43638c3b18e3b9de96d89646420f80b52e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164218
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 31182d006db3..2d1a397c757a 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -182,6 +182,9 @@ gb_MERGE_LIBRARY_LIST += \
$(if $(ENABLE_LIBCMIS),ucpcmis1) \
$(if $(WITH_WEBDAV),ucpdav1) \
ucppkg1 \
+   wpftdraw \
+   wpftimpress \
+   wpftwriter \
$(if $(filter WNT,$(OS)), \
wininetbe1 \
) \

core.git: solenv/gbuild

2024-03-01 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 065b1d030ea5e21dc91699cdaf8bcd03ed2ec807
Author: Noel Grandin 
AuthorDate: Fri Mar 1 12:28:01 2024 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 2 06:27:53 2024 +0100

add OGLTrans to --enable-mergedlibs=more

Change-Id: I6df8cd8a11681cac971d53ec52b6dd97c18fd459
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164217
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 77a6bc99ba65..31182d006db3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -159,6 +159,7 @@ gb_MERGE_LIBRARY_LIST += \
msforms \
$(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
$(call gb_Helper_optional,MARIADBC,$(call 
gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
+   OGLTrans \
odbc \
pdffilter \
$(if $(BUILD_POSTGRESQL_SDBC), \

core.git: solenv/gbuild

2024-03-01 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 19b7f833dd7aa4cb7eddb4ee9ccda202c8133bb8
Author: Noel Grandin 
AuthorDate: Fri Mar 1 12:16:09 2024 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 2 06:26:36 2024 +0100

add solver to --enable-mergedlibs=more

Change-Id: Ib3de04a85332430895bb6096a2cfaf1463f33b79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164216
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cad91095a4cc..77a6bc99ba65 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -172,6 +172,7 @@ gb_MERGE_LIBRARY_LIST += \
$(if $(filter WNT,$(OS)), \
smplmail \
) \
+   solver \
storagefd \
svgfilter \
t602filter \

core.git: solenv/gbuild

2024-03-01 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2083679b61623cfe1dbd71f486ff4f63f837db2d
Author: Noel Grandin 
AuthorDate: Fri Mar 1 11:24:49 2024 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 2 06:25:52 2024 +0100

add ado to --enable-mergedlibs=more

Change-Id: I0d04eb2ab9b6384576194dc2c6421310da227b8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164215
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 91e40b381181..cad91095a4cc 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -119,6 +119,9 @@ ifneq ($(MERGELIBS_MORE),)
 
 gb_MERGE_LIBRARY_LIST += \
acc \
+   $(if $(filter $(OS),WNT), \
+   ado \
+   ) \
analysis \
animcore \
$(call gb_Helper_optional,AVMEDIA, \

core.git: solenv/gbuild

2024-02-27 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/UnoApiTarget.mk |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 4c20fb09d7fe6c2f4cdb672a6238c8ddb67aa437
Author: Stephan Bergmann 
AuthorDate: Tue Feb 27 21:09:03 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 28 07:52:29 2024 +0100

Revert "gbuild: WASM: try to fix "Missing generated source file 
*_embind.cxx""

This reverts commit e4717342e5bea23f590a42d565a09ace600e2ca5.  cppumaker no
longer generates *_embind.cxx files since
b2ade3e63e34556cad8157e25f8c75d29e79537d "Extract embindmaker from cppumaker
into its own tool ...that directly generates one large .cxx."

Change-Id: Ic4f60a502f3e592489cf0cee86878c327bbb4894
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164055
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index e79247172851..ec32b5c5fea8 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -216,11 +216,6 @@ $(call 
gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hpp : \
| $(call 
gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%_embind.cxx : \
-   $(call gb_Executable_get_target_for_build,cppumaker) \
-   | $(call 
gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
-   touch $$@
-
 endef
 
 # ensure that idl change triggers the dummy rule to rebuild the headers

core.git: solenv/gbuild

2024-02-27 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 045e551875cbd68ead6371b56ff13b3842648c1a
Author: Noel Grandin 
AuthorDate: Tue Feb 27 11:23:49 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 27 14:39:05 2024 +0100

remove hsqldb from mergedlibs

regression from
commit ae17922b7d0f797129dd5fbd5514d691ac9ebeaa
Author: Noel Grandin 
Date:   Wed Feb 14 09:33:05 2024 +0200
add more libs into --enable-mergelibs=more build

sberg is seeing
This breaks e.g.  dbaccess_hsqldb_test  with
java.lang.UnsatisfiedLinkError: java.lang.UnsatisfiedLinkError:

likely because the jar file is trying to load libhsqldb.so instead of
libmerged.so

Change-Id: I9f42aea6471dbe35b27a584465b333a1d30caf5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164022
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 45aee4d1a4a9..be34e8d03121 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -144,7 +144,6 @@ gb_MERGE_LIBRARY_LIST += \
) \
graphicfilter \
hwp \
-   $(if $(ENABLE_JAVA),hsqldb) \
log \
$(if $(ENABLE_LWP),lwpft) \
$(if $(filter $(OS),MACOSX), \

core.git: solenv/gbuild

2024-02-26 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/CppunitTest.mk |5 -
 1 file changed, 5 deletions(-)

New commits:
commit c29d1d968acd53bd957eedc0d93bfaa620fc862b
Author: Stephan Bergmann 
AuthorDate: Mon Feb 26 22:15:27 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Feb 27 07:56:12 2024 +0100

Remove unused gb_CppunitTest_localized_run

...that appears to be unused ever since it got introduced in
d8a8ed04b14390d4469ea19b079778fa6f074bb2 "gbuild allow unitest to run once 
per
lang in WITH_LANG_LIST"

Change-Id: Id43b8498ca68c274902dfb3dfd4b035e199cb9b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163993
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 287ec84eb6c5..cfca2bbbf570 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -282,11 +282,6 @@ $(call gb_CppunitTest__use_vcl,$(1),$(false))
 
 endef
 
-define gb_CppunitTest_localized_run
-$(call gb_CppunitTest_get_target,$(1)) : gb_CppunitTest_localized := $(true)
-
-endef
-
 define gb_CppunitTest__use_api
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(call 
gb_UnoApi_get_target,$(2))

core.git: solenv/gbuild

2024-02-26 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/CppunitTest.mk |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit bd3dc6fc18a6360929e3427abccc572950d0aa8e
Author: Stephan Bergmann 
AuthorDate: Mon Feb 26 20:58:08 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 26 22:25:27 2024 +0100

Fix --enable-coredumpctl in CppunitTest

...which 533e993f2d11814252c40d60bdab469de03b14db "Don't reuse --unit values
across (sequential, even) systemd-run invocations" had broken by moving the
setting of the LIBO_TEST_UNIT var to a place where the use of that env var 
would
no longer see it.

Fix it by making the individual LO_TEST_LOCALE=* tests of
gb_CppunitTest_localized more autonomous.  Each one now has an individual 
log
file and gets an individual gb_CppunitTest_postprocess treatment.

Change-Id: Ie6875dda874e357426370d4d5166c05e36881210
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163967
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index fc7351986b09..287ec84eb6c5 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -135,10 +135,10 @@ else
$(if $(gb_CppunitTest__interactive),, \
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core && mkdir $@.core && cd $@.core 
&&)) \
-   ( \
-   $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do \
-   printf 'LO_TEST_LOCALE=%s
' "$$l" && ) \
+   $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do) \
$(call gb_CppunitTest_coredumpctl_setup,$@,$(if 
$(gb_CppunitTest_localized),$$l)) \
+   ( \
+   $(if $(gb_CppunitTest_localized),printf 'LO_TEST_LOCALE=%s
' "$$l" && ) \
$(if $(gb_CppunitTest_localized),LO_TEST_LOCALE="$$l") \
$(if $(gb_CppunitTest__vcl_no_svp), \
$(filter-out 
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
@@ -157,14 +157,15 @@ else
$(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_CppunitTest_get_linktarget_target,$*) \
$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \
-   $(if $(gb_CppunitTest_localized),|| exit $$?; done) \
) \
-   $(if $(gb_CppunitTest__interactive),, \
-   > $@.log 2>&1 \
-   || ($(if $(value gb_CppunitTest_postprocess), \
+   $(if $(gb_CppunitTest__interactive),$(if 
$(gb_CppunitTest_localized),|| exit $$?), \
+   > $@.$(if $(gb_CppunitTest_localized),$$l.)log 2>&1 \
+   || { $(if $(value gb_CppunitTest_postprocess), \
RET=$$?; \
-   $(call 
gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> 
$@.log 2>&1;) \
-   cat $@.log; $(gb_CppunitTest_UNITTESTFAILED) 
Cppunit $*)))
+   $(call 
gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> 
$@.$(if $(gb_CppunitTest_localized),$$l.)log 2>&1;) \
+   cat $@.$(if 
$(gb_CppunitTest_localized),$$l.)log; $(gb_CppunitTest_UNITTESTFAILED) Cppunit 
$*; \
+   $(if $(gb_CppunitTest_localized),exit $$RET;) } 
) \
+   $(if $(gb_CppunitTest_localized),; done))
$(call gb_Trace_EndRange,$*,CUT)
 endif

core.git: solenv/gbuild

2024-02-23 Thread Andrea Gelmini (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d7d93e846c89f96dfcb4bda9dc52bc11d21d5237
Author: Andrea Gelmini 
AuthorDate: Fri Feb 23 22:00:22 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Feb 24 06:22:22 2024 +0100

Fix typo

Change-Id: Ibf6edff9b32cb28f5410991493a95d0cc916209d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163872
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 61437e1a3595..fa6a2d45bd58 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -259,7 +259,7 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 
 # VS2019 produces a warning C4857, that it doesn't support -std:c++20; it can't
 # be suppressed by -wd4857, only by -Wv:18. The warning seems incorrect, 
because
-# using -std:c++17 produces errors about undeclated 'char8_t'. VS2022 doesn't
+# using -std:c++17 produces errors about undeclared 'char8_t'. VS2022 doesn't
 # have the problem, so drop -Wv:18 when bumping baseline.
 gb_CXXCLRFLAGS := \
$(if $(COM_IS_CLANG), \

core.git: solenv/gbuild

2024-02-23 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/UnoApiTarget.mk  |9 -
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 --
 solenv/gbuild/platform/com_MSC_class.mk|8 
 solenv/gbuild/platform/iOS.mk  |8 
 solenv/gbuild/platform/macosx.mk   |8 
 solenv/gbuild/platform/solaris.mk  |8 
 solenv/gbuild/platform/unxgcc.mk   |8 
 7 files changed, 4 insertions(+), 47 deletions(-)

New commits:
commit f4aee67494aa4defbc4d23aebc41bf9571e29d3b
Author: Stephan Bergmann 
AuthorDate: Fri Feb 23 13:29:02 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 23 17:24:22 2024 +0100

Undo "move selection of UNO header variant to platform"

...from 86f4727920ae515987005e3c414f1d6056079be1, as all the platforms 
define
gb_UnoApiHeadersTarget_select_variant in effectively the same way, anyway.  
(And
whether or not any of this actually makes any sense the way it is currently
done.)

Change-Id: I3b53ed3ee58b1115da31839aba5b2852dfe40920
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163826
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 6eacbc66a0ab..e79247172851 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -90,9 +90,6 @@ endef
 
 # UnoApiHeadersTarget
 
-# defined by platform
-#  gb_UnoApiHeadersTarget_select_variant
-
 # Allow to redefine header variant.
 #
 # On iOS we use static linking because dynamic loading of own code
@@ -125,8 +122,10 @@ endef
 # technical reasons to get around silly limitations in the OS, sigh.
 #
 # gb_UnoApiHeadersTarget_select_variant api default-variant
-ifeq ($(origin gb_UnoApiHeadersTarget_select_variant),undefined)
-$(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be 
defined by platform))
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+gb_UnoApiHeadersTarget_select_variant = $(if $(filter 
udkapi,$(1)),comprehensive,$(2))
+else
+gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
 gb_UnoApiHeadersTarget_CPPUMAKERDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppumaker)
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index ec762431097f..5d960db61087 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter 
udkapi,$(1)),comprehensive,$(2))
-
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 # don't sort; later can override previous settings!
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 16cc4201b40e..3ebbbabd49f9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -692,14 +692,6 @@ gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt
 
 gb_UnpackedTarget_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))
 
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter 
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
 # UIConfig class
 
 # use responsefile because cui has too many files for command line
diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 15f1ce4ef4ac..8a392c8505fe 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -241,14 +241,6 @@ gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
 
 gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
 
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter 
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index be25f6563cd0..83f9695c624c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -345,14 +345,6 @@ gb_Extension_LICENSEFILE_DEFAULT := 
$(INSTROOT)/Resources/LICENSE
 
 gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
 
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter 
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 9d18cd913a87..c3e7af09f054 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -326,14 +326,6 @@ gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE

core.git: solenv/gbuild

2024-02-23 Thread Mike Kaganski (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 203e21735ffc031d4689208ec39d9b24572d447d
Author: Mike Kaganski 
AuthorDate: Fri Feb 23 14:02:18 2024 +0600
Commit: Mike Kaganski 
CommitDate: Fri Feb 23 12:18:29 2024 +0100

Fix dead links

Change-Id: I5c42fa227401e271bf8d4ce84f42a0667b37a6c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163803
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 65918fc3da9b..61437e1a3595 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -172,8 +172,8 @@ endif
 ifneq ($(COM_IS_CLANG),TRUE)
 
 # Work around MSVC 2017 C4702 compiler bug with release builds
-# 
http://document-foundation-mail-archive.969070.n3.nabble.com/Windows-32-bit-build-failure-unreachable-code-tp4243848.html
-# 
http://document-foundation-mail-archive.969070.n3.nabble.com/64-bit-Windows-build-failure-after-MSVC-Update-tp4246816.html
+# https://lists.freedesktop.org/archives/libreoffice/2018-July/080532.html
+# https://lists.freedesktop.org/archives/libreoffice/2018-August/080776.html
 gb_CXXFLAGS += \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4702) \

core.git: solenv/gbuild

2024-02-23 Thread Mike Kaganski (via logerrit)

 solenv/gbuild/platform/filter-creatingLibrary.awk |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 39d18384121768460775b5ec320e444b022f5646
Author: Mike Kaganski 
AuthorDate: Fri Feb 23 14:02:50 2024 +0600
Commit: Mike Kaganski 
CommitDate: Fri Feb 23 11:25:14 2024 +0100

Suppress linker warnings for CLR objects

 climaker_app.o : /DEBUG:FASTLINK is not supported when managed code is 
present; restarting link with /DEBUG:FULL

Change-Id: Ia4c8ef862999650b317629273996166908232494
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163804
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/platform/filter-creatingLibrary.awk 
b/solenv/gbuild/platform/filter-creatingLibrary.awk
index 231609feb2d5..625af2891c0e 100755
--- a/solenv/gbuild/platform/filter-creatingLibrary.awk
+++ b/solenv/gbuild/platform/filter-creatingLibrary.awk
@@ -15,6 +15,7 @@ BEGIN {
 creatinglibrary_prefix = ENVIRON["CREATINGLIBRARY_PREFIX"];
 generatingcode_message = ENVIRON["GENERATINGCODE_MESSAGE"];
 finishedgeneratingcode_message = ENVIRON["FINISHEDGENERATINGCODE_MESSAGE"];
+fastlink_in_clr_message = ENVIRON["FASTLINK_IN_CLR_MESSAGE"];
 if (!creatinglibrary_prefix) {
 creatinglibrary_prefix = "\.lib.*\.exp"
 }
@@ -24,23 +25,32 @@ BEGIN {
 if (!finishedgeneratingcode_message) {
 finishedgeneratingcode_message = "Finished generating code"
 }
+if (!fastlink_in_clr_message) {
+fastlink_in_clr_message = "DEBUG:FASTLINK.*DEBUG:FULL"
+}
 firstline = 1
 }
 
 {
+keep_firstline = 0
 if (firstline && match($0, creatinglibrary_prefix)) {
 # ignore
 } else if (match($0, generatingcode_message)) {
 # ignore
 } else if (match($0, finishedgeneratingcode_message)) {
 # ignore
+} else if (match($0, fastlink_in_clr_message)) {
+# ignore; "Creating library" will come after this warning
+keep_firstline = 1
 } else {
 # because MSVC stupidly prints errors on stdout, it's
 # necessary to forward everything that isn't matched by the pattern
 # so users get to see them.
 print $0 > "/dev/stderr"
 }
-firstline = 0
+if (!keep_firstline) {
+firstline = 0
+}
 }
 
 # vim: set noet sw=4 ts=4:

core.git: solenv/gbuild vcl/source

2024-02-23 Thread Mike Kaganski (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |   18 --
 vcl/source/window/layout.cxx   |   32 +++-
 2 files changed, 31 insertions(+), 19 deletions(-)

New commits:
commit b889b33d928e49ba568ee1277c70d653083a2453
Author: Mike Kaganski 
AuthorDate: Thu Feb 22 14:05:24 2024 +0600
Commit: Mike Kaganski 
CommitDate: Fri Feb 23 11:23:12 2024 +0100

Do not suppress newer compiler warnings on Windows

This partially reverts commit 133610669b8707a278d9b3b0af025779044fd8c5
(windows: silence new warning for now, 2016-02-21). That commit had
disabled warnings introduced after VS 2013 (compiler major version 18).

For now, it was impossible to remove the -Wv:18 from CLR flags. Also,
some warnings in Boost were suppressed in vcl/source/window/layout.cxx:

 
C:\louild\workdir\UnpackedTarballoostoost/multi_array/multi_array_ref.hpp(615):
 error C2220: the following warning is treated as an error
 
C:\louild\workdir\UnpackedTarballoostoost/multi_array/multi_array_ref.hpp(615):
 warning C4459: declaration of 'extents' hides global declaration
 C:\louild\workdir\UnpackedTarballoostoost/multi_array/base.hpp(69): 
note: see declaration of 'boost::`anonymous-namespace'::extents'
 
C:\louild\workdir\UnpackedTarballoostoost/multi_array/multi_array_ref.hpp(612):
 note: while compiling class template member function 
'boost::multi_array_ref::multi_array_ref(T *,const 
boost::general_storage_order<2> &,const __int64 *,const unsigned __int64 *)'
 with
 [
 T=`anonymous-namespace'::GridEntry
 ]
 C:\louild\workdir\UnpackedTarballoostoost/multi_array.hpp(153): note: 
see reference to function template instantiation 
'boost::multi_array_ref::multi_array_ref(T *,const 
boost::general_storage_order<2> &,const __int64 *,const unsigned __int64 *)' 
being compiled
 with
 [
 T=`anonymous-namespace'::GridEntry
 ]
 C:\louild\workdir\UnpackedTarballoostoost/multi_array.hpp(122): note: 
see reference to class template instantiation 'boost::multi_array_ref' 
being compiled
 with
 [
 T=`anonymous-namespace'::GridEntry
 ]
 C:/lo/core/vcl/source/window/layout.cxx(905): note: see reference to class 
template instantiation 
'boost::multi_array<`anonymous-namespace'::GridEntry,2,std::allocator>' 
being compiled
 with
 [
 T=`anonymous-namespace'::GridEntry
 ]

Change-Id: Ibf89e3d3e5a2f6a747bb7fbd214a9b27d8068901
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163717
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 3bf1a9d0a041..65918fc3da9b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -122,14 +122,6 @@ gb_CFLAGS := \
 
 gb_CXXFLAGS_DISABLE_WARNINGS = -w
 
-ifneq ($(COM_IS_CLANG),TRUE)
-
-# clang-cl doesn't support -Wv:18 for now
-gb_CFLAGS += \
-   -Wv:18 \
-
-endif
-
 gb_CXXFLAGS := \
-utf-8 \
$(CXXFLAGS_CXX11) \
@@ -179,12 +171,10 @@ endif
 
 ifneq ($(COM_IS_CLANG),TRUE)
 
-# clang-cl doesn't support -Wv:18 for now
 # Work around MSVC 2017 C4702 compiler bug with release builds
 # 
http://document-foundation-mail-archive.969070.n3.nabble.com/Windows-32-bit-build-failure-unreachable-code-tp4243848.html
 # 
http://document-foundation-mail-archive.969070.n3.nabble.com/64-bit-Windows-build-failure-after-MSVC-Update-tp4246816.html
 gb_CXXFLAGS += \
-   -Wv:18 \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4702) \
 
 endif
@@ -267,8 +257,10 @@ endif
 
 gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 
-# When compiling for CLR, disable "warning C4339: use of undefined type 
detected
-# in CLR meta-data - use of this type may lead to a runtime exception":
+# VS2019 produces a warning C4857, that it doesn't support -std:c++20; it can't
+# be suppressed by -wd4857, only by -Wv:18. The warning seems incorrect, 
because
+# using -std:c++17 produces errors about undeclated 'char8_t'. VS2022 doesn't
+# have the problem, so drop -Wv:18 when bumping baseline.
 gb_CXXCLRFLAGS := \
$(if $(COM_IS_CLANG), \
$(patsubst -std=%,-std:c++20 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
@@ -277,9 +269,7 @@ gb_CXXCLRFLAGS := \
-AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \
-EHa \
-clr \
-   -wd4339 \
-Wv:18 \
-   -wd4267 \
-Zc:twoPhase- \
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5639d8e62d57..9e47d6d8f347 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -897,12 +897,15 @@ struct GridEntry
 
 typedef boost::multi_array array_type;
 
-static array_type assembleGrid(const VclGrid );
-static bool isNullGrid(const array_type& A);
-static void calcMaxs(const array_type , std::vector 
, std::vector );
-
-array_type assembleGrid(const

core.git: solenv/gbuild

2024-02-22 Thread Michael Stahl (via logerrit)

 solenv/gbuild/TargetLocations.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 17ad20bd10de34f4660567e2505eb95ab22f61a5
Author: Michael Stahl 
AuthorDate: Wed Feb 21 17:55:48 2024 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 22 10:31:29 2024 +0100

gbuild: remove unused gb_Executable_get_linktargetfile

Was added in commit dc9ccf3d8f294cd7ae9d5bece7b6c16c3b22f6a5 but
apparently never used.

Change-Id: I9eec766caeacaa2762917be739f01227168c7353
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163707
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 4f3814f2a5d2..65026c355826 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -67,7 +67,6 @@ gb_GenCxxObject_get_dwo_target = 
$(WORKDIR)/GenCxxObject/$(1).dwo
 gb_GenNasmObject_get_target = $(WORKDIR)/GenNasmObject/$(1).o
 gb_GenNasmObject_get_dwo_target = $(WORKDIR)/GenNasmObject/$(1).dwo
 gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
-gb_Executable_get_linktargetfile = $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktarget,$1))
 gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run
 gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt
 gb_Extension_get_rootdir = $(WORKDIR)/Extension/$(1)/root

core.git: solenv/gbuild

2024-02-20 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cca4d8bdcd2ad54a0f353ebbcb26d5eb7b1087d8
Author: Noel Grandin 
AuthorDate: Tue Feb 20 10:27:45 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 20 11:34:34 2024 +0100

add icg to --enable-mergelibs

Change-Id: I358cd271421762b4c4b54ca7ae6f2ae30aeb74c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163635
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index c51ea9fcfe7f..45aee4d1a4a9 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -53,6 +53,7 @@ gb_MERGE_LIBRARY_LIST := \
i18nsearch \
i18npool \
i18nutil \
+   icg \
lng \
lnth \
localebe1 \

core.git: solenv/gbuild static/emscripten static/source

2024-02-15 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |1 
 static/emscripten/registeroustring.js  |   56 
 static/source/unoembindhelpers/PrimaryBindings.cxx |   58 +++--
 3 files changed, 55 insertions(+), 60 deletions(-)

New commits:
commit 52a22b6863c08b071361fa9c212b886e1e48500b
Author: Stephan Bergmann 
AuthorDate: Wed Feb 14 15:29:13 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 15 10:58:47 2024 +0100

Fold registeroustring.js into PrimaryBindings.cxx

Change-Id: I2e1aa828f194a104d354741518e8cb20015ac276
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163385
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index f3bb7d7c6c27..8a36e425ce7a 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -14,7 +14,6 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 # don't sort; later can override previous settings!
 gb_EMSCRIPTEN_PRE_JS_FILES = \
 $(SRCDIR)/static/emscripten/environment.js \
-$(SRCDIR)/static/emscripten/registeroustring.js \
 $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link \
 
 gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure
diff --git a/static/emscripten/registeroustring.js 
b/static/emscripten/registeroustring.js
deleted file mode 100644
index 0abd522ca98e..
--- a/static/emscripten/registeroustring.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-if (!('preRun' in Module)) Module['preRun'] = [];
-Module.preRun.push(function() {
-// Wait until Embind is set up:
-Module.addOnPreMain(function() {
-Module.registerType(Module.getOUStringRawType(), {
-name: 'rtl::OUString',
-'fromWireType'(ptr) {
-let data = Module.HEAPU32[ptr >> 2];
-let length = Module.HEAPU32[(data >> 2) + 1];
-let buffer = data + 8;
-let str = '';
-for (let i = 0; i < length; ++i) {
-let c = Module.HEAPU16[(buffer >> 1) + i];
-str += String.fromCharCode(c);
-}
-Module.rtl_uString_release(data);
-Module._free(ptr);
-return str;
-},
-'toWireType'(destructors, value) {
-if (typeof value != 'string') {
-Module.throwBindingError('Cannot pass non-string to C++ 
OUString');
-}
-let data = Module._malloc(8 + (value.length + 1) * 2);
-Module.HEAPU32[data >> 2] = 1;
-Module.HEAPU32[(data >> 2) + 1] = value.length;
-let buffer = data + 8;
-for (let i = 0; i < value.length; ++i) {
-Module.HEAPU16[(buffer >> 1) + i] = value.charCodeAt(i);
-}
-Module.HEAPU16[(buffer >> 1) + value.length] = 0;
-let ptr = Module._malloc(4);
-Module.HEAPU32[ptr >> 2] = data;
-if (destructors !== null) {
-destructors.push(Module._free, ptr);
-}
-return ptr;
-},
-'argPackAdvance': 8,
-'readValueFromPointer'(pointer) {
-return this['fromWireType'](Module.HEAPU32[((pointer)>>2)]);
-},
-destructorFunction(ptr) {
-Module._free(ptr);
-},
-});
-});
-});
diff --git a/static/source/unoembindhelpers/PrimaryBindings.cxx 
b/static/source/unoembindhelpers/PrimaryBindings.cxx
index ee4998988c19..0a27162c3ef1 100644
--- a/static/source/unoembindhelpers/PrimaryBindings.cxx
+++ b/static/source/unoembindhelpers/PrimaryBindings.cxx
@@ -9,6 +9,7 @@
 #ifdef EMSCRIPTEN
 #include 
 
+#include 
 #include 
 
 #include 
@@ -22,6 +23,58 @@
 using namespace emscripten;
 using namespace css::uno;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winvalid-pp-token"
+EM_JS(void, jsRegisterString, (std::type_info const* raw),
+// clang-format off
+{
+Module.registerType(raw, {
+name: 'rtl::OUString',
+fromWireType(ptr) {
+let data = Module.HEAPU32[ptr >> 2];
+let length = Module.HEAPU32[(data >> 2) + 1];
+let buffer = data + 8;
+let str = '';
+for (let i = 0; i < length; ++i) {
+let c = Module.HEAPU16[(buffer >> 1) + i];
+str += String.fromCharCode(c);
+}
+Module.rtl_uString_release(data);
+Module._free(ptr);
+

core.git: solenv/gbuild

2024-02-14 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit ae17922b7d0f797129dd5fbd5514d691ac9ebeaa
Author: Noel Grandin 
AuthorDate: Wed Feb 14 09:33:05 2024 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 14 10:49:36 2024 +0100

add more libs into --enable-mergelibs=more build

Change-Id: Idec36cb54e998c9e4830d5e51a6d2df7d94170fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163350
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 9a2fffa033ac..c51ea9fcfe7f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -130,6 +130,11 @@ gb_MERGE_LIBRARY_LIST += \
date \
$(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
dlgprov \
+   $(if $(ENABLE_EVOAB2),evoab) \
+   $(call gb_Helper_optional,DBCONNECTIVITY, \
+   flat \
+   file) \
+   $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
$(if $(filter WNT,$(OS)), \
fps \
) \
@@ -138,13 +143,26 @@ gb_MERGE_LIBRARY_LIST += \
) \
graphicfilter \
hwp \
+   $(if $(ENABLE_JAVA),hsqldb) \
log \
$(if $(ENABLE_LWP),lwpft) \
+   $(if $(filter $(OS),MACOSX), \
+   macab1 \
+   macabdrv1 \
+   ) \
+   mozbootstrap \
msforms \
+   $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
+   $(call gb_Helper_optional,MARIADBC,$(call 
gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
+   odbc \
pdffilter \
+   $(if $(BUILD_POSTGRESQL_SDBC), \
+   postgresql-sdbc \
+   postgresql-sdbc-impl) \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
+   sdbc2 \
slideshow \
$(if $(filter WNT,$(OS)), \
smplmail \

core.git: solenv/gbuild

2024-02-13 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 29c9587df7f0e7ce27e616c6fc9640a1df0d20a7
Author: Noel Grandin 
AuthorDate: Tue Feb 13 16:20:07 2024 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 13 18:13:46 2024 +0100

fix --enable-mergelibs=more build on Windows

I was over-enthusiastic adding these to the merged list, they
are DLLs with their own DllMain functions

Change-Id: I78a4e026e746f9688bc982ea7c899b05cf8f441d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163309
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index c2ec1e3b083b..9a2fffa033ac 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -138,15 +138,9 @@ gb_MERGE_LIBRARY_LIST += \
) \
graphicfilter \
hwp \
-   $(if $(filter WNT,$(OS)), \
-   inprocserv \
-   ) \
log \
$(if $(ENABLE_LWP),lwpft) \
msforms \
-   $(if $(filter WNT,$(OS)), \
-   oleautobridge \
-   ) \
pdffilter \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
@@ -159,9 +153,6 @@ gb_MERGE_LIBRARY_LIST += \
svgfilter \
t602filter \
textconversiondlgs \
-   $(if $(filter WNT,$(OS)), \
-   UAccCOM \
-   ) \
$(call gb_Helper_optional,XMLHELP,ucpchelp1) \
$(if $(ENABLE_LIBCMIS),ucpcmis1) \
$(if $(WITH_WEBDAV),ucpdav1) \

core.git: solenv/gbuild

2024-01-31 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 40045883b04e1c0694f802d98d417c9b48e0f4fd
Author: Noel Grandin 
AuthorDate: Thu Feb 1 08:13:54 2024 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 1 08:45:40 2024 +0100

fix --enable-mergelibs build on macOS

by including the spellchecker library into the merged library

Change-Id: I427458005af3b30bfdcd2134ef102852e4c92ea2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162861
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index f6d9d2398a2c..44b9bbc47688 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -54,6 +54,7 @@ gb_MERGE_LIBRARY_LIST := \
lng \
lnth \
localebe1 \
+   $(if $(filter iOS MACOSX,$(OS)),MacOSXSpell) \
msfilter \
mtfrenderer \
numbertext \

core.git: solenv/gbuild

2024-01-26 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/unxgcc.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d10fb7eb23174786e3704d288c1bb56e6e08cca1
Author: Stephan Bergmann 
AuthorDate: Fri Jan 26 08:46:36 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 26 09:40:04 2024 +0100

Use && rather than ; between commands, to not hide errors

Change-Id: I4f8dc3d338b64452dc92c850c7dc174bb59611bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162592
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 29adbf9dc42f..58bca1f247cc 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -134,7 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" ; \
 )
-   +$(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
+   +$(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS &&) \
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
@@ -180,10 +180,10 @@ $(if $(filter Library,$(TARGETTYPE)), $(call 
gb_Helper_abbreviate_dirs,\
 $(WORKDIR)/LinkTarget/$(2).exports,$(1
 $(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter 
EMSCRIPTEN,$(OS))), \
 $(if $(filter TRUE,$(ENABLE_QT5)), \
-sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \
-cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) ; \
+sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)) && \
+cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) && \
 ) \
-cp $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data ; \
+cp $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data && \
 cp $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata \
 )
 endef
@@ -191,7 +191,7 @@ endef
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
-   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ; \
+   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS && \
RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)), \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \

core.git: solenv/gbuild

2024-01-15 Thread Michael Stahl (via logerrit)

 solenv/gbuild/UnoApiTarget.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e4717342e5bea23f590a42d565a09ace600e2ca5
Author: Michael Stahl 
AuthorDate: Fri Jan 12 13:57:34 2024 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 15 11:06:19 2024 +0100

gbuild: WASM: try to fix "Missing generated source file *_embind.cxx"

Need a dependency on UnoApiHeadersTarget.

Change-Id: Ie9ca3a4806d15e2535f1119a00f9214ce9520a5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161973
Tested-by: Jenkins
Reviewed-by: Balazs Varga 
Reviewed-by: Michael Stahl 

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 7c52ecc81f1e..59b2d07e149b 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -217,6 +217,11 @@ $(call 
gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hpp : \
| $(call 
gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
touch $$@
 
+$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%_embind.cxx : \
+   $(call gb_Executable_get_target_for_build,cppumaker) \
+   | $(call 
gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
+   touch $$@
+
 endef
 
 # ensure that idl change triggers the dummy rule to rebuild the headers

core.git: solenv/gbuild

2024-01-02 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2deec946ebfc8f14792e971a354906d1c723164
Author: Stephan Bergmann 
AuthorDate: Tue Jan 2 11:22:34 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 2 16:22:48 2024 +0100

Fix Windows path separator

...broken since 84ef6d82546b044990f4efd57e51e29c6c6565c8 "Build external 
lxml if
not provided by system"

Change-Id: Ie76c32a1d3094e6d98db7d50195571ae31c0ada6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161536
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index d8cab84ff7c7..16cc4201b40e 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -740,7 +740,7 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
 gb_Python_HOME := $(INSTDIR_FOR_BUILD)/program/python-core-$(PYTHON_VERSION)
-gb_Python_PRECOMMAND := PATH="$(shell cygpath -w 
$(INSTDIR_FOR_BUILD)/program)" PYTHONHOME="$(gb_Python_HOME)" 
PYTHONPATH="$${PYPATH:+$$PYPATH:}$(gb_Python_HOME)/lib;$(gb_Python_HOME)/lib/lib-dynload:$(INSTDIR_FOR_BUILD)/program"
+gb_Python_PRECOMMAND := PATH="$(shell cygpath -w 
$(INSTDIR_FOR_BUILD)/program)" PYTHONHOME="$(gb_Python_HOME)" 
PYTHONPATH="$${PYPATH:+$$PYPATH;}$(gb_Python_HOME)/lib;$(gb_Python_HOME)/lib/lib-dynload:$(INSTDIR_FOR_BUILD)/program"
 gb_Python_INSTALLED_EXECUTABLE := 
$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER)/python.exe
 
 gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w 
$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)"

[Libreoffice-commits] core.git: solenv/gbuild

2023-11-25 Thread Mike Kaganski (via logerrit)

 solenv/gbuild/UITest.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b5743ae5f576e45576426593da58fa74bb88c01b
Author: Mike Kaganski 
AuthorDate: Sat Nov 25 12:49:16 2023 +0100
Commit: Mike Kaganski 
CommitDate: Sat Nov 25 13:42:46 2023 +0100

Simplify UITest's custom configuration handling

Change-Id: I20d7d3a17b3a0ca817ee5acdab77f51983852078
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159898
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 65bc37c1d1bf..334080b70a70 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -60,11 +60,9 @@ else
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
mkdir -p $(dir $(call gb_UITest_get_target,$*))/user/user && \
-   cp $(SRCDIR)/qadevOOo/qa/registrymodifications.xcu $(dir $(call 
gb_UITest_get_target,$*))/user/user/ && \
+   cp -T $(if 
$(gb_UITest_use_config),$(gb_UITest_use_config),$(SRCDIR)/qadevOOo/qa/registrymodifications.xcu)
 $(dir $(call gb_UITest_get_target,$*))/user/user/registrymodifications.xcu && \
$(if $(gb_UITest__interactive),, \
rm -fr $@.core && mkdir -p $(dir $(call 
gb_UITest_get_target,$*))user/ && mkdir $@.core && cd $@.core && ) \
-   $(if $(gb_UITest_use_config), \
-   cp $(gb_UITest_use_config) $(dir $(call 
gb_UITest_get_target,$*))user/user && ) \
$(call gb_CppunitTest_coredumpctl_setup,$@) \
($(gb_UITest_PRECOMMAND) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \

[Libreoffice-commits] core.git: solenv/gbuild

2023-11-22 Thread Mike Kaganski (via logerrit)

 solenv/gbuild/platform/filter-showIncludes.awk |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 1bdf64cb4fa0a7bdc50c39c12be0d6897d6eea2f
Author: Mike Kaganski 
AuthorDate: Wed Nov 22 07:44:41 2023 +0100
Commit: Mike Kaganski 
CommitDate: Wed Nov 22 09:01:14 2023 +0100

Drop a redundant CR cleanup

Commit 9166569da389de44075b3d03413b353046a4 (Remove stray
CR from input, 2017-03-09) had introducing the removal of CR
from CRLF generated by MSVC's cl.exe -showIncludes.

Then, commit e9b9a456221b4b0660f90efa1ee092ea00c2c728 (gbuild:
strip away unexpected CR char at the end of Windows filenames,
2017-07-26) added a replacement doing the same, but using a
literal CR instead of "\r". It had in its commit message:

> seen with 2013 on libreoffice-5-2, but there is no
> indication that 2015 on master would be different

libreoffice-5-3-branch-point was tagged on 2016-11-23 (commit
4136757b4e51c4e6f7cb4132c95538a7f831ef2c), so the 5-2 branch
did not contain the former change, and so the premise that
"master would be no different" was likely incorrect.

Change-Id: If992eb826c5d6c2868c9bd706ae51847fe69eda7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159754
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk 
b/solenv/gbuild/platform/filter-showIncludes.awk
index 9f5cabd1085b..a5e6e5879a6e 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -45,13 +45,6 @@ BEGIN {
 if (index($0, showincludes_prefix) == 1) {
 $0 = substr($0, length(showincludes_prefix) + 1)
 sub(/^ */, "")
-
-# The output from MSVC may contain a carriage return character at the
-# end of filenames, in which case the translation unit will depend on a
-# non-existing header, resulting in constant rebuild of all files,
-# prevent that.
-sub(/
/, "")
-
 gsub(/\\/, "/")
 gsub(/ /, "\\ ")
 if ($0 ~ allowlist) { # filter out system headers

[Libreoffice-commits] core.git: solenv/gbuild

2023-11-17 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/CppunitTest.mk |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 533e993f2d11814252c40d60bdab469de03b14db
Author: Stephan Bergmann 
AuthorDate: Fri Nov 17 14:23:41 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 17 16:57:01 2023 +0100

Don't reuse --unit values across (sequential, even) systemd-run invocations

At least some old versions of systemd-run apparently have occasional issues 
when
sequential invocations reuse the same --unit value, as
 now (i.e., after the 
machine was
updated to auto-detect --with-coredumpctl) failed with

> [build CUT] basctl_dialogs_test
> LO_TEST_LOCALE=de
> Running scope as unit: 
-home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope
[...]
> LO_TEST_LOCALE=en-US
> Running scope as unit: 
-home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope
[...]
> LO_TEST_LOCALE=fi
> Failed to start transient scope unit: Unit 
-home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope
 already exists.

Change-Id: If009e26231228bec739637e4140be90c0b86d6b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159569
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 18af97e7fff1..adfe49fb 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -27,7 +27,7 @@ gb_CppunitTest_coredumpctl_setup :=
 gb_CppunitTest_coredumpctl_run :=
 else
 gb_CppunitTest_coredumpctl_setup = \
-export LIBO_TEST_UNIT=$$($(SYSTEMD_ESCAPE) "$1:$$(date -u 
+%Y%m%d%H%M%S):" | cut -b -249) &&
+export LIBO_TEST_UNIT=$$($(SYSTEMD_ESCAPE) "$1:$$(date -u 
+%Y%m%d%H%M%S):$(if $2,:$2)" | cut -b -249) &&
 gb_CppunitTest_coredumpctl_run := $(SYSTEMD_RUN) --scope --user 
--unit="$$LIBO_TEST_UNIT"
 endif
 
@@ -135,10 +135,11 @@ else
$(if $(gb_CppunitTest__interactive),, \
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core && mkdir $@.core && cd $@.core 
&&)) \
-   $(call gb_CppunitTest_coredumpctl_setup,$@) \
( \
$(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do \
-   printf 'LO_TEST_LOCALE=%s\n' "$$l" && 
LO_TEST_LOCALE="$$l" ) \
+   printf 'LO_TEST_LOCALE=%s\n' "$$l" && ) \
+   $(call gb_CppunitTest_coredumpctl_setup,$@,$(if 
$(gb_CppunitTest_localized),$$l)) \
+   $(if $(gb_CppunitTest_localized),LO_TEST_LOCALE="$$l") \
$(if $(gb_CppunitTest__vcl_no_svp), \
$(filter-out 
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
$(EXTRA_ENV_VARS) \

[Libreoffice-commits] core.git: solenv/gbuild

2023-11-08 Thread Miklos Vajna (via logerrit)

 solenv/gbuild/UITest.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit eef9ed1fa7c6b1fcd9dbe2942243e7957f9cdee1
Author: Miklos Vajna 
AuthorDate: Wed Nov 8 21:06:42 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 9 08:21:17 2023 +0100

gbuild: remove not needed gb_UITest_use_oneprocess

It's the default. If one wants to opt out, gb_UITest_avoid_oneprocess
should be used.

Change-Id: I52433b20f63c06abf8cb15b8bd26da845ecee00c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159185
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 648d1d4f62a1..5859b9e56de4 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -136,10 +136,6 @@ define gb_UITest_use_configuration
 $(call gb_UITest_get_target,$(1)) : gb_UITest_use_config := $(2)
 endef
 
-define gb_UITest_use_oneprocess
-$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(true)
-endef
-
 define gb_UITest_avoid_oneprocess
 $(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(false)
 endef

[Libreoffice-commits] core.git: solenv/gbuild

2023-11-07 Thread Sarper Akdemir (via logerrit)

 solenv/gbuild/extensions/pre_BuildTools.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dab20fa2f6cc608a3497ff8d7e756806f8a59932
Author: Sarper Akdemir 
AuthorDate: Tue Nov 7 00:20:31 2023 +0300
Commit: Sarper Akdemir 
CommitDate: Tue Nov 7 09:06:33 2023 +0100

specify the reason for listing zxcvbn-c among build tools

Change-Id: I814cebc6e8ca4815c055ed6f524bfebf08611ccc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159017
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir 

diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index deaaf0b0aff7..c31c809b9993 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -44,6 +44,8 @@ gb_BUILD_TOOLS_executables_extern = \
 python \
xsltproc \
 
+# zxcvbn-c depends on a generated header by native code, therefore it is built
+# both for the build and the host platform.
 gb_BUILD_TOOLS = \
 $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call 
gb_Executable_get_runtime_dependencies,$(executable))) \
 $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call 
gb_ExternalExecutable_get_dependencies,$(executable))) \

[Libreoffice-commits] core.git: solenv/gbuild

2023-11-02 Thread Mike Kaganski (via logerrit)

 solenv/gbuild/extensions/post_GbuildToJson.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8aec57f54b3c6686868a44855c0a0bff339f4835
Author: Mike Kaganski 
AuthorDate: Thu Nov 2 19:52:31 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Nov 3 06:03:16 2023 +0100

gbuildtojson: announce every target

vs-ide-integration takes tens of minutes on my system; and most
of the time, it didn't output anything to the terminal. Every
target handled by gbuildtojson takes ~2 s; with more than 870
targets, it makes sense to show the progress to avoid making an
impression of a hang.

The "GBJ" abbreviation (for "gbuildtojson") was not used in the
output before.

Change-Id: I71ab3ae59d1034f47140aad0dab6ed170140acb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158846
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk 
b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 2656c1966d0b..080a12837ab7 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -40,6 +40,7 @@ $(gb_GbuildToJson_PHONY):
 
 
 define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),GBJ,1)
 mkdir -p $(WORKDIR)/GbuildToJson/$(dir $(2))
 mkdir -p $(WORKDIR)/LinkTarget/$(dir $(2))
 $(if 
$(GBUILDTOJSON_LD_LIBRARY_PATH),LD_LIBRARY_PATH=$(GBUILDTOJSON_LD_LIBRARY_PATH))
 \

[Libreoffice-commits] core.git: solenv/gbuild

2023-10-27 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0b663a28b47ef3bfff569034e5afcd9b0b1d0f00
Author: Stephan Bergmann 
AuthorDate: Fri Oct 27 11:31:28 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 27 13:28:44 2023 +0200

At least use the oldest available -std:c++14 for MSVC gb_CXX03FLAGS

...if we don't have a proper -std:c++03 available

Change-Id: Iffef738be486b402a2b6af1a2761eb905ac4ddf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158550
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 0a3df54ce49c..2e7b2728de32 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -208,8 +208,9 @@ gb_STDLIBS := \
 gb_CFLAGS_WERROR = $(if $(ENABLE_WERROR),-WX)
 
 # there does not seem to be a way to force C++03 with MSVC, nor with clang-cl 
against MSVC system
-# headers
-gb_CXX03FLAGS :=
+# headers; the oldest version that MSVC supports is C++14, so use that as a 
rather imperfect
+# approximation:
+gb_CXX03FLAGS := -std:c++14
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-EHs \

[Libreoffice-commits] core.git: solenv/gbuild

2023-10-23 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/static.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af2457dd1f421d657f8d2ad3e2d8493ab9288d4d
Author: Christian Lohmaier 
AuthorDate: Fri Oct 20 18:00:25 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Oct 23 19:16:57 2023 +0200

liborcus(-parser) also needs boost_iostreams - fixes wasm build

not handling that automatically from the info from the regular build is
kinda ugly, probably can be done via RepositoryExternal.mk, but since it
was done that way initially after much tinkering, I don't want to invest
much time into rewriting the static build stuff just to get rid of the
few lines for icu and liborcus 

Change-Id: I2a620426854eb16e2388159bb3bbf1a514872ef9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158267
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/static.mk b/solenv/gbuild/static.mk
index 9b98ec99c593..b6eb9b1fe8cd 100644
--- a/solenv/gbuild/static.mk
+++ b/solenv/gbuild/static.mk
@@ -184,7 +184,7 @@ $(if $(filter-out GBUILD_TOUCHED,$(call 
gb_LinkTarget__get_all_statics,$(1))),
 $(if $(filter icui18n icuuc,$(call gb_LinkTarget__get_all_externals,$(1))),
 $(call gb_LinkTarget_use_externals,$(1),icudata))
 $(if $(filter orcus-parser,$(call gb_LinkTarget__get_all_externals,$(1))),
-$(call gb_LinkTarget_use_static_libraries,$(1),boost_filesystem))
+$(call gb_LinkTarget_use_static_libraries,$(1),boost_filesystem 
boost_iostreams))
 
 $(if $(gb_DEBUG_STATIC),
 $(info gb_LinkTarget__expand_executable libraries for $(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)): $(call 
gb_LinkTarget__get_all_libraries,$(1)))

[Libreoffice-commits] core.git: solenv/gbuild

2023-09-24 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19e9fe7c8c89399753ac1730e1c76378b18418bc
Author: Stephan Bergmann 
AuthorDate: Sun Sep 24 18:49:09 2023 +0300
Commit: Stephan Bergmann 
CommitDate: Sun Sep 24 20:58:33 2023 +0200

Adapt a hard-coded value hack

...from 22267b7797340d1eb52ced10fe05afeb8a42fc2b "When building with 
clang-cl,
nevertheless use MSVC's CXXFLAGS_CXX11 for CLR" to
1eef07805021b7ca26a1a8894809b6d995747ba1 "Bump baseline to C++20"

Change-Id: I817a33b7ca5ae4db232bf4c983d46e808dc83f24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157230
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 63e618783e63..0a3df54ce49c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -271,7 +271,7 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 # in CLR meta-data - use of this type may lead to a runtime exception":
 gb_CXXCLRFLAGS := \
$(if $(COM_IS_CLANG), \
-   $(patsubst -std=%,-std:c++17 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
+   $(patsubst -std=%,-std:c++20 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
$(gb_CXXFLAGS)) \
$(gb_LinkTarget_EXCEPTIONFLAGS) \
-AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \

[Libreoffice-commits] core.git: solenv/gbuild

2023-08-28 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/LinkTarget.mk|   22 +-
 solenv/gbuild/platform/com_GCC_defs.mk |   13 +++--
 solenv/gbuild/platform/com_MSC_defs.mk |   13 +++--
 3 files changed, 31 insertions(+), 17 deletions(-)

New commits:
commit 43939d0b3286266217a2625d5a7a3de1a2cdd303
Author: Stephan Bergmann 
AuthorDate: Wed Aug 23 22:11:30 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 28 14:50:13 2023 +0200

Do a real compile after a successful COMPILER_PLUGIN_TOOL=... compile

...so that object files are generated after all, even though the
COMPILER_PLUGIN_TOOL=... compile itself doesn't generate them.

(This required the existing gb_COMPILER_PLUGIN variable to be 
disambiguated, by
splitting off a new gb_COMPILER_PLUGINS_TOOL variable.)

Change-Id: I652c98c9ef2a6120a6e3f809af5ab2ccf09dabc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156194
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9bf4cacf2b8a..85139659c634 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -98,7 +98,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_CFLAGS) $(T_CFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -113,7 +113,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -128,7 +128,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -158,7 +158,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_CXXCLRFLAGS) $(T_CXXCLRFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -266,6 +266,7 @@ $(call gb_CObject_get_target,%) : $(call 
gb_CObject_get_source,$(SRCDIR),%) $(gb
$(call gb_Output_announce,$*.c,$(true),C  ,3)
$(call gb_Trace_StartRange,$*.c,C  )
$(if $(call gb_LinkTarget__tool_compile_enabled),$(call 
gb_CObject__tool_command,$*,$<,$(COMPILER_PLUGINS)))
+   $(if $(call gb_LinkTarget__tool_compile_enabled),$(if 
$(COMPILER_PLUGIN_TOOL),$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) 
$(T_CFLAGS_APPEND),$<,$(call 
gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_CC
$(call gb_Trace_EndRange,$*.c,C  )
 else
 $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
@@ -328,6 +329,8 @@ $(call gb_CxxObject_get_target,%) : $(call 
gb_CxxObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.cxx,$(true),CXX,3)
$(call

[Libreoffice-commits] core.git: solenv/gbuild

2023-08-09 Thread Hossein (via logerrit)

 solenv/gbuild/platform/com_MSC_class.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 0c9f095a01682d8cb99a596e568bd81ae96906a5
Author: Hossein 
AuthorDate: Thu May 25 15:55:11 2023 +0200
Commit: Hossein 
CommitDate: Wed Aug 9 10:15:16 2023 +0200

tdf#155446 Fix problem with ccache on Windows

This patch fixes the recent problem with building LibreOffice with ccache
on Windows which was caused by the lack of double quotation mark between
ccache.exe and path to the MSVC compiler.

Change-Id: I1a714513ccb8cd674895d0c887013ea862d3b544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152277
Tested-by: Jenkins
Reviewed-by: Hossein 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index ba42b0ba48df..d8cab84ff7c7 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -179,7 +179,7 @@ define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
 mkdir -p $(dir $(1)) $(dir $(4)) && \
-"$(CC)" -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && 
\
+$(CC) -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && \
 "$(ML_EXE)" $(gb_AFLAGS) -g -errorReport:prompt -o $(1) $(subst 
.o,.asm,$(1)), \
 ) && \
 echo "$(1) : $(3)" > $(4)
@@ -664,8 +664,12 @@ gb_AUTOCONF_WRAPPERS = \
 gb_ExternalProject_INCLUDE := \
$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))
 
+# Workaround for openssl build - it puts the CC var into additional pair of 
quotes. This breaks if
+# CC consists of more than a single element such as when using "ccache 
compiler". In case the
+# variables are exported for openssl, it closes and reopens the quotes after 
each element.
 gb_NMAKE_VARS = \
-   CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
+   CC="$(subst $(WHITESPACE),$(if $(filter openssl,$(1)),\" \", ),$(strip \
+   $(shell cygpath -ws $(filter-out -%,$(CC))) $(filter 
-%,$(CC" \
INCLUDE="$(gb_ExternalProject_INCLUDE)" \
LIB="$(ILIB)" \
MAKEFLAGS= \

[Libreoffice-commits] core.git: solenv/gbuild

2023-07-18 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 33eb52e005eb67856137475ff761ce4df006bd57
Author: Stephan Bergmann 
AuthorDate: Mon Jul 17 17:16:03 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 18 08:14:20 2023 +0200

MSVC: Silence C++23 std::numeric_limits::has_denorm deprecation warning

...as seen at least when building against VS 2022 Preview 17.7.0 Preview 
3.0 and
--with-latest-c++,

> [build CXX] connectivity/source/commontools/RowFunctionParser.cxx
> 
workdir\UnpackedTarball\boost\boost/spirit/home/classic/core/primitives/impl/numerics.ipp(199):
 error C2220: the following warning is treated as an error
> 
workdir\UnpackedTarball\boost\boost/spirit/home/classic/core/primitives/impl/numerics.ipp(199):
 warning C4996: 'std::_Num_base::has_denorm': warning STL4042: 
std::float_denorm_style, std::numeric_limits::has_denorm, and 
std::numeric_limits::has_denorm_loss are deprecated in C++23. You can define 
_SILENCE_CXX23_DENORM_DEPRECATION_WARNING or 
_SILENCE_ALL_CXX23_DEPRECATION_WARNINGS to suppress this warning.
> 
workdir\UnpackedTarball\boost\boost/spirit/home/classic/core/primitives/impl/numerics.ipp(193):
 note: while compiling class template member function 'bool 
boost::spirit::classic::impl::negative_accumulate::add(T &,T)'
> with
> [
> T=int
> ]
[...]

etc.

Change-Id: If9f03e0c5e910549df1c5eb0e089b39623776311
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154552
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index ad425e9b5fdd..407ca991007d 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -40,6 +40,11 @@ ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
 endif
 
+# _SILENCE_CXX23_DENORM_DEPRECATION_WARNING is needed at least with Boost 
1.82.0 using
+# std::numeric_limits::has_denorm in
+# 
workdir/UnpackedTarball/boost/boost/spirit/home/classic/core/primitives/impl/numerics.ipp,
 in turn
+# included from boost/spirit/include/classic_core.hpp as included from various 
of our code files:
+
 # _SCL_SECURE_NO_WARNINGS avoids deprecation warnings for STL algorithms
 # like std::copy, std::transform (when MSVC_USE_DEBUG_RUNTIME is enabled)
 
@@ -50,6 +55,7 @@ gb_COMPILERDEFS := \
-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \
-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \
-D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING \
+   -D_SILENCE_CXX23_DENORM_DEPRECATION_WARNING \
-D_CRT_NON_CONFORMING_SWPRINTFS \
-D_CRT_NONSTDC_NO_DEPRECATE \
-D_CRT_SECURE_NO_DEPRECATE \

[Libreoffice-commits] core.git: solenv/gbuild sw/UITest_sw_styleInspector.mk uitest/test_main.py uitest/uitest

2023-03-20 Thread Miklos Vajna (via logerrit)

 solenv/gbuild/UITest.mk|6 ++
 sw/UITest_sw_styleInspector.mk |2 ++
 uitest/test_main.py|   12 ++--
 uitest/uitest/framework.py |   28 
 uitest/uitest/test.py  |   13 -
 5 files changed, 50 insertions(+), 11 deletions(-)

New commits:
commit f5d97d14a2169c23b801d5d09ea19c001d36bba1
Author: Miklos Vajna 
AuthorDate: Mon Mar 20 08:14:13 2023 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 20 12:40:22 2023 +

uitest: add a way to optionally use the same soffice process for a testsuite

A uitest suite may have several testcases and we spend a lot of time
spinning up a new soffice process for each testcase, while we typically
do such initialization only once for per testsuites in the cppunit case,
slowing down uitests.

The problem is that this way today's uitest cases don't really have to
clean up after themselves, since they know that the next testcase will
gets its own clean state (back to the start center).

Fix the problem by adding an opt-in way, so that a uitest suite can
declare that it's safe to run the entire suite with the same soffice
process. To be more specific:
- add a new --oneprocess for test_main.py, which will create a shared
  connection to a soffice process
- UITest then closes the document (returning to the start center)
  instead of disposing the component in the oneprocess case
- UITestCase won't create its own soffice connection in the oneprocess
  case
- add a new gb_UITest_use_oneprocess method to gbuild, to request this
  new, faster behavior
E.g. on my machine this means UITest_sw_styleInspector takes 26,345s
instead of 40,652s, probably such a speedup is worth the added
complexity.

This works nicely when the testsuite is a list of simple/boring test
cases, always loading one component/document at a time and always using
close_doc() to close it. It may not be safe for testsuites that do
something special (they may fail or hang), we'll see.

Change-Id: Ib14439d48aa547c92652245ee1c0cf37d2d7b6e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149134
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 0a08939239b8..3b78b1356d90 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -80,6 +80,7 @@ else
$(gb_TEST_ENV_VARS) \
$(gb_UITest_COMMAND) \
--soffice="$(gb_UITest_SOFFICEARG)" \
+   $(if $(ONEPROCESS),--oneprocess) \
--userdir=$(call gb_Helper_make_url,$(dir $(call 
gb_UITest_get_target,$*))user) \
--dir=$(strip $(MODULES)) \
$(gb_UITest_GDBTRACE) \
@@ -104,6 +105,7 @@ $(call gb_UITest_get_target,$(1)) : MODULES :=
 $(eval $(call gb_TestHelpers_use_more_fonts,$(call gb_UITest_get_target,$(1
 $(eval $(call gb_Module_register_target,$(call 
gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1
 $(call gb_Helper_make_userfriendly_targets,$(1),UITest)
+$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(false)
 
 endef
 
@@ -133,6 +135,10 @@ define gb_UITest_use_configuration
 $(call gb_UITest_get_target,$(1)) : gb_UITest_use_config := $(2)
 endef
 
+define gb_UITest_use_oneprocess
+$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(true)
+endef
+
 
 else # DISABLE_PYTHON
 
diff --git a/sw/UITest_sw_styleInspector.mk b/sw/UITest_sw_styleInspector.mk
index d255dfbd756f..667482649619 100644
--- a/sw/UITest_sw_styleInspector.mk
+++ b/sw/UITest_sw_styleInspector.mk
@@ -14,3 +14,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_styleInspector,$(SRCDIR)/sw/qa/uitest,\
 $(eval $(call gb_UITest_set_defs,sw_styleInspector, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
+
+$(eval $(call gb_UITest_use_oneprocess,sw_styleInspector))
diff --git a/uitest/test_main.py b/uitest/test_main.py
index 511f2a5c8bd4..1957f54dc373 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -16,12 +16,13 @@ import types
 from uitest.framework import UITestCase
 
 from libreoffice.connection import OfficeConnection
+from libreoffice.connection import PersistentConnection
 
 test_name_limit_found = False
 
 def parseArgs(argv):
 (optlist,args) = getopt.getopt(argv[1:], "hr",
-["help", "soffice=", "userdir=", "dir=", "file=", "gdb"])
+["help", "soffice=", "oneprocess", "userdir=", "dir=", "file=", 
"gdb"])
 return (dict(optlist), args)
 
 def usage():
@@ -94,7 +95,7 @@ def add_tests_for_file(test_file, test_suite):
 continue
 test_name_limit_found = True
 
-obj = c(test_name, opts)
+obj = c(test_name, opts, connection)
 test_suite.addTest(obj)
 
 def get_test_suite_for_dir(opts):
@@ -108,6 +109,10 @@ def get_test_suite_for_dir(opts):

[Libreoffice-commits] core.git: solenv/gbuild

2023-02-16 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 49445ccb891c6eb85b1d644c975c1b092ef00e43
Author: Tor Lillqvist 
AuthorDate: Mon Feb 13 14:54:24 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 16 21:27:14 2023 +

Use -O3 for Emscripten, seems to work

Change-Id: I7effd75355ff81e6d4f85b1c6047c7656bfbb915
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147006
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 4ae925daf5d1..a69539b65403 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -71,6 +71,8 @@ ifeq ($(HAVE_EXTERNAL_DWARF),TRUE)
 gb_DEBUGINFO_FLAGS += -gseparate-dwarf
 endif
 
+gb_COMPILEROPTFLAGS := -O3
+
 # We need at least code elimination, otherwise linking OOMs even with 64GB.
 # So we "fake" -Og support to mean -O1 for Emscripten and always enable it for 
debug in configure.
 gb_COMPILERDEBUGOPTFLAGS := -O1

[Libreoffice-commits] core.git: solenv/gbuild

2023-02-16 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 21e9ebb75b284b140b892f6f69a779d5277044d8
Author: Tor Lillqvist 
AuthorDate: Thu Feb 16 13:20:53 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 16 11:35:39 2023 +

Add comment about using WASM exceptions

Change-Id: I402bf56b89b3a18f854331915f827f7512fb05e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147152
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index fa7b51e54cc4..4ae925daf5d1 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -32,6 +32,10 @@ gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST 
-DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO
 
 gb_Executable_EXT := .html
 ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
+# Note that to really use WASM exceptions everywhere, you most probably want 
to also use
+# CC=emcc -pthread -s USE_PTHREADS=1 -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
+# and CXX=em++ -pthread -s USE_PTHREADS=1 -fwasm-exceptions -s 
SUPPORT_LONGJMP=wasm
+# in your autogen.input. Otherwise these flags won't propagate to all external 
libraries, I fear.
 gb_EMSCRIPTEN_EXCEPT = -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
 gb_EMSCRIPTEN_CPPFLAGS += -s SUPPORT_LONGJMP=wasm
 else

[Libreoffice-commits] core.git: solenv/gbuild

2023-01-24 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e2d28934e273386e2f56a4eef0a9f03fa5d5c7d
Author: Tor Lillqvist 
AuthorDate: Tue Jan 24 17:19:27 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 24 15:21:31 2023 +

Clarify comment

Change-Id: I33d10ea4f3ca35619d6f857d18b5c53a22d822a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146097
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 3a14e841bc97..89e717ccd15a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -280,7 +280,7 @@ endif
 
 # For Emscripten, the emcc command is a Python script that outputs annoying 
warnings like
 # .../emscripten/tools/building.py:638: ResourceWarning: unclosed file 
<_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' 
mode='w' encoding='utf-8'>
-# into stderr, which makes the configure script think that there is a problem 
in
+# into stderr, which makes a configure script think that there is a problem in
 # compiling even a microscopic test program with an option like -Werror which
 # surely *is* supported. Avoid this by setting PYTHONWARNINGS=ignore.

[Libreoffice-commits] core.git: solenv/gbuild

2023-01-24 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit e37a4598bbfcc4359fb13e362888b5fe29a997ef
Author: Tor Lillqvist 
AuthorDate: Tue Jan 24 13:09:42 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 24 15:11:49 2023 +

Use PYTHONWARNINGS=ignore instead of 'default' for Emscripten

The Emscripten compiler, emcc is a Python script that wraps the actual
compiler. It outputs annoying warnings like

.../emscripten/tools/building.py:638: ResourceWarning: unclosed file 
<_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' 
mode='w' encoding='utf-8'>

to stderr. (Ditto for em++.) Some steps in typical configure script
think that a non-empty stderr means there was a problem in compiling a
test program. This happens even for a microscopic test program with an
option like -Werror which surely *is* supported.  Avoid this by
setting PYTHONWARNINGS=ignore.

Change-Id: I11927fc7dccaa65a239ba65dfc7c6bb7487bf12d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146070
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 0cbe852539c9..3a14e841bc97 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -275,9 +275,16 @@ endif
 ifeq ($(COMPILER_PLUGINS_DEBUG),TRUE)
 gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang --debug
 endif
-# set CCACHE_CPP2=1 to prevent clang generating spurious warnings
-# clear PYTHONWARNINGS to prevent noise from emscripten implementation
-gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter 
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=default)
+
+# Set CCACHE_CPP2=1 to prevent Clang generating spurious warnings.
+
+# For Emscripten, the emcc command is a Python script that outputs annoying 
warnings like
+# .../emscripten/tools/building.py:638: ResourceWarning: unclosed file 
<_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' 
mode='w' encoding='utf-8'>
+# into stderr, which makes the configure script think that there is a problem 
in
+# compiling even a microscopic test program with an option like -Werror which
+# surely *is* supported. Avoid this by setting PYTHONWARNINGS=ignore.
+
+gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter 
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=ignore)
 gb_COMPILER_PLUGINS_SETUP := 
ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
CCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
SCCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox
 gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \
 -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors

[Libreoffice-commits] core.git: solenv/gbuild

2023-01-23 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 36c492bb01f48435b714fc85b203c1e8a2fa8d07
Author: Tor Lillqvist 
AuthorDate: Mon Jan 23 17:02:07 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Jan 23 20:18:35 2023 +

Bin line that was commented-out in December 2021

Change-Id: Ie6c6891d1a682d57e4606454fb6b295072e57644
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146038
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index fdce92af0abe..fa7b51e54cc4 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -62,7 +62,6 @@ gb_LINKERSTRIPDEBUGFLAGS :=
 # This maps to g3, no source maps, but DWARF with current emscripten!
 # https://developer.chrome.com/blog/wasm-debugging-2020/
 gb_DEBUGINFO_FLAGS = -g
-#gb_DEBUGINFO_FLAGS = -gsource-map 
--source-map-base=file://$(WORKDIR)/LinkTarget/Executable
 
 ifeq ($(HAVE_EXTERNAL_DWARF),TRUE)
 gb_DEBUGINFO_FLAGS += -gseparate-dwarf

[Libreoffice-commits] core.git: solenv/gbuild

2023-01-16 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit d648f2ae3a16d0613d1b75848789b9742eb20b19
Author: Tor Lillqvist 
AuthorDate: Mon Jan 16 23:16:53 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 17 07:57:12 2023 +

Adapt for --enable-wasm-exceptions

Actually, it seems that to build core with --fwasm-exceptions for use
in a LibreOffice Technology -using WASM executable, you need to
compile *everything* with that (i.e. *all* of core's externals). Just
these gbuild things are not enough to ensure that. You have to put

  CC=emcc -pthread -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
  CXX=em++ -pthread -fwasm-exceptions -s SUPPORT_LONGJMP=wasm

into your autogen.input.

Change-Id: I10d21ad0f73e7e5d72864864d595077bd770f4f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145646
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 8831aeeb5d54..fdce92af0abe 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -39,7 +39,15 @@ gb_EMSCRIPTEN_EXCEPT = -s DISABLE_EXCEPTION_CATCHING=0
 endif
 
 gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
+
+ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
+# Here we don't use += because gb_LinkTarget_EXCEPTIONFLAGS from 
com_GCC_defs.mk contains -fexceptions and
+# gb_EMSCRIPTEN_EXCEPT already has -fwasm-exceptions
+gb_LinkTarget_EXCEPTIONFLAGS = $(gb_EMSCRIPTEN_EXCEPT)
+else
 gb_LinkTarget_EXCEPTIONFLAGS += $(gb_EMSCRIPTEN_EXCEPT)
+endif
+
 gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
 gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT)
 ifeq ($(ENABLE_QT5),TRUE)

[Libreoffice-commits] core.git: solenv/gbuild solenv/inc

2023-01-14 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |1 -
 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 solenv/inc/doxygen.cfg |1 -
 solenv/inc/doxygen_doc.cfg |1 -
 solenv/inc/doxygen_tag.cfg |1 -
 5 files changed, 5 deletions(-)

New commits:
commit ef3c34596ebc6e6e3b85c4093a28d48fe328c1a7
Author: Tor Lillqvist 
AuthorDate: Fri Jan 13 11:43:39 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Sat Jan 14 12:09:53 2023 +

EXCEPTIONS_ON has no meaning

Change-Id: I0ca0dcb76d342b451879788b57da03fb7d79e699
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145456
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 6eeda2fc03ab..0cbe852539c9 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -205,7 +205,6 @@ endif
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-   -DEXCEPTIONS_ON \
-fexceptions
 
 ifeq ($(gb_ENABLE_DBGUTIL),$(false))
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 928fd3400af1..ad425e9b5fdd 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -206,7 +206,6 @@ gb_CFLAGS_WERROR = $(if $(ENABLE_WERROR),-WX)
 gb_CXX03FLAGS :=
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-   -DEXCEPTIONS_ON \
-EHs \
 
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 2bdabc731935..ed50d426549e 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \
  DBG_UTIL \
  OSL_DEBUG_LEVEL=2 \
  CUI \
- EXCEPTIONS_ON \
  DOXYGEN_ONLY
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/solenv/inc/doxygen_doc.cfg b/solenv/inc/doxygen_doc.cfg
index dfcf174ee559..78d2778f7a4b 100644
--- a/solenv/inc/doxygen_doc.cfg
+++ b/solenv/inc/doxygen_doc.cfg
@@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \
  DBG_UTIL \
  OSL_DEBUG_LEVEL=2 \
  CUI \
- EXCEPTIONS_ON \
  DOXYGEN_ONLY
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/solenv/inc/doxygen_tag.cfg b/solenv/inc/doxygen_tag.cfg
index a2f2e602612b..1ba9c17cdbfc 100644
--- a/solenv/inc/doxygen_tag.cfg
+++ b/solenv/inc/doxygen_tag.cfg
@@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \
  DBG_UTIL \
  OSL_DEBUG_LEVEL=2 \
  CUI \
- EXCEPTIONS_ON \
  DOXYGEN_ONLY
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

[Libreoffice-commits] core.git: solenv/gbuild

2023-01-11 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 67471b3a7fb33884e70e29163b4eddf47fa85115
Author: Tor Lillqvist 
AuthorDate: Wed Jan 11 17:39:06 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jan 11 22:49:45 2023 +

Use gb_EMSCRIPTEN_QTDEFS only when building with Qt5

Move -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE to gb_EMSCRIPTEN_CPPFLAGS.

Change-Id: I435a8482e9d04d9c8218926865738397e2897109
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145354
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index b0629894a07e..8831aeeb5d54 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -18,7 +18,7 @@ gb_EMSCRIPTEN_PRE_JS_FILES = \
 
 gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure
 # avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps
-gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1
+gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1 -D_LARGEFILE64_SOURCE 
-D_LARGEFILE_SOURCE
 gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS)
 
 # Initial memory size and worker thread pool
@@ -28,7 +28,7 @@ gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s 
PTHREAD_POOL_SIZE=4
 # See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
 gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","allocateUTF8","printErr","ccall","cwrap"]
-gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG 
-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 gb_Executable_EXT := .html
 ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
@@ -40,8 +40,12 @@ endif
 
 gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
 gb_LinkTarget_EXCEPTIONFLAGS += $(gb_EMSCRIPTEN_EXCEPT)
-gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS)
-gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS) 
$(gb_EMSCRIPTEN_EXCEPT)
+gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
+gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT)
+ifeq ($(ENABLE_QT5),TRUE)
+gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_QTDEFS)
+gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_QTDEFS)
+endif
 gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT)
 
 # Linker and compiler optimize + debug flags are handled in LinkTarget.mk

[Libreoffice-commits] core.git: solenv/gbuild

2023-01-02 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/UnoApiTarget.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 9fdf6b4d8317df2a6ccc866fad93292b41c97274
Author: Stephan Bergmann 
AuthorDate: Mon Jan 2 08:35:28 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 3 07:14:15 2023 +

More verbose unoidl-check errors

Change-Id: Ie9aa57c5fca730c7874a527cbe5a0d463a67a0e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 25a53dfa0a59..67e8bccca906 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -35,9 +35,11 @@ $(if $(UNOAPI_ENTITIES), \
 $(if $(UNOAPI_ENTITIES),&& rm -f $${RESPONSEFILE}) \
 $(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$(2),$(true),DBc,3) \
-   && $(gb_UnoApiTarget_UNOIDLCHECKCOMMAND) $(UNOAPI_REFERENCE) -- \
-   $(foreach rdb,$(UNOAPI_DEPRDBS),$(call 
gb_UnoApiTarget_get_target,$(rdb))) \
-   $(1))
+   && { $(gb_UnoApiTarget_UNOIDLCHECKCOMMAND) $(UNOAPI_REFERENCE) -- \
+   $(foreach rdb,$(UNOAPI_DEPRDBS),$(call 
gb_UnoApiTarget_get_target,$(rdb))) \
+   $(1) \
+   || { printf 'ERROR: Published UNO API must not be changed 
incompatibly!\n(If published UNO API shall be changed incompatibly after all, 
see\n.)\n';
 \
+false; } })
 endef
 
 $(call gb_UnoApiTarget_get_target,%) :

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-23 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/unxgcc.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 53e2f8906fa067efdbb9ef90aa1ebaac4ab0ed2a
Author: Tor Lillqvist 
AuthorDate: Fri Dec 23 12:41:09 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Dec 23 11:44:14 2022 +

Don't use symlinks for the Emscripten soffice.data and 
soffice.data.js.metadata

Symlinks just complicate things. Disk space is cheap. soffice.data is
under 100 megs even with Qt5.

Note that after this you will need to clean out the existing
soffice.data and soffice.data.js.metadata symlinks before you run
make, otherwise you will get errors.

As such, it is a bit weird that we unconditionally play around with
soffice.data for *all* (non-CppunitTest) Executable targets. (Thus,
for instance also for vcldemo and unoidl-read.) We should do this
dance only for the soffice executable. And we should reduce the number
of executables we build for Emscripten. Probably none other than
soffice itself makes sense?

Change-Id: I75f6719b92d83e88bf59d65c38aeeab47e0b29e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144781
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f1cb77a63054..bfb860a41fc2 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -183,8 +183,8 @@ $(if $(filter TRUE,$(ENABLE_QT5)), \
 sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \
 cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) ; \
 ) \
-ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data ; \
-ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata \
+cp $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data ; \
+cp $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata \
 )
 endef

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-23 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/unxgcc.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1f39fd25469f299e5da54f5eef0d127dd2daf5b6
Author: Tor Lillqvist 
AuthorDate: Fri Dec 23 12:23:32 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Dec 23 11:28:47 2022 +

Un-confuse Emscripten and Qt5 conditionals

The embedded file system that we construct when building for
Emscripten is not related to whether we use Qt5 or not.

Change-Id: Ibf65cae06093d9130a19780c1116f8b9997c664b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144780
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 461d1f048390..f1cb77a63054 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -178,11 +178,13 @@ $(if $(filter Library,$(TARGETTYPE)), $(call 
gb_Helper_abbreviate_dirs,\
 | cut -d' ' -f1-2 >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
 $(call 
gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,
 \
 $(WORKDIR)/LinkTarget/$(2).exports,$(1
-$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter 
EMSCRIPTEN,$(OS)),$(filter TRUE,$(ENABLE_QT5))), \
+$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter 
EMSCRIPTEN,$(OS))), \
+$(if $(filter TRUE,$(ENABLE_QT5)), \
+sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \
 cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) ; \
-sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)) ; \
+) \
 ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data ; \
-ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata ; \
+ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata \
 )
 endef

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-22 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |4 ++--
 solenv/gbuild/platform/unxgcc.mk   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 780d55199e54fafc3784691d5cf716c1bb92b0aa
Author: Christian Lohmaier 
AuthorDate: Tue Dec 20 13:44:26 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 22 20:44:07 2022 +

gb_LTOFLAGS: use -flto=jobserver instead of fixed $(PARALLELISM)

fixed PARALLELISM causes explosion of jobs, especially when machines
wtih many cores/threads. A make wtih PARALLELISM=16 would launch up to
16 linker invocations that by themselves would also do their linking
with a parallelism of 16, causing load of over 100 and very likely
exhausting all memory bringing the system to a crawl or cause OOM kills.

for a command to be able to communicate with make's jobserver, it must
be part of a submake called with $(MAKE) or the command from the rule
needs to be prefixed with the + character.
While our gbuild stuff is a submake call, it only is that submake that
uses the PARALLELISM flags determined by configure, so that is not
sufficient for jobserver usage by the the lto linker.

Change-Id: I46ec4760c1a8623195700b8cb16f7deafebe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144593
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 7a2066a60a24..6eeda2fc03ab 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -197,8 +197,8 @@ ifeq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOPLUGINFLAGS := --plugin $(if $(LD_PLUGIN),$(LD_PLUGIN),LLVMgold.so)
 endif
 else
-# use first element of the PARALLELISM, to allow values like "12 -l 14" to 
specify load limits
-gb_LTOFLAGS := -flto=$(if $(filter-out 0,$(PARALLELISM)),$(firstword 
$(PARALLELISM)),auto) -fuse-linker-plugin -O2
+# use parallelism based on make's job handling
+gb_LTOFLAGS := -flto=jobserver -fuse-linker-plugin -O2
 # clang does not support -flto=
 gb_CLANG_LTOFLAGS := -flto=thin
 endif
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5e971bd8944c..461d1f048390 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -134,7 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" ; \
 )
-   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
+   +$(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-20 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/Trace.mk |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 4b67515418ee4f10071b3f0f2275ba37f32b0ae5
Author: Christian Lohmaier 
AuthorDate: Tue Dec 20 12:49:01 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Dec 20 14:11:36 2022 +

gbuild trace: make it work nicer on macOS (seconds-only accuracy)

the finish-gbuild-trace.py matches a nanoseconds timestamp and truncates
it to milliseconds, so could also adjust that and look for the unchanged
%N for mac in the tracefile and handle it that way, but since there is
another conditional needed for the lack of flock on macOS doing it in
the makefile seemd like the more natural choice. (well, not trictly
needed unless you mind the thousands of command not found messages :-))

Change-Id: I768bc9dd8be232567644ae000b6419bb87f58509
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144590
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk
index 8d416157d28d..5ff0d0bf4ded 100644
--- a/solenv/gbuild/Trace.mk
+++ b/solenv/gbuild/Trace.mk
@@ -28,11 +28,15 @@ gb_TRACE := $(abspath $(GBUILD_TRACE))
 endif
 
 ifneq ($(gb_TRACE),)
-
-# call gb_Trace_AddMark,marktype,detail,type,extra
+# macOS date doesn't know about nanoseconds switch, and instead of resorting 
to perl or python
+# to create a millisecond timestamp, just avoid the overhead and live with 
seconds-only accuracy
+gb_Trace_Timestamp := $(if $(filter MACOSX,$(OS)),$$(date +%s)0,$(date 
+%s%N))
+# macOS also doesn't provide flock, so skip that part on mac
 # The (flock;cat) part is to minimize lock time.
+gb_Trace_Flock := $(if $(filter MACOSX,$(OS)),,| ( flock 1; cat ))
+# call gb_Trace_AddMark,marktype,detail,type,extra
 define gb_Trace__AddMark
-echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": 
$$(date +%s%N),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," | ( flock 1; cat ) 
>>$(gb_TRACE)
+echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": 
$(gb_Trace_Timestamp),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," 
$(gb_Trace_Flock) >>$(gb_TRACE)
 endef
 
 # call gb_Trace_StartRange,detail,type

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-20 Thread Caolán McNamara (via logerrit)

 solenv/gbuild/partial_build.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit bbc5bd1a5fca98e952177e0514c7c17f95ed2083
Author: Caolán McNamara 
AuthorDate: Tue Dec 20 10:28:32 2022 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 20 12:16:23 2022 +

make inclusion of config_host.mk unconditional

to get make vcl.build not to error with

core/solenv/gbuild/LinkTarget.mk:932: *** used LinkTarget 
StaticLibrary/libzlib.a not defined.  Stop.
make: *** [Makefile:121: vcl.build] Error 2

since:

commit b688b779ba20a4bec653808a42fe88cfac851029
Date:   Fri Dec 16 18:41:13 2022 +0100

keep environment clear of SYSTEM_FOO vars

Change-Id: I14c3b09ad8e2ce97066995ed63d67243b8ca4a0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144586
Reviewed-by: Christian Lohmaier 
Tested-by: Caolán McNamara 

diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index dc52c593f7ee..5819667b2f56 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -28,9 +28,7 @@ BUILDDIR := $(if $(wildcard 
$(gb_partial_build__makefile_dir)../Module_external.
   $(gb_partial_build__makefile_dir)..)
 endif
 
-ifeq ($(BUILD_TYPE),)
 include $(BUILDDIR)/config_$(gb_Side).mk
-endif
 
 gb_PARTIAL_BUILD := T
 include $(SRCDIR)/solenv/gbuild/gbuild.mk

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-14 Thread Andrea Gelmini (via logerrit)

 solenv/gbuild/Gallery.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d39c37b61fb2e4d03f5f58a38ba2265064db50b
Author: Andrea Gelmini 
AuthorDate: Tue Dec 13 22:44:50 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Dec 14 13:05:33 2022 +

Fix typo

Change-Id: I1d50f4b47ba32ee6dfd76d3165f15903746de46c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144112
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 3443a3c1b415..78b9e70ae753 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -136,7 +136,7 @@ $(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
 
 $(call gb_Gallery_get_workdir,$(1))/$(1).str : $(call 
gb_Gallery_get_workdir,$(1))/$(1).ulf
 
-# oder-only, the Gallery-Target also makes those files
+# order-only, the Gallery-Target also makes those files
 $(addprefix $(call gb_Gallery_get_workdir,$(1))/$(1),.sdg .sdv .thm): | $(call 
gb_Gallery_get_target,$(1))
 $(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-13 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/Gallery.mk |   17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 0cae68768e92b1d735baa2e02602b4f6fe17d13e
Author: Christian Lohmaier 
AuthorDate: Sat Dec 10 17:41:28 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Dec 13 15:10:13 2022 +

don't rebuild Gallery themes if nothing changed

Change-Id: I49fe9d36550a3f712be57fd4e67f0606ee8feea9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143909
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 42f280e1aad6..3443a3c1b415 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -50,8 +50,8 @@ $(dir $(call gb_Gallery_get_target,$(1))).dir :
 $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_Gallery_get_target,%) : \
-   $(call gb_Executable_get_runtime_dependencies,gengal)
+$(call gb_Gallery_get_target,%) : $(call gb_Executable_get_target,gengal) \
+| $(call gb_Executable_get_runtime_dependencies,gengal)
$(call gb_Output_announce,$*,$(true),GAL,1)
$(call gb_Trace_StartRange,$*,GAL)
$(call gb_Gallery__command,$@,$*)
@@ -74,14 +74,6 @@ $(call gb_Gallery_get_workdir,%).str : 
$(gb_Gallery_TRANSLATE) \
$(call gb_Gallery__command_str,$@,$*)
$(call gb_Trace_EndRange,$*,STR)
 
-# there must be a rule for these since they are targets due to Package
-$(call gb_Gallery_get_workdir,%).sdg :
-   touch $@
-$(call gb_Gallery_get_workdir,%).sdv :
-   touch $@
-$(call gb_Gallery_get_workdir,%).thm :
-   touch $@
-
 .PHONY : $(call gb_Gallery_get_clean_target,%)
 $(call gb_Gallery_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),GAL,1)
@@ -144,9 +136,8 @@ $(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
 
 $(call gb_Gallery_get_workdir,$(1))/$(1).str : $(call 
gb_Gallery_get_workdir,$(1))/$(1).ulf
 
-$(call gb_Gallery_get_workdir,$(1))/$(1).sdg \
-$(call gb_Gallery_get_workdir,$(1))/$(1).sdv \
-$(call gb_Gallery_get_workdir,$(1))/$(1).thm : $(call 
gb_Gallery_get_target,$(1))
+# oder-only, the Gallery-Target also makes those files
+$(addprefix $(call gb_Gallery_get_workdir,$(1))/$(1),.sdg .sdv .thm): | $(call 
gb_Gallery_get_target,$(1))
 $(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
 
 $(call gb_Gallery_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(2))

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-12 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/linux.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit baddc742c3fe260d20d7924ab134f0fbf179fd85
Author: Stephan Bergmann 
AuthorDate: Mon Dec 12 11:04:44 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 12 12:28:32 2022 +

lld 16 trunk defaults to --no-undefined-version now

...since


"[ELF] Enable --no-undefined-version by default", causing e.g.

> ld.lld: error: version script assignment of 'PRIVATE_1.4' to symbol 
'_ZN3sal13backtrace_getEm' failed: symbol not defined
> ld.lld: error: version script assignment of 'GLIBCXX_3.4' to symbol 
'_ZNSs4_Rep20_S_empty_rep_storageE' failed: symbol not defined

while building Library_sal and

> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrBuildNodeList' failed: symbol not defined
> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrEvalRangePredicate' failed: symbol not defined
> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrFreeLocationSet' failed: symbol not defined
[...]

while building ExternalProject_libxml2 (and the latter is the reason to add 
to
USE_LD rather than gb_LinkTarget_LDFLAGS, so that this also goes into
gb_ExternalProject_get_link_flags).

This is only relevant for ELF targets, so at least for now add it to 
linux.mk
rather than the general com_GCC_defs.mk.

Change-Id: I2ea227bd9392c406e6c41de61df37ad7fe155c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143981
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 8fc7d38e3f23..127a5f7b372c 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -15,6 +15,10 @@ endif
 endif
 gb_LinkTarget_LDFLAGS += $(gb__LinkTarget_LDFLAGS_zdefs)
 
+ifneq ($(findstring lld,$(USE_LD)),)
+USE_LD += -Wl,--undefined-version
+endif
+
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 ifneq ($(ATOMIC_LIB),)

[Libreoffice-commits] core.git: solenv/gbuild

2022-12-05 Thread Christian Lohmaier (via logerrit)

 solenv/gbuild/LinkTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59d868b9eddebb19b0c40d7c1ca70265fc9df137
Author: Christian Lohmaier 
AuthorDate: Fri Dec 2 12:32:11 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Dec 5 13:53:31 2022 +

gb_LinkTarget_use_clang: only use flto=thin with clang, not with gcc

The code always used flto=thin, but gcc doesn't know that switch and
fails. The gb_Library_use_clang used by Skia is actually a prefer clang
option, and the corresponding gb_LinkTarget_use_clang macro accounts for
that by using "$(or clangvalue,gccvalue)" to define variables.

This is OK for stuff that defaults to empty value when no clang is found
on the system, but gb_CLANG_LTOFLAGS is defined unconditionally (in
com_GCC_defs.mk), so using the $(or..) function is completly bypassed,
always using the flto=thin switch.

Change-Id: I903e5e4818b8ecbe63ed85952b8741140972e8d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143572
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6a0e7580ef22..cc98d18bd4b7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -2196,7 +2196,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_CC := 
$(LO_CLANG_CC)
 $(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(LO_CLANG_CXX)
 $(call gb_LinkTarget_get_target,$(1)) : T_USE_CLANG := $(true)
 $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(or 
$(CLANG_USE_LD),$(USE_LD))
-$(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(or 
$(gb_CLANG_LTOFLAGS),$(gb_LTOFLAGS))
+$(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(if 
$(LO_CLANG_CXX),$(gb_CLANG_LTOFLAGS),$(gb_LTOFLAGS))
 endef
 
 # call gb_LinkTarget_use_vclmain,linktarget

[Libreoffice-commits] core.git: solenv/gbuild

2022-11-28 Thread Michael Stahl (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 ++
 solenv/gbuild/platform/unxgcc.mk   |   10 ++
 solenv/gbuild/static.mk|2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 7a80b68cb0b279a1b43f769169aaf2a2659dc150
Author: Michael Stahl 
AuthorDate: Mon Nov 14 20:16:41 2022 +0100
Commit: Michael Stahl 
CommitDate: Mon Nov 28 16:23:06 2022 +0100

WASM gbuild: write link dependencies into a file $@.linkdeps

The static build was added in commit
dc9ccf3d8f294cd7ae9d5bece7b6c16c3b22f6a5 and commit
b04be559ddf4a7f0a5cdc0b9abc2bcfc4aae25cc and there are several files
written to workdir/LinkTarget/*/*.d.{libraries,externals,statics}
that list all the (recursive) dependencies of a LinkTarget.

Unfortunately the content of these files requires gbuild to interpret,
because it's using the Library names which may not map 1:1 to file
names, not to mention "externals"; this is all resolved by calls to
gb_LinkTarget_use_* anyway.

To get a command line that's usable outside of gbuild, write another
file $@.linkdeps as a side effect of gb_LinkTarget__command_dynamiclink.

Change-Id: I94f31142413561dcdb56fa722a4517f84fcd7d61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143393
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 61424f72c44f..35a136b2f38d 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -64,6 +64,7 @@ gb_COMPILERNOOPTFLAGS := -O1 -fstrict-aliasing 
-fstrict-overflow
 # cleanup addition JS and wasm files for binaries
 define gb_Executable_Executable_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
+$(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
 $(patsubst %.lib,%.js,$(3)) \
 $(patsubst %.lib,%.worker.js,$(3)) \
@@ -75,6 +76,7 @@ endef
 
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
+$(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
 $(patsubst %.lib,%.js,$(3)) \
 $(patsubst %.lib,%.worker.js,$(3)) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index cc377a5b4309..5e971bd8944c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -152,10 +152,12 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
-Wl$(COMMA)--start-group \
-   $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst 
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib)) \
-   $(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
-   $(patsubst $(gb_LinkTarget__syslib),%,$(T_LIBS)) \
-   $(if $(call 
gb_LinkTarget__NeedsCxxLinker),$(T_STDLIBS_CXX)) \
+   $(shell echo -n \
+   $(patsubst lib%.a,-l%,$(patsubst 
lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach 
lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)) \
+   $(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
+   $(patsubst 
$(gb_LinkTarget__syslib),%,$(T_LIBS)) \
+   $(if $(call 
gb_LinkTarget__NeedsCxxLinker),$(T_STDLIBS_CXX)) \
+   | tee $@.linkdeps) \
-Wl$(COMMA)--end-group \
, \
-Wl$(COMMA)--start-group \
diff --git a/solenv/gbuild/static.mk b/solenv/gbuild/static.mk
index faa9a73db516..9b98ec99c593 100644
--- a/solenv/gbuild/static.mk
+++ b/solenv/gbuild/static.mk
@@ -51,7 +51,7 @@
 # doesn't seem to happen in any breaking way and it works to link multiple 
Executable
 # with large and small expanded dependency lists.
 #
-# Then there is the special static "components" library, which simply depends 
on all build
+# Then there is the special static "components" library, which simply depends 
on all built
 # components. In theory these could be limited per-module (Writer, Calc, 
etc.), but currently
 # this is not implemented and instead solenv/bin/native-code.py is used, so 
actually
 # everything is build and "cleaned up" at link time, which is especially 
expensive for WASM.

[Libreoffice-commits] core.git: solenv/gbuild

2022-11-28 Thread Michael Stahl (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |3 ++-
 solenv/gbuild/platform/unxgcc.mk   |2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 988d719cfbe097f674abfd04fdc4f9c2874b21b3
Author: Michael Stahl 
AuthorDate: Tue Nov 8 15:18:40 2022 +0100
Commit: Michael Stahl 
CommitDate: Mon Nov 28 15:33:19 2022 +0100

WASM gbuild: avoid annoying python warnings from emscripten

/home/builder/emsdk/upstream/emscripten/tools/building.py:1228: 
ResourceWarning: unclosed file <_io.BufferedReader 
name='/data/lo/build_feature_wasm/workdir/LinkTarget/StaticLibrary/libdtoa.a'>
  header = open(filename, 'rb').read(8)
ResourceWarning: Enable tracemalloc to get the object allocation traceback

Change-Id: I5cd052cd47af92e18cb6ccce31d4503a322d815b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143389
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 87231a57196f..7a2066a60a24 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -277,7 +277,8 @@ ifeq ($(COMPILER_PLUGINS_DEBUG),TRUE)
 gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang --debug
 endif
 # set CCACHE_CPP2=1 to prevent clang generating spurious warnings
-gb_COMPILER_SETUP += CCACHE_CPP2=1
+# clear PYTHONWARNINGS to prevent noise from emscripten implementation
+gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter 
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=default)
 gb_COMPILER_PLUGINS_SETUP := 
ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
CCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
SCCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox
 gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \
 -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index b3388eec436a..cc377a5b4309 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -134,6 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" ; \
 )
+   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
@@ -186,6 +187,7 @@ endef
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
+   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
$(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \

[Libreoffice-commits] core.git: solenv/gbuild

2022-11-24 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/Module.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4dc372c87b194c32597eda6a7f99ddcee3108fa6
Author: Stephan Bergmann 
AuthorDate: Thu Nov 24 10:22:58 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 24 11:35:38 2022 +0100

Expansion of $(dir ...) always ends in a slash, no need for an additional 
one

Change-Id: I06172beeeccffd54feb1e1083f0ceef203423ab1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143206
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index fe7470e85822..f3224179fbe8 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -246,9 +246,9 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize 
propex ulfex xrmex tr
$(call gb_Output_announce,$(subst .pot,,$(subst 
$(WORKDIR)/,,$@)),$(true),POT,1)
$(call gb_Trace_MakeMark,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),POT)
$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) 
$(SRCDIR) $(dir $@)/pot \
+   mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) 
$(SRCDIR) $(dir $@)pot \

$(gb_Helper_LIBRARY_PATH_VAR)"$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}"
 \
-   && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e 
"s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \
+   && $(FIND) $(dir $@)pot -type f -printf "%P\n" | sed -e 
"s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)LIST \
&& touch $@)
 
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]

[Libreoffice-commits] core.git: solenv/gbuild sw/CppunitTest_sw_core_layout.mk sw/layoutwriter_setup.mk vcl/CppunitTest_vcl_cjk.mk vcl/CppunitTest_vcl_pdfexport.mk vcl/unx

2022-09-02 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/CppunitTest.mk   |   12 +++-
 sw/CppunitTest_sw_core_layout.mk   |4 +---
 sw/layoutwriter_setup.mk   |4 +---
 vcl/CppunitTest_vcl_cjk.mk |4 +---
 vcl/CppunitTest_vcl_pdfexport.mk   |4 +---
 vcl/unx/generic/fontmanager/fontconfig.cxx |3 +--
 6 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 5aa8e7ef07229d48cb719a5f3f01c9a7fa445554
Author: Stephan Bergmann 
AuthorDate: Fri Sep 2 08:15:01 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 2 12:12:29 2022 +0200

Fix setting SAL_NON_APPLICATION_FONT_USE

...after a342b72f4218cd617aa6fb413fcf5fbb182c316f "gbuild: set
SAL_NON_APPLICATION_FONT_USE in gb_CppunitTest_use_more_fonts" had caused 
e.g.
CppunitTest_vcl_pdfexport to be executed with merely
SAL_NON_APPLICATION_FONT_USE=deny rather than the stronger
SAL_NON_APPLICATION_FONT_USE=abort that vcl/CppunitTest_vcl_pdfexport.mk 
asked
for.

So introduce a dedicated gb_CppunitTest_set_non_application_font_use that
accumulates the requested modes and then selects the strongest requested one
("allow" over "abort" over "deny").  That also means we can go back to model
"allow" with an unset SAL_NON_APPLICATION_FONT_USE env var.

Change-Id: I32ba0a94c1965f0e3336e676b17f4f5efb85efce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139251
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index fbfc3f30aacb..b16e3d0e5417 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -132,6 +132,9 @@ else
$(if $(gb_CppunitTest__vcl_no_svp), \
$(filter-out 
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
$(EXTRA_ENV_VARS) \
+   $(if $(filter allow,$(NON_APPLICATION_FONT_USE)),, \
+   $(if $(filter 
abort,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=abort, \
+   $(if $(filter 
deny,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=deny))) \
$(if $(filter 
gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
@@ -198,6 +201,7 @@ $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
 $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless
 $(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS :=
+$(call gb_CppunitTest_get_target,$(1)) : NON_APPLICATION_FONT_USE :=
 $$(eval $$(call gb_Module_register_target,$(call 
gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1
 $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest)
 
@@ -383,11 +387,17 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call 
gb_Executable_get_target,$(2))
 
 endef
 
+# One of allow, deny, abort:
+define gb_CppunitTest_set_non_application_font_use
+$(call gb_CppunitTest_get_target,$(1)) : NON_APPLICATION_FONT_USE += $(2)
+
+endef
+
 define gb_CppunitTest_use_more_fonts
 ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
 $(call gb_CppunitTest_get_target,$(1)) : \
 $(foreach font,$(gb_Package_MODULE_ooo_fonts),$(call 
gb_Package_get_target,$(font)))
-$(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS := 
SAL_NON_APPLICATION_FONT_USE=deny
+$(call gb_CppunitTest_set_non_application_font_use,$(1),deny)
 endif
 
 endef
diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 8d8458ea8c4e..9392d81adc59 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -72,9 +72,7 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_layout, \
 ))
 
 # assert if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,sw_core_layout): \
-EXTRA_ENV_VARS := \
-SAL_NON_APPLICATION_FONT_USE=abort
+$(eval $(call 
gb_CppunitTest_set_non_application_font_use,sw_core_layout,abort))
 
 $(eval $(call gb_CppunitTest_use_more_fonts,sw_core_layout))
 
diff --git a/sw/layoutwriter_setup.mk b/sw/layoutwriter_setup.mk
index 683ca04f4a9f..bcbcee62083b 100644
--- a/sw/layoutwriter_setup.mk
+++ b/sw/layoutwriter_setup.mk
@@ -83,9 +83,7 @@ $(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \
 $(call gb_Library_get_target,textconv_dict)
 
 # assert if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \
-EXTRA_ENV_VARS := \
-SAL_NON_APPLICATION_FONT_USE=abort
+$(eval $(call 
gb_CppunitTest_set_non_application_font_use,sw_layoutwriter$(1),abort))
 
 $(eval $(call gb_CppunitTest_use_more_fonts,sw_layoutwriter$(1)))
 
diff --git a/vcl/CppunitTest_vcl_cjk.mk b/vcl/CppunitTest_vcl_cjk.mk
index 8da3e5da4019..ea2d70a35cd6 100644
--- a/vcl/CppunitTest_vcl_cjk.mk

[Libreoffice-commits] core.git: solenv/gbuild vcl/CppunitTest_vcl_text.mk

2022-09-01 Thread Khaled Hosny (via logerrit)

 solenv/gbuild/CppunitTest.mk |1 +
 vcl/CppunitTest_vcl_text.mk  |5 -
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit a342b72f4218cd617aa6fb413fcf5fbb182c316f
Author: Khaled Hosny 
AuthorDate: Thu Sep 1 09:25:52 2022 +0200
Commit: Caolán McNamara 
CommitDate: Thu Sep 1 11:52:36 2022 +0200

gbuild: set SAL_NON_APPLICATION_FONT_USE in gb_CppunitTest_use_more_fonts

So it applies to all tests using HAVE_MORE_FONTS.

Change-Id: I60567c996286aa8a76c7180c58aea7f214a99d87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139144
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 821d1d6f2c74..fbfc3f30aacb 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -387,6 +387,7 @@ define gb_CppunitTest_use_more_fonts
 ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
 $(call gb_CppunitTest_get_target,$(1)) : \
 $(foreach font,$(gb_Package_MODULE_ooo_fonts),$(call 
gb_Package_get_target,$(font)))
+$(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS := 
SAL_NON_APPLICATION_FONT_USE=deny
 endif
 
 endef
diff --git a/vcl/CppunitTest_vcl_text.mk b/vcl/CppunitTest_vcl_text.mk
index cf091ba88c25..4ffa3b1990ca 100644
--- a/vcl/CppunitTest_vcl_text.mk
+++ b/vcl/CppunitTest_vcl_text.mk
@@ -61,11 +61,6 @@ $(eval $(call gb_CppunitTest_use_components,vcl_text,\
 
 $(eval $(call gb_CppunitTest_use_configuration,vcl_text))
 
-# only allow bundled fonts, but don't abort if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,vcl_text): \
-EXTRA_ENV_VARS := \
-SAL_NON_APPLICATION_FONT_USE=deny
-
 $(eval $(call gb_CppunitTest_use_more_fonts,vcl_text))
 
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: solenv/gbuild

2022-08-06 Thread Noel Grandin (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a95bf932ed22abbb346b1d70e3c32578074667f3
Author: Noel Grandin 
AuthorDate: Sat Aug 6 12:47:22 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Aug 6 15:05:16 2022 +0200

turn on -Wshadow-all for clang compilers

mostly so that it matches the existing behaviour of the GCC compiler,
which makes it easier submitting patches when building locally with
clang

Change-Id: I0197ec61bc97a3899c2b379efa0f2ad8ed028986
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137896
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 004945a32d32..443ff10eaae1 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -70,6 +70,7 @@ gb_CFLAGS_COMMON := \
-Wunreachable-code \
$(if $(or $(and $(COM_IS_CLANG),$(or $(findstring 
icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX,$(findstring 
sccache,$(CC))),,-Wunused-macros) \
$(if $(COM_IS_CLANG),-Wembedded-directive) \
+   $(if $(COM_IS_CLANG),-Wshadow-all) \
-finput-charset=UTF-8 \
-fmessage-length=0 \
-fno-common \

[Libreoffice-commits] core.git: solenv/gbuild

2022-07-18 Thread Hannah Meeks (via logerrit)

 solenv/gbuild/CppunitTest.mk |2 +-
 solenv/gbuild/PythonTest.mk  |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5eb4c5e93b0f0a3fd9cded5e086086d07cb7c92d
Author: Hannah Meeks 
AuthorDate: Mon Jul 18 16:42:37 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jul 18 20:22:03 2022 +0200

Mend python support for lldb cppunit tests.

Change-Id: I02f4872ac75d82f2d77c1854ce040b72883b484a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137204
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cae6e2a2f9be..821d1d6f2c74 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -137,7 +137,7 @@ else
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
-   $(if $(strip $(CPPUNITTRACE)),\
+   $(if $(filter gdb,$(CPPUNITTRACE)),\
PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
$(gb_CppunitTest_CPPTESTCOMMAND) \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 4e81261d2354..09f039771895 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -60,6 +60,8 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call 
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
$(gb_TEST_ENV_VARS) \
+   $(if $(filter gdb,$(CPPUNITTRACE)),\
+   PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_PythonTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
$(gb_PythonTest_COMMAND) \
$(if 
$(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \

[Libreoffice-commits] core.git: solenv/gbuild

2022-07-14 Thread Hannah Meeks (via logerrit)

 solenv/gbuild/CppunitTest.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7a4814f717520b8de8c963dc2d576f05fc15d2e9
Author: Hannah Meeks 
AuthorDate: Wed Jul 13 14:45:37 2022 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Jul 14 10:20:35 2022 +0200

Change make file so that debugging works - Previous error:

hannah@localhost:~/master/sw>  make CppunitTest_sw_macros_test 
CPPUNITTRACE="gdb --args"
[CUT] sw_macros_test
S=/data/opt/libreoffice/master && I=$S/instdir && W=$S/workdir &&  mkdir -p 
$W/CppunitTest/ && rm -fr $W/CppunitTest/sw_macros_test.test.user && cp -r 
$W/unittest $W/CppunitTest/sw_macros_test.test.user &&   (  MAX_CONCURRENCY=4 
MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 
SAL_USE_VCLPLUGIN=svp LIBO_LANG=C  icerun   PYTHONWARNINGS=default gdb 
-return-child-result -ex "add-auto-load-safe-path $S/instdir" -ex "set 
environment LD_LIBRARY_PATH 
${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program":$W/UnpackedTarball/cppunit/src/cppunit/.libs"
  -ex 'set environment MALLOC_CHECK_=2; set environment MALLOC_PERTURB_=153'  
--args   $W/LinkTarget/Executable/cppunittester 
$W/LinkTarget/CppunitTest/libtest_sw_macros_test.so --headless 
"-env:BRAND_BASE_DIR=file://$S/instdir" "-env:BRAND_SHARE_SUBDIR=share" 
"-env:BRAND_SHARE_RESOURCE_SUBDIR=program/resource" 
"-env:UserInstallation=file://$W/CppunitTest/sw_macros_test.test.user"   
"-env:CONFIGURATION_LAY
 ERS=xcsxcu:file://$I/share/registry xcsxcu:file://$W/unittest/registry"  
"-env:UNO_TYPES=file://$I/program/types/offapi.rdb 
file://$I/program/types/oovbaapi.rdb file://$I/program/types.rdb"  
"-env:UNO_SERVICES=file://$W/Rdb/ure/services.rdb file://$W/Rdb/services.rdb" 
-env:URE_BIN_DIR=file://$I/program -env:URE_INTERNAL_LIB_DIR=file://$I/program 
-env:LO_LIB_DIR=file://$I/program -env:LO_JAVA_DIR=file://$I/program/classes 
--protector $W/LinkTarget/Library/unoexceptionprotector.so 
unoexceptionprotector --protector 
$W/LinkTarget/Library/unobootstrapprotector.so unobootstrapprotector   
--protector $W/LinkTarget/Library/libvclbootstrapprotector.so 
vclbootstrapprotector   
"-env:CPPUNITTESTTARGET=$W/CppunitTest/sw_macros_test.test"  )
ICECC[448] 2022-07-13 13:23:02: couldn't find any PYTHONWARNINGS=default
ICECC[448] 2022-07-13 13:23:02: could not find PYTHONWARNINGS=default in 
PATH.
make: *** [/data/opt/libreoffice/master/solenv/gbuild/CppunitTest.mk:121: 
/data/opt/libreoffice/master/workdir/CppunitTest/sw_macros_test.test] Error 115
hannah@localhost:~/master/sw>

Change-Id: Idebbd385f70edd9b691d91f6eded8ee02ac9cce7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137032
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 7900c8f05ac5..cae6e2a2f9be 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -26,10 +26,10 @@ ifneq ($(strip $(CPPUNITTRACE)),)
 ifneq ($(filter gdb,$(CPPUNITTRACE)),)
 # sneak (a) setting the LD_LIBRARY_PATH, and (b) setting malloc debug flags, 
into the "gdb --args" command line
 gb_CppunitTest_GDBTRACE := $(subst gdb,\
-   PYTHONWARNINGS=default gdb -return-child-result -ex 
"add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, 
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set 
environment PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) 
$(gb_CppunitTest_DEBUGCPPUNIT),\
+   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(if 
$(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
 gb_PythonTest_GDBTRACE := $(subst gdb,\
-   PYTHONWARNINGS=default gdb -return-child-result -ex 
"add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, 
,$(gb_PythonTest_PRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set environment 
PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) 
$(gb_CppunitTest_DEBUGCPPUNIT),\
+   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_PythonTest_PRECOMMAND))" $(if 
$(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
 else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
 gb_CppunitTest_GDBTRACE := $(subst lldb,\
@@ -137,6 +137,8 @@ else
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
+   $(if $(strip $(CPPUNITTRACE)),\
+   PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL)

[Libreoffice-commits] core.git: solenv/gbuild

2022-06-08 Thread Luboš Luňák (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit e3f8a433799b2ccc2f16ba7691f790bd98febb16
Author: Luboš Luňák 
AuthorDate: Tue Jun 7 12:04:27 2022 +0200
Commit: Luboš Luňák 
CommitDate: Wed Jun 8 14:13:54 2022 +0200

it is not our job to tell GCC whether to colorize its output

GCC's -fdiagnostics-color option is complex (read: brain-damaged),
since it depends on how the compiler was configured during building it

(https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Message-Formatting-Options.html).
So while with Clang coloring works out of the box and the option
can be used for force it in special cases, GCC depending on how
it's been built may (or may not) require the option explicitly
just to do the sane default. 13b52f50e52d226c935dcb94fac641c59a77f13f
added an explicitly =auto to handle that, and then
9ab2703d5c212746c961dcb238a4c3025d3a2587 changed it to =always
depending on gb_COLOR to prevent it from overriding
explicitly used option. This results in a possible massive rebuild
when redirecting build output (because e.g. PCHs get rebuilt if
build flags change, and ccache I think cannot use cached compilations
either).

It should not be gbuild's job to go out of its way to handle broken
tooling, so just revert both of those. If somebody uses such a lame
GCC build, either don't do that, add those explicit flags
to CXX/ENVCFLAGSCXX, or create a clean way to add flags to CXXFLAGS
or something.

Change-Id: Ieac6ac7dd198639529aba8f47983587771772349
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135467
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f16eb8ec282c..004945a32d32 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -75,7 +75,6 @@ gb_CFLAGS_COMMON := \
-fno-common \
-pipe \
$(if $(filter 
EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
-   $(if $(gb_COLOR),-fdiagnostics-color=always) \
 
 gb_CXXFLAGS_COMMON := \
-Wall \
@@ -93,7 +92,6 @@ gb_CXXFLAGS_COMMON := \
-fno-common \
-pipe \
$(if $(filter 
EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
-   $(if $(gb_COLOR),-fdiagnostics-color=always) \
 
 ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE)
 gb_CXXFLAGS_COMMON += -Wdeprecated-copy-dtor

[Libreoffice-commits] core.git: solenv/gbuild

2022-05-03 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/ExternalProject.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ec4aa9f24d618bae5be84b804bf4a51faea4e32
Author: Stephan Bergmann 
AuthorDate: Tue May 3 08:55:41 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 3 13:36:09 2022 +0200

Keep passing LDFLAGS into external proejct builds

...which had been broken with 1ffd6897ddf15624e70585ab08e8af713114c938 "try 
to
use also proper debug LDFLAGS for externals libraries", and e.g. one of my 
macOS
builds uses a non-standard Clang compiler and libc++ library, and thus needs

  LDFLAGS=-L/Users/stephan/llvm/inst/lib

in autogen.input

Change-Id: Iae67a4a13603b0241e5cd6c0d01a07ac898ffb58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133746
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 68910712ff6d..5227e6c13bec 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -212,7 +212,7 @@ gb_ExternalProject_get_build_flags = $(call 
gb_LinkTarget__get_debugflags,Extern
 
 # Returns flags to include in LDFLAGS to enable optimizations and/or debugging.
 # gb_ExternalProject_get_link_flags project
-gb_ExternalProject_get_link_flags = $(USE_LD) $(call 
gb_LinkTarget__get_debugldflags,ExternalProject_$(1))
+gb_ExternalProject_get_link_flags = $(LDFLAGS) $(USE_LD) $(call 
gb_LinkTarget__get_debugldflags,ExternalProject_$(1))
 
 # Run a target command
 #

[Libreoffice-commits] core.git: solenv/gbuild solenv/Module_solenv.mk

2022-04-29 Thread Michael Weghorn (via logerrit)

 solenv/Module_solenv.mk   |2 --
 solenv/gbuild/extensions/post_GbuildToJson.mk |4 
 2 files changed, 6 deletions(-)

New commits:
commit 779c01a9e1eb3ed176d57e1e04073e25aca34a64
Author: Michael Weghorn 
AuthorDate: Fri Apr 29 10:56:55 2022 +0200
Commit: Michael Weghorn 
CommitDate: Fri Apr 29 13:07:28 2022 +0200

gbuild: Drop obsolete checks for make version 3.81

make 3.81 is no more suppoprted, see

commit 4688e74bcf0c58ab1bbf60e9c19331d25ebfe95b
Date:   Fri Apr 8 11:22:27 2022 +0200

configure: require GNU make 3.82

Change-Id: I0f820512df96fa1712374d3308d15591799222fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133592
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 6b9f7d0f1a8c..89e40c6d43c0 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Module_add_targets,solenv,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(MAKE_VERSION),3.81) # gbuildtojson requires 3.82+
 ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
 ifneq ($(OS),MACOSX) # disable on macOS too, fails at least for me and would 
be pointless anyway surely
 $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
@@ -39,7 +38,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
 endif
 endif
 endif
-endif
 
 ifneq ($(COMPILER_PLUGINS),)
 ifeq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk 
b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 52c61b722ee6..f1707a488f43 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -24,10 +24,6 @@
 
 ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),)
 
-ifeq ($(MAKE_VERSION),3.81)
-$(error make version 3.81 not supported for gbuildtojson; install newer make 
via LODE)
-endif
-
 # possibly recurse to ensure gbuildtojson was build before running the modded 
make
 gb_GbuildToJson_prep := $(shell $(MAKE) -f $(SRCDIR)/solenv/Makefile 
Executable_gbuildtojson)
 gb_FULLDEPS:=

[Libreoffice-commits] core.git: solenv/gbuild

2022-04-12 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_class.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 812081337ae6458cd14cd17e56510b7ed48acbc6
Author: Stephan Bergmann 
AuthorDate: Tue Apr 12 08:42:52 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 12 10:05:19 2022 +0200

Delete tempfile when done

Change-Id: Ide7acab1ab8eae760f9818248ce44d07ca92a6f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132884
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index e82e73dd8aaa..06d21ecd474a 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -714,7 +714,8 @@ $(call gb_Helper_abbreviate_dirs,\
FILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \
$(gb_UIConfig_LXML_PATH) $(if 
$(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
$(call gb_ExternalExecutable_get_command,python) \
-   $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L 
$$FILES
+   $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L 
$$FILES && \
+   rm $$FILES
 )
 
 endef

[Libreoffice-commits] core.git: solenv/gbuild

2022-02-24 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 48b3894f74679a1624a92aabaabed29b90ef60cf
Author: Stephan Bergmann 
AuthorDate: Thu Feb 24 11:27:04 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 24 13:44:50 2022 +0100

Keep URE libraries out of Library_merged

...to keep the (at least conceptional, but also reflected in how e.g. Linux
distros split up LO into multiple packages) distinction between URE and LO
proper.  This partially reverts 424a7f404565e068995e2a9827d5bc6f76920ec8 
"add
some more libs to libmerged".

Change-Id: I0bd435d9fe4dc4a4ad230990a999ad5e8c487cdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130490
Reviewed-by: Noel Grandin 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 693d3bde824d..b2402ec0c2af 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -48,9 +48,6 @@ gb_MERGE_LIBRARY_LIST := \
i18nsearch \
i18npool \
i18nutil \
-   io \
-   $(if $(ENABLE_JAVA),javaloader) \
-   $(if $(ENABLE_JAVA),javavm) \
lng \
lnth \
localebe1 \

[Libreoffice-commits] core.git: solenv/gbuild

2022-02-24 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/solaris.mk |2 +-
 solenv/gbuild/platform/unxgcc.mk  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba2a0eb8807409ed67af70ab828f45b69fe66c48
Author: Stephan Bergmann 
AuthorDate: Wed Feb 23 22:47:33 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 24 09:42:39 2022 +0100

Don't run ExternalExecutable_python with LD_LIBRARY_PATH

257bcb1a1140d3e070cfaef6fec0704740bc83b8 "get internal python invocations
working" had made this use LD_LIBRARY_PATH or similar on the various 
platforms,
but without giving any reason what it would actually be good for.
5d8f48c81eac8650315b936d0e89ad1d54b566fc "solver doesn't solve anything..." 
then
(somewhat by chance?) removed it for solenv/gbuild/platform/macosx.mk,
apparently without loss of functionality, but left it intact for other
platforms.

But at least in some Jenkins Linux build environments presence of
LD_LIBRARY_PATH (pointing at instdir/program/) appears to cause subtle 
problems:
Builds like 
occasionally crashed with

[...]
> make -O
[...]
> [build PAT] python3
> [build PRJ] python3
[...]
> [build PKG] python3
> [build EPK] python3
[...]
> [build BIN] python3
[...]
> [build MOD] python3
[...]
> [build PRJ] nss
[...]
> make[1]: *** Deleting file 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/workdir/UIConfig/sfx.a11yerrors'
> [build UIA] sfx
> Suppression file: 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.suppr
> False positive file: 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.false
> sfx2/uiconfig/ui/documentinfopage.ui: WARNING: 'GtkLabel' 'label8' does 
not specify what it labels within 'interface'
> 1 new warning (64 suppressed by 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.suppr,
 please fix them)
> 0 new fatals (12 suppressed by 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.suppr,
 please fix them)
> Explanations are available on 
https://wiki.documentfoundation.org/Development/Accessibility
>
> /bin/sh: line 1: 31655 Segmentation fault  (core dumped) 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program" 
PYTHONHOME="$I/program/python-core-3.8.12" 
PYTHONPATH="${PYPATH:+$PYPATH:}$I/program/python-core-3.8.12/lib:$I/program/python-core-3.8.12/lib/lib-dynload"
 $I/program/python.bin $S/bin/gla11y -P $S/ -f 
$S/solenv/sanitizers/ui/sfx.false -s $S/solenv/sanitizers/ui/sfx.suppr 
--widgets-suffixignored 
+ValueSet,HBox,VBox,ToolBox,Preview,PreviewWin,PreviewWindow,PrevWindow 
--widgets-button +svtlo-ManagedMenuButton --fatal-all --not-fatal-type 
duplicate-mnemonic --not-fatal-type labelled-by-and-mnemonic --not-fatal-type 
orphan-label -o $W/UIConfig/sfx.a11yerrors 
$S/sfx2/uiconfig/ui/alienwarndialog.ui $S/sfx2/uiconfig/ui/addtargetdialog.ui 
$S/sfx2/uiconfig/ui/autoredactdialog.ui $S/sfx2/uiconfig/ui/bookmarkdialog.ui 
$S/sfx2/uiconfig/ui/bookmarkmenu.ui $S/sfx2/uiconfig/ui/charmapcontrol.ui 
$S/sfx2/uiconfig/ui/charviewmenu.ui $S/sfx2/uiconfig/ui/checkin.
 ui $S/sfx2/uiconfig/ui/classificationbox.ui 
$S/sfx2/uiconfig/ui/cmisinfopage.ui $S/sfx2/uiconfig/ui/cmisline.ui 
$S/sfx2/uiconfig/ui/commandpopup.ui $S/sfx2/uiconfig/ui/custominfopage.ui 
$S/sfx2/uiconfig/ui/deck.ui $S/sfx2/uiconfig/ui/descriptioninfopage.ui 
$S/sfx2/uiconfig/ui/developmenttool.ui $S/sfx2/uiconfig/ui/devtoolsmenu.ui 
$S/sfx2/uiconfig/ui/documentfontspage.ui 
$S/sfx2/uiconfig/ui/documentinfopage.ui 
$S/sfx2/uiconfig/ui/documentpropertiesdialog.ui 
$S/sfx2/uiconfig/ui/editdocumentdialog.ui 
$S/sfx2/uiconfig/ui/editdurationdialog.ui $S/sfx2/uiconfig/ui/emojicontrol.ui 
$S/sfx2/uiconfig/ui/extrabutton.ui $S/sfx2/uiconfig/ui/errorfindemaildialog.ui 
$S/sfx2/uiconfig/ui/floatingrecord.ui $S/sfx2/uiconfig/ui/helpbookmarkpage.ui 
$S/sfx2/uiconfig/ui/helpcontrol.ui $S/sfx2/uiconfig/ui/helpcontentpage.ui 
$S/sfx2/uiconfig/ui/helpindexpage.ui $S/sfx2/uiconfig/ui/helpmanual.ui 
$S/sfx2/uiconfig/ui/helpsearchpage.ui $S/sfx2/uiconfig/ui/helpwindow.ui 
$S/sfx2/uiconfig/ui/infobar.ui $S/sfx2/uic
 onfig/ui/inputdialog.ui $S/sfx2/uiconfig/ui/licensedialog.ui 
$S/sfx2/uiconfig/ui/linefragment.ui $S/sfx2/uiconfig/ui/linkeditdialog.ui 
$S/sfx2/uiconfig/ui/loadtemplatedialog.ui 
$S/sfx2/uiconfig/ui/managestylepage.ui $S/sfx2/uiconfig/ui/navigator.ui 
$S/sfx2/uiconfig/ui/newstyle.ui $S/sfx2/uiconfig/ui/notebookbar.ui 
$S/sfx2/uiconfig/ui/optprintpage.ui $S/sfx2/uiconfig/ui/panel.ui 
$S/sfx2/uiconfig/ui/password.ui $S/sfx2/uiconfig/ui/notebookbarpopup.ui 
$S/sfx2/uiconfig/ui/printeroptionsdialog.ui 
$S/sfx2/uiconfig/ui/querysavedialog.ui $S/sfx2/uiconfig/ui/saveastemplatedlg.ui 
$S/sfx2/uiconfig/ui/safemodequerydialog.ui $S/sfx2/uiconfig/ui/searchdialog.ui

[Libreoffice-commits] core.git: solenv/gbuild

2022-02-17 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 solenv/gbuild/platform/solaris.mk  |1 -
 solenv/gbuild/platform/unxgcc.mk   |1 -
 3 files changed, 3 deletions(-)

New commits:
commit cf07bcddd79beb6a0920384690a162c847801d7c
Author: Stephan Bergmann 
AuthorDate: Thu Feb 17 09:10:25 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 17 12:56:19 2022 +0100

Drop -Wdeclaration-after-statement

It was introduced, without a rationale, into unxgcc.mk in
eb09adaa9a2accbdc3531bb96447c8e7fbb9f8a9 "Warn if declaration follows
statement in C-files", then carried over to clang-cl (com_MSC_defs.mk) with
9055fb48402eaeb9ba876b7893e2f9a39fea06b1 "clang-cl: Enable more warnings 
etc.
(like in the Clang/GCC case)", where it now started to cause

> cppuhelper/source/findsofficepath.c(102,20): error: mixing declarations 
and code is incompatible with standards before C99 
[-Werror,-Wdeclaration-after-statement]
> const wchar_t* SUBKEYNAME = 
L"Software\\LibreOffice\\UNO\\InstallPath";
>^

after


"[clang][#51931] Enable -Wdeclaration-after-statement for all C versions".

Lets remove it from all toolchain settings, there appears to be not much 
value
anymore in such a warning about pre-C99 code.

Change-Id: Id4669089e46c97aaa926e5bd202c36eb5984b837
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130058
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 7620adab7e79..364c0011f38a 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -280,7 +280,6 @@ gb_CXXCLRFLAGS := \
 ifeq ($(COM_IS_CLANG),TRUE)
 
 gb_CFLAGS += \
-   -Wdeclaration-after-statement \
-Wendif-labels \
-Wshadow \
-Wstrict-prototypes \
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 3f9e0fde335e..0f396dd8e80e 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -43,7 +43,6 @@ gb_OSDEFS := \
 gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
-   -Wdeclaration-after-statement \
-Wshadow \
 
 gb_CXXFLAGS := \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index c70e3ce222bb..a0aead205c12 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -39,7 +39,6 @@ gb_OSDEFS := \
 gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
-   -Wdeclaration-after-statement \
-Wshadow \
 
 # At least libstdc++ needs -pthread when including various C++ headers like 
, see

[Libreoffice-commits] core.git: solenv/gbuild

2022-02-13 Thread Luboš Luňák (via logerrit)

 solenv/gbuild/ExternalProject.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e3092fd6c8dc8908bd7820a4eb858771ca7eb00
Author: Luboš Luňák 
AuthorDate: Sun Feb 13 01:18:10 2022 +0100
Commit: Luboš Luňák 
CommitDate: Sun Feb 13 13:17:51 2022 +0100

set up gb_COMPILER_SETUP properly for gb_ExternalProject_run

If the command to run would be "cmd1 && cmd2", the old way would
set up the variables only for the first command.

Change-Id: I190bbf535eab4fb0191a87add2ec19e9a2f11e0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129878
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 94f8daee37fc..ef10c1d2884f 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -222,7 +222,8 @@ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) 
&& \
unset Platform && \
$(if $(WRAPPERS),export $(WRAPPERS) &&) \
$(if $(NMAKE),export $(NMAKE) &&) \
-   $(gb_COMPILER_SETUP) $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if 
$(3),$(3)/,)$(if $(4),$(4),$(1).log))
+   $(if $(gb_COMPILER_SETUP),export $(gb_COMPILER_SETUP) &&) \
+   $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if 
$(4),$(4),$(1).log))
 )
 endef

[Libreoffice-commits] core.git: solenv/gbuild

2022-02-11 Thread Jan-Marek Glogowski (via logerrit)

 solenv/gbuild/ComponentTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2483cd198b51bd5d0819cbebf40f211b2ef1236d
Author: Jan-Marek Glogowski 
AuthorDate: Fri Feb 11 19:40:36 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Feb 11 20:46:21 2022 +0100

Correctly depend on source component file

Regression from commit 17ec55c48082254e1f55bcfa00808e45a50a9801
("Fail on non-optional, but filtered component names").

Change-Id: Idab5b3dbf9658c03b0ec1af67d1d9b740111c6a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129849
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index aed3fd88e889..3ba9cdb00d6b 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -102,7 +102,7 @@ $(call gb_ComponentTarget_get_target,$(1)) : 
COMPONENTSOURCE := $(call gb_Compon
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTIMPL :=
 $(call gb_ComponentTarget_get_target,$(1)) : ALLFILTEREDIMPL := $(call 
gb_ComponentTarget__init_allfiltered,$(1))
 
-$(call gb_ComponentTarget_get_target,$(1)) : $(call 
gb_ComponentTarget__source,$(1))
+$(call gb_ComponentTarget_get_target,$(1)) : $(call 
gb_ComponentTarget__init_source,$(1))
 $(call gb_ComponentTarget_get_target,$(1)).optionals : $(call 
gb_ComponentTarget__init_source,$(1))
 $(call gb_ComponentTarget_get_target,$(1)).allfiltered : $(call 
gb_ComponentTarget__init_allfiltered,$(1))

[Libreoffice-commits] core.git: solenv/gbuild

2022-01-25 Thread Michael Stahl (via logerrit)

 solenv/gbuild/LinkTarget.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 822b551f6ca92c9d4a8fb17dfc7ba28c272794cc
Author: Michael Stahl 
AuthorDate: Tue Jan 25 15:22:01 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 26 08:07:46 2022 +0100

gbuild: fix spurious rebuilds from gb_LinkTarget__use_libraries

Apparently the eval inside of "ifeq" needs to be escaped, currently both
branches of the "ifeq" are evaluated and generate makefile dependencies,
which causes spurious rebuild of Library_salhelper with
DISABLE_DYNLOADING unset from:
 make Library_salhelper && touch -c ../master/sal/osl/all/compat.cxx && 
make Library_salhelper

(regression from ecc50f56b3282ec3b0364101d860f22fe8da9042)

Change-Id: I8b5607b7a172c8b4b05abeaf4d5ff3a68d53cb14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bb6b4b1fedbc..86533ab3f60f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1326,7 +1326,7 @@ ifeq (,$(DISABLE_DYNLOADING))
 # for faster incremental builds when the ABI is unchanged.
 # export files are created from the library, so this also ensures the library 
exists.
 $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if $(filter 
$(lib),$(gb_Library_KNOWNLIBS)), \
-$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_exports_target,$(lib))) \
+$$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_exports_target,$(lib))) \
 ))
 
 else # DISABLE_DYNLOADING
@@ -1335,7 +1335,7 @@ ifneq (,$(call gb_LinkTarget_does_real_link,$(1)))
 $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(call 
gb_LinkTarget__filter_sys_libraries,$(3))
 $(if $(filter-out Library,gb_LinkTarget__get_workdir_linktargetclass,$(1)), \
 $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if 
$(filter $(lib),$(gb_Library_KNOWNLIBS)), \
-$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_linktarget_target,$(lib))) \
+$$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_linktarget_target,$(lib))) \
 )))
 endif
 endif # DISABLE_DYNLOADING

1 2 3 4 5 6 7 8 >

1 - 100 of 757 matches

Mail list logo