helpcontent2 | 2 +-
solenv/gbuild/HelpTarget.mk | 8 ++++----
solenv/gbuild/TargetLocations.mk | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a3d55b67b0c44aa135aad6447ba8a03c5aa7936a
Author: Christian Lohmaier <cl...@documentfoundation.org>
AuthorDate: Sat May 4 16:28:15 2024 +0200
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Sat May 4 16:28:15 2024 +0200
Update git submodules
* Update helpcontent2 from branch 'master'
to 5873436e54097facb9c435dc00cef6fc7194b108
- makefile simplification: replace $(call
gb_HelpTranslatePartTarget_get_workdir,foo)
helpcontent2 portion
Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8632560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167124
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/helpcontent2 b/helpcontent2
index e8b21ab24434..5873436e5409 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e8b21ab244345cea0a1d0b9190a8729ff3ea47b1
+Subproject commit 5873436e54097facb9c435dc00cef6fc7194b108
commit 52fc9164940a7e778cf4b03a984f7259bd92f9fa
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat May 4 14:29:17 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sat May 4 16:28:03 2024 +0200
makefile simplification: replace $(call
gb_HelpTranslatePartTarget_get_workdir,foo)
…by a simple/static $(gb_HelpTranslatePartTarget_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: I2525b03eadf75b108499701f7f576634619ccf1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167122
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index aa114d373b0b..2a629fcbd129 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -45,14 +45,14 @@ $(call gb_Helper_abbreviate_dirs, \
-l $(HELP_LANG) \
-mi $${HELPFILES} \
-m $${POFILES} \
- -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2))
&& \
+ -o $(gb_HelpTranslatePartTarget_workdir)/$(2) && \
rm -f $${POFILES} \
, \
$(gb_HelpTranslatePartTarget_COMMAND) \
-l $(HELP_LANG) \
-mi $${HELPFILES} \
-m \
- -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2)) \
+ -o $(gb_HelpTranslatePartTarget_workdir)/$(2) \
) \
) && \
touch $@ && \
@@ -83,7 +83,7 @@ $(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES
:= $(3)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) :
$(gb_Module_CURRENTMAKEFILE)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(3)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(dir $(call
gb_HelpTranslatePartTarget_get_target,$(1))).dir
-$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(call
gb_HelpTranslatePartTarget_get_workdir,$(1))/.dir
+$(call gb_HelpTranslatePartTarget_get_target,$(1)) :|
$(gb_HelpTranslatePartTarget_workdir)/$(1)/.dir
endef
@@ -99,7 +99,7 @@ endef
gb_HelpTranslateTarget__get_lang = $(lastword $(subst /, ,$(1)))
gb_HelpTranslateTarget__get_partname = $(call
gb_HelpTranslateTarget__get_lang,$(1))/$(patsubst %/,%,$(2))
-gb_HelpTranslateTarget__get_part_workdir = $(call
gb_HelpTranslatePartTarget_get_workdir,$(call
gb_HelpTranslateTarget__get_partname,$(1),$(2)))
+gb_HelpTranslateTarget__get_part_workdir =
$(gb_HelpTranslatePartTarget_workdir)/$(call
gb_HelpTranslateTarget__get_partname,$(1),$(2))
gb_HelpTranslateTarget_get_translated_target = $(call
gb_HelpTranslatePartTarget_get_translated_target,$(call
gb_HelpTranslateTarget__get_partname,$(1),$(dir $(2))),$(notdir $(2)))
gb_HelpTranslateTarget__get_any_translated_target = $(abspath $(call
gb_HelpTranslatePartTarget_get_translated_target,,$(1)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f59b3da126f9..f36a036106a7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -99,6 +99,7 @@ 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_workdir := $(WORKDIR)/HelpTranslatePartTarget
gb_HelpTranslateTarget_get_target = $(WORKDIR)/HelpTranslateTarget/$(1).done
gb_HelpTreeTarget_get_target = $(WORKDIR)/HelpTreeTarget/$(1).tree
gb_InstallModule_get_filelist = $(call
gb_InstallModuleTarget_get_filelist,$(1))
