diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-11-21 00:35:37 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-11-21 01:37:10 +0100 |
| commit | f09419188502aeaeaa97ea49930b8d58b8c934ff (patch) | |
| tree | fcc26fd7b0772ffb46527536989a5cc539049442 | |
| parent | a3659faccafe6eb26822883d3270f988b4ae2a4e (diff) | |
Revert "Adapt helpcontent2 to var2file rename"
feature/cib_contract138e
This reverts commit 15deec972f2ea1e2076a74c4d206b49967c68844.
In core: "Resolves: tdf#97046 ensure build system variables start with gb_"
This reverts commit 3829c0c7db8768ca05f148e8f5c271ddb56d5bae.
Change-Id: Ibed2945cbefb73039f2cf44e238a1641f93c68b9
| -rw-r--r-- | CustomTarget_html.mk | 6 | ||||
| -rw-r--r-- | CustomTarget_imagelist.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index 56224a7d90..f66dd95ca1 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -42,7 +42,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \ $(call gb_Helper_abbreviate_dirs,\ ( \ echo 'var hid2fileMap = {' \ - && RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(addprefix $(SRCDIR)/,$(gb_AllLangHelp_$(module)_HELPFILES)))) \ + && RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(addprefix $(SRCDIR)/,$(gb_AllLangHelp_$(module)_HELPFILES)))) \ && <"$$RESPONSEFILE" $(if $(filter WNT,$(OS)),tr -d '\r' | env -i PATH="$$PATH") xargs -n 1 printf '%s\n' \ | while read xhp; do \ rm -f $@.good && \ @@ -216,7 +216,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \ $(call gb_Helper_abbreviate_dirs,\ cd $(if $(filter en-US,$*),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source \ && rm -rf $(dir $@)text \ - && RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(patsubst helpcontent2/source/%,%,$(gb_AllLangHelp_$(module)_HELPFILES)))) \ + && RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(patsubst helpcontent2/source/%,%,$(gb_AllLangHelp_$(module)_HELPFILES)))) \ && <"$$RESPONSEFILE" $(if $(filter WNT,$(OS)),tr -d '\r' | env -i PATH="$$PATH") xargs -n 1 printf '%s\n' \ | while read xhp; do \ mkdir -p $$(dirname $(dir $@)$$xhp) && \ @@ -285,7 +285,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \ $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) $(call gb_Helper_abbreviate_dirs,\ - RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(addprefix $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))) \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(addprefix $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))) \ && ( \ <"$$RESPONSEFILE" $(if $(filter WNT,$(OS)),tr -d '\r' | env -i PATH="$$PATH") xargs -n 1 printf '%s\n' \ | { rm -f $@.good && while read xhp; do \ diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk index 86350a530d..06225f121c 100644 --- a/CustomTarget_imagelist.mk +++ b/CustomTarget_imagelist.mk @@ -21,7 +21,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg | $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ - ILSTFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ + ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \ -g $(helpmedia_DIR) -m $(helpmedia_DIR) -c $(helpmedia_DIR) \ -l $${ILSTFILE} \ |