solenv/gbuild/Configuration.mk | 6 +++--- solenv/gbuild/Extension.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 0904f6ccc1a378743d1db56d330a691d90ba9720 Author: Christian Lohmaier <[email protected]> AuthorDate: Tue Dec 20 12:37:50 2022 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Tue Dec 20 14:11:26 2022 +0000 gbuild trace: fix mismatching start/end category in Extension.mk Change-Id: Ia4320ae7d4d7345f280bdb29f938a338970238f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144589 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index ce074832e995..4342859e415f 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -435,7 +435,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \ ) \ ) \ ) - $$(call gb_Trace_EndRange,$(1) $(3) $(5),XHP) + $$(call gb_Trace_EndRange,$(1) $(3) $(5),TRE) endef commit fbd89e8723bf989aa817ad6724dcf60a93c3b5dc Author: Christian Lohmaier <[email protected]> AuthorDate: Mon Dec 19 19:17:16 2022 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Tue Dec 20 14:11:16 2022 +0000 fix gbuild trace when building with translations the gb_Trace_StartRange expands to echo "…" >> logfile if tracing is enabled, so when using line-continuation it needs to be terminated with a ; to not cause syntax errors when making the target (or as in this patch moved to a location where it can be a recipe line by itself) Furthermore the startRange and endRange calls were split across the two different branches of the $(if ..) function, so tracing never worked, even when not building with translations - there it just didn't break the build… Change-Id: I601f516872cb9a099eae642bbd8629e75e8250cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144542 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 56c81be93481..67bea78d8b35 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -232,12 +232,12 @@ rm -rf $${MERGEINPUT} endef $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXDEPS) + $(call gb_Output_announce,$*,$(true),XCX,1) + $(call gb_Trace_StartRange,$*,XCX) $(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\ - $(call gb_Output_announce,$*,$(true),XCX,1) \ - $(call gb_Trace_StartRange,$*,XCX) \ $(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),\ - $(call gb_Trace_EndRange,$*,XCX) \ mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@) + $(call gb_Trace_EndRange,$*,XCX) $(call gb_XcuMergeTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCX,1)
