diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-19 19:17:16 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-20 14:11:16 +0000 |
| commit | fbd89e8723bf989aa817ad6724dcf60a93c3b5dc (patch) | |
| tree | e7be53ece03351cfd52acb3f5e948340e4968fcd /solenv | |
| parent | b332f036acc64ef71acab07bb2cfab589500b7ed (diff) | |
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 <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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) |