solenv/gbuild/Extension.mk | 49 ++++++++++++++++++---------------------
solenv/gbuild/Gallery.mk | 32 ++++++++++++-------------
solenv/gbuild/HelpTarget.mk | 10 +++----
solenv/gbuild/TargetLocations.mk | 9 ++++---
4 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit c8a145afbff81d4c19c2346870eb005c775862b1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat May 4 14:17:41 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sat May 4 16:27:56 2024 +0200
makefile simplification: replace $(call gb_HelpTarget_get_workdir,foo)
…by a simple/static $(gb_HelpTarget_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: Ibe4ce564b021158f3b1800fad96bdeee88792a97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167121
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 98baa661e908..aa114d373b0b 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -377,7 +377,7 @@ endef
# gb_HelpLinkTarget_set_indexed target indexfiles
define gb_HelpLinkTarget_set_indexed
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(2)
-$(addprefix $(call gb_HelpTarget_get_workdir,$(1))/,$(2)) : $(call
gb_HelpIndexTarget_get_target,$(1))
+$(addprefix $(gb_HelpTarget_workdir)/$(1)/,$(2)) : $(call
gb_HelpIndexTarget_get_target,$(1))
endef
@@ -407,7 +407,7 @@ endef
define gb_HelpLinkTarget_add_renamed_file
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES += $(strip
$(2)),$(strip $(3))
$(call gb_HelpLinkTarget_get_target,$(1)) : $(3)
-$(call gb_HelpTarget_get_workdir,$(1))/$(2) : $(call
gb_HelpLinkTarget_get_target,$(1))
+$(gb_HelpTarget_workdir)/$(1)/$(2) : $(call gb_HelpLinkTarget_get_target,$(1))
touch $$@
endef
@@ -582,7 +582,7 @@ endif
$(call gb_HelpTarget_get_linked_target,$*) \
$(call gb_HelpTarget_get_target,$*) \
$(call gb_HelpTarget_get_translation_target,$*) \
- $(call gb_HelpTarget_get_workdir,$*) \
+ $(gb_HelpTarget_workdir)/$* \
)
gb_HelpTarget_get_packagename = HelpTarget/$(1)
@@ -599,7 +599,7 @@ $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3)
$(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES :=
$(call gb_HelpTarget_get_translation_target,$(1)) :
$(gb_Module_CURRENTMAKEFILE)
-$(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(call
gb_HelpTarget_get_workdir,$(1)),$(call gb_HelpTarget_get_packagename,$(1)))
+$(call
gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(gb_HelpTarget_workdir)/$(1),$(call
gb_HelpTarget_get_packagename,$(1)))
endef
@@ -617,7 +617,7 @@ endif
$(call gb_HelpTarget_get_linked_target,$(1)) : $(call
gb_HelpTarget_get_translation_target,$(1))
ifeq ($(ENABLE_HTMLHELP),)
$(call gb_HelpLinkTarget_get_target,$(1)) : $(call
gb_HelpTarget_get_linked_target,$(1))
-$(call gb_HelpLinkTarget_get_target,$(1)) :| $(call
gb_HelpTarget_get_workdir,$(1))/.dir
+$(call gb_HelpLinkTarget_get_target,$(1)) :| $(gb_HelpTarget_workdir)/$(1)/.dir
$(call gb_HelpTarget_get_target,$(1)) : $(call
gb_HelpLinkTarget_get_target,$(1))
$(call gb_Package_get_preparation_target,$(5)) : $(call
gb_HelpTarget_get_target,$(1))
endif
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 553c127a1781..f59b3da126f9 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -94,7 +94,8 @@ gb_HelpTarget_get_filelist =
$(WORKDIR)/HelpTarget/$(1).filelist
gb_HelpTarget_get_linked_target = $(WORKDIR)/HelpTarget/$(1).translate
gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip
gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1))
-gb_HelpTarget_get_workdir = $(WORKDIR)/HelpTarget/$(1)
+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)
commit ee5eb3dac8c90a49de88475cf2d0de9d8a93e912
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat May 4 14:08:02 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sat May 4 16:27:49 2024 +0200
makefile simplification: replace $(call gb_Galley_get_workdir,foo)
…by a simple/static $(gb_Gallery_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: Iaa2ab218b329a15c7bf2ea528e2612a3a6b44f6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167120
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 3d3fa2092edc..ec7a791351fb 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -16,16 +16,16 @@ gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
define gb_Gallery__command
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
+ rm -f $(gb_Gallery_workdir)/$(2)/* && \
RESPONSEFILE=$(call gb_var2file,$(shell $(call
gb_MKTEMP)),$(GALLERY_FILES)) && \
$(call gb_Helper_print_on_error,\
$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
--build-tree \
--destdir $(GALLERY_BASEDIR) \
--name "$(GALLERY_NAME)" \
- --path $(call gb_Gallery_get_workdir,$(2)) \
+ --path $(gb_Gallery_workdir)/$(2) \
--filenames $(call gb_Helper_make_url,$$RESPONSEFILE) \
- -env:UserInstallation=$(call gb_Helper_make_url,$(call
gb_Gallery_get_workdir,$(2))/user),\
+ -env:UserInstallation=$(call
gb_Helper_make_url,$(gb_Gallery_workdir)/$(2)/user),\
$@.log \
) && \
rm $$RESPONSEFILE && \
@@ -61,13 +61,13 @@ $(call gb_Gallery__get_final_target,%) :
touch $@
# difficult to determine source dep for this one...
-$(call gb_Gallery_get_workdir,%).ulf : \
+$(gb_Gallery_workdir)/%.ulf : \
$(call gb_Executable_get_runtime_dependencies,ulfex)
$(call gb_CustomTarget_ulfex__command,$@,$(GALLERY_ULFFILE),\
$(foreach lang,$(gb_TRANS_LANGS),\
$(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po))
-$(call gb_Gallery_get_workdir,%).str : $(gb_Gallery_TRANSLATE) \
+$(gb_Gallery_workdir)/%.str : $(gb_Gallery_TRANSLATE) \
$(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_Output_announce,$*,$(true),STR,1)
$(call gb_Trace_StartRange,$*,STR)
@@ -82,7 +82,7 @@ $(call gb_Gallery_get_clean_target,%) :
$(call gb_Gallery__get_final_target,$*) \
$(call gb_Gallery_get_target,$*) \
$(call gb_Gallery_get_target,$*).log \
- $(call gb_Gallery_get_workdir,$*) \
+ $(gb_Gallery_workdir)/$* \
)
# the theme package
@@ -114,7 +114,7 @@ gb_Gallery_basedir = $(patsubst %/,%,$(dir $(SRCDIR)/$(1)))
#
# gb_Gallery__Gallery_impl gallery package basedir name
define gb_Gallery__Gallery_impl
-$(call gb_Package_Package_internal,$(2),$(call gb_Gallery_get_workdir,$(1)))
+$(call gb_Package_Package_internal,$(2),$(gb_Gallery_workdir)/$(1))
$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdg,$(1).sdg)
$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdv,$(1).sdv)
$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).thm,$(1).thm)
@@ -124,25 +124,25 @@ $(call
gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).str,$(1).str)
$(call gb_Gallery_get_target,$(1)) : GALLERY_BASEDIR := $(call
gb_Helper_make_url,$(call gb_Gallery_basedir,$(3)))
$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES :=
$(call gb_Gallery_get_target,$(1)) : GALLERY_NAME := $(1)
-$(call gb_Gallery_get_workdir,$(1))/$(1).str : GALLERY_STRFILE :=
$(SRCDIR)/$(3)/$(1).str
-$(call gb_Gallery_get_workdir,$(1))/$(1).str : GALLERY_ULFFILE := $(call
gb_Gallery_get_workdir,$(1))/$(1).ulf
-$(call gb_Gallery_get_workdir,$(1))/$(1).str : GALLERY_WORKDIR := $(call
gb_Gallery_get_workdir,$(1))
-$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : GALLERY_BASEDIR := $(3)
-$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : GALLERY_ULFFILE := $(call
gb_Gallery_basedir,$(3))/share/gallery_names.ulf
+$(gb_Gallery_workdir)/$(1)/$(1).str : GALLERY_STRFILE :=
$(SRCDIR)/$(3)/$(1).str
+$(gb_Gallery_workdir)/$(1)/$(1).str : GALLERY_ULFFILE :=
$(gb_Gallery_workdir)/$(1)/$(1).ulf
+$(gb_Gallery_workdir)/$(1)/$(1).str : GALLERY_WORKDIR :=
$(gb_Gallery_workdir)/$(1)
+$(gb_Gallery_workdir)/$(1)/$(1).ulf : GALLERY_BASEDIR := $(3)
+$(gb_Gallery_workdir)/$(1)/$(1).ulf : GALLERY_ULFFILE := $(call
gb_Gallery_basedir,$(3))/share/gallery_names.ulf
-$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
+$(gb_Gallery_workdir)/$(1)/$(1).ulf : \
$(call gb_Gallery_basedir,$(3))/share/gallery_names.ulf \
$(call gb_Gallery_get_target,$(1)) # that rule pre-cleans our output
directory
-$(call gb_Gallery_get_workdir,$(1))/$(1).str : $(call
gb_Gallery_get_workdir,$(1))/$(1).ulf
+$(gb_Gallery_workdir)/$(1)/$(1).str : $(gb_Gallery_workdir)/$(1)/$(1).ulf
# 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))
+$(addprefix $(gb_Gallery_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))
$(call gb_Gallery_get_target,$(1)) :| $(dir $(call
gb_Gallery_get_target,$(1))).dir \
- $(call gb_Gallery_get_workdir,$(1))/.dir
+ $(gb_Gallery_workdir)/$(1)/.dir
$$(eval $$(call gb_Module_register_target,$(call
gb_Gallery__get_final_target,$(1)),$(call gb_Gallery_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Gallery,$(call
gb_Gallery__get_final_target,$(1)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index c7a7658b9060..553c127a1781 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -82,7 +82,8 @@ gb_ExternalProject_get_state_target =
$(WORKDIR)/ExternalProject/$(1)/$(2)
gb_ExternalProject_get_target = $(WORKDIR)/ExternalProject/$(1).done
gb_ExternalProject_get_target_for_build =
$(WORKDIR_FOR_BUILD)/ExternalProject/$(1).done
gb_Gallery_get_target = $(WORKDIR)/Gallery/$(1).done
-gb_Gallery_get_workdir = $(WORKDIR)/Gallery/$(1)
+gb_Gallery_get_workdir = $(error please use plain gb_Gallery_workdir instead)
+gb_Gallery_workdir := $(WORKDIR)/Gallery
gb_GeneratedPackage_get_target = $(WORKDIR)/GeneratedPackage/$(1).filelist
gb_GeneratedPackage_get_target_for_build =
$(WORKDIR_FOR_BUILD)/GeneratedPackage/$(1).filelist
gb_HelpIndexTarget_get_target = $(WORKDIR)/HelpIndexTarget/$(1).done
commit cdf1f0471233a23fe34d2b9875802559d8157712
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat May 4 13:51:56 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sat May 4 16:27:43 2024 +0200
makefile simplification: replace $(call gb_Extension_get_workdir,foo)
…by a simple/static $(gb_Extension_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: Id0184717f2cc30af792266b233eec957b99e7e26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167119
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 42616e0b8655..cd20cf602327 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -48,14 +48,11 @@ $(if $(PLATFORM),\
cp -f $(1) $(2))
endef
-$(call gb_Extension_get_workdir,%)/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
# remove extension directory in workdir and oxt file in workdir
$(call gb_Extension_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),OXT,3)
$(call gb_Helper_abbreviate_dirs,\
- rm -f -r $(call gb_Extension_get_workdir,$*) && \
+ rm -f -r $(gb_Extension_workdir)/$* && \
rm -f $(call gb_Extension__get_preparation_target,$*) \
$(call gb_Extension_get_target,$*) \
)
@@ -70,20 +67,20 @@ $(call gb_Extension__get_preparation_target,%) :
mkdir -p $(dir $@) && touch $@)
ifeq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Helper_LANGSTARGET)
+$(gb_Extension_workdir)/%/description.xml : $(gb_Helper_LANGSTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),CPY,3)
$(call gb_Trace_StartRange,$*/description.xml,CPY)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(call gb_Extension_get_workdir,$*) && \
+ mkdir -p $(gb_Extension_workdir)/$* && \
cp -f $(LOCATION)/description.xml $@)
$(call gb_Trace_EndRange,$*/description.xml,CPY)
else
-$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS)
$(gb_Helper_LANGSTARGET)
+$(gb_Extension_workdir)/%/description.xml : $(gb_Extension_XRMEXDEPS)
$(gb_Helper_LANGSTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
$(call gb_Trace_StartRange,$*/description.xml,XRM)
MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(POFILES)) && \
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(call gb_Extension_get_workdir,$*) && \
+ mkdir -p $(gb_Extension_workdir)/$* && \
$(gb_Extension_XRMEXCOMMAND) \
-i $(filter %.xml,$^) \
-o $@ \
@@ -99,17 +96,17 @@ endif
# 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
+ $(gb_Extension_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) && \
- $(call gb_Extension__subst_platform,$(call
gb_Extension_get_workdir,$*)/description.xml,$(call
gb_Extension_get_rootdir,$*)/description.xml) && \
+ $(call
gb_Extension__subst_platform,$(gb_Extension_workdir)/$*/description.xml,$(call
gb_Extension_get_rootdir,$*)/description.xml) && \
$(call
gb_Extension__subst_platform,$(LOCATION)/META-INF/manifest.xml,$(call
gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
$(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,$*) &&) \
+ $(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp
$(foreach
lang,$(gb_Extension_TRANS_LANGS),$(gb_Extension_workdir)/$*/description-$(lang).txt)
$(call gb_Extension_get_rootdir,$*) &&) \
cd $(call gb_Extension_get_rootdir,$*) && \
cat $$RESPONSEFILE | $(call gb_Helper_wsl_path,$(WSL)
$(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
$(call gb_Extension_get_target,$*) --names-stdin)) &&
rm -f $$RESPONSEFILE
@@ -128,9 +125,9 @@ $(call gb_Extension_get_target,$(1)) : LICENSE :=
$(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
$(call gb_Extension_get_target,$(1)) : PLATFORM := $(PLATFORMID)
$(call gb_Extension_get_target,$(1)) : $(SRCDIR)/$(2)/META-INF/manifest.xml
-$(call gb_Extension_get_workdir,$(1))/description.xml : \
+$(gb_Extension_workdir)/$(1)/description.xml : \
$(SRCDIR)/$(2)/description.xml
-$(call gb_Extension_get_workdir,$(1))/description.xml :| \
+$(gb_Extension_workdir)/$(1)/description.xml :| \
$(call gb_Extension__get_preparation_target,$(1))
$(call gb_Extension__get_final_target,$(1)) : $(call
gb_Extension_get_target,$(1))
@@ -139,7 +136,7 @@ $(if $(filter nodeliver,$(3)),,$(call
gb_Extension__Extension_deliver,$(1),Exten
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : \
POFILES := $(wildcard $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po))
-$(call gb_Extension_get_workdir,$(1))/description.xml : \
+$(gb_Extension_workdir)/$(1)/description.xml : \
$(wildcard $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po))
$(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) :
endif
@@ -345,22 +342,22 @@ endef
define gb_Extension__localize_helpfile_onelang
$(call gb_Extension_get_rootdir,$(1))/help/$(5).done : HELPFILES += $(3)
$(call gb_Extension_get_rootdir,$(1))/help/$(5).done : \
- $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3)
+ $(gb_Extension_workdir)/$(1)/help/$(5)/$(3)
$(call gb_Extension_get_rootdir,$(1))/help/$(5)-xhp.done : \
- $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3)
+ $(gb_Extension_workdir)/$(1)/help/$(5)/$(3)
ifneq ($(filter-out en-US,$(5)),)
ifneq ($(filter-out qtz,$(5)),)
-$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
+$(gb_Extension_workdir)/$(1)/help/$(5)/$(3) : \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
-$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
+$(gb_Extension_workdir)/$(1)/help/$(5)/$(3) : \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst
./,.po,$(dir $(or $(4),$(3))))) :
endif
endif
-$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
+$(gb_Extension_workdir)/$(1)/help/$(5)/$(3) : \
$(if $(filter-out en-US,$(5)),$(gb_Extension_HELPEXDEPS)) | \
- $(call gb_Extension_get_workdir,$(1))/help/.dir
-$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
+ $(gb_Extension_workdir)/$(1)/help/.dir
+$(gb_Extension_workdir)/$(1)/help/$(5)/$(3) : \
$(2)/$(or $(4),$(3))
$$(call gb_Output_announce,$(1) $(3) $(5),$(true),XHP,3)
$$(call gb_Trace_StartRange,$(1) $(3) $(5),XHP)
@@ -421,18 +418,18 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \
mkdir -p $$(dir $$@) && \
$(if $(filter qtz,$(5)), \
$(subst $$,$$$$,$(gb_Extension_TREEXCOMMAND)) -i $$< -o
$$@ -l $(5) -m \
- -r $$(call
gb_Extension_get_workdir,$(1))/help/$(5)/$(6) \
+ -r $(gb_Extension_workdir)/$(1)/help/$(5)/$(6) \
, \
$(if $(filter-out en-US,$(5)), \
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $$(POFILE) > $$$${MERGEINPUT} && \
$(subst $$,$$$$,$(gb_Extension_TREEXCOMMAND))
-i $$< -o $$@ -l $(5) \
-m $$$${MERGEINPUT} \
- -r $$(call
gb_Extension_get_workdir,$(1))/help/$(5)/$(6) && \
+ -r
$(gb_Extension_workdir)/$(1)/help/$(5)/$(6) && \
rm -rf $$$${MERGEINPUT} \
, \
$(subst $$,$$$$,$(gb_Extension_TREEXCOMMAND))
-i $$< -o $$@ -l $(5) \
- -r $$(call
gb_Extension_get_workdir,$(1))/help/$(5)/$(6) \
+ -r
$(gb_Extension_workdir)/$(1)/help/$(5)/$(6) \
) \
) \
)
@@ -459,13 +456,13 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
$$(call gb_Helper_abbreviate_dirs, \
mkdir -p $$(basename $$@) && \
$$(gb_Extension_HELPLINKERCOMMAND) -mod help \
- -extlangsrc $(call gb_Extension_get_workdir,$(1))/help/$(2) \
+ -extlangsrc $(gb_Extension_workdir)/$(1)/help/$(2) \
-sty $(SRCDIR)/xmlhelp/util/embed.xsl \
-extlangdest $$(basename $$@) \
-idxcaption $(SRCDIR)/xmlhelp/util/idxcaption.xsl \
-idxcontent $(SRCDIR)/xmlhelp/util/idxcontent.xsl \
$$(HELPFILES) && \
- (cd $(call gb_Extension_get_workdir,$(1))/help/$(2) && \
+ (cd $(gb_Extension_workdir)/$(1)/help/$(2) && \
$$(call gb_Helper_wsl_path,$(WSL) $$(gb_Extension_ZIPCOMMAND) -r
$$(basename $$@)/help.jar \
$$(HELPFILES))) && \
$$(gb_Extension_HELPINDEXERCOMMAND) -lang $(2) -mod help \
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 725390a8feed..c7a7658b9060 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -70,7 +70,8 @@ gb_Executable_get_headers_target =
$(WORKDIR)/Headers/Executable/$(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
-gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
+gb_Extension_get_workdir = $(error please use plain gb_Extension_workdir
instead)
+gb_Extension_workdir := $(WORKDIR)/Extension
gb_ExtensionPackage_get_target = $(WORKDIR)/ExtensionPackage/$(1).filelist
gb_ExtensionPackage_get_preparation_target =
$(WORKDIR)/ExtensionPackage/$(1).prepare
gb_ExtensionPackageSet_get_target = $(WORKDIR)/ExtensionPackage/$(1).set
