diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-24 15:10:58 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-24 15:32:42 +0200 |
| commit | f32f607fcfb59c462919261f26f8ae07e1e4707f (patch) | |
| tree | da5553cc2f2ef42c1425791b15d25f4816789aaf /CustomTarget_html.mk | |
| parent | 67dd141b0f05a334a51a36d14cbe666559949715 (diff) | |
Revert "win doesn't like (foo || bar) | … construct, suspends xsltproc"
This reverts commit b066c7f1008ce7d433683324dc9ef441478c832c.
Reason for revert: not all xargs versions know -a option (mac)
Change-Id: Ia2a54e1dffe459b058f1e11a35372bb38774044f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166519
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'CustomTarget_html.mk')
| -rw-r--r-- | CustomTarget_html.mk | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index c8ac9250df..a3a9cec55f 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -278,32 +278,26 @@ html_gen_bookmarks_deps = $(call html__gen_bookmarks_deps,$(firstword $(1)),$(la $(eval $(foreach module,$(html_BMARK_MODULES),$(call html_gen_bookmarks_deps,$(subst :, ,$(module))))) -# intermediate responsefile target, make will clear those automatically -# unless they are explicitly listed as target or non-pattern prerequisite -# depend on the online_transform.xsl just as a proxy to make sure the directory exists -# is only intermediate because those were used as temp files previously - could just -# as well be plain/explicit targets -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%_bookmarks.part.responsefile:| $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/online_transform.xsl - $(file > $@,$(subst helpcontent2/source/text/,,$(gb_AllLangHelp_$*_BOOKMARK_HELPFILES))$(if $(filter WNT,$(OS)), )) - # strip the helpcontent2/source/text prefix and cd to the corresponding directory to maximize # the number of files that xargs can squeeze into a single invocation of xsltproc $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \ $(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \ $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \ - $(foreach module,$(html_TREE_MODULES),$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(module)_bookmarks.part.responsefile) \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) $(call gb_Trace_StartRange,$*/$(@F),XSL) - cd $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/helpcontent2/source/text \ - && $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs -a $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(firstword $(subst /, ,$*))_bookmarks.part.responsefile) \ + RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst helpcontent2/source/text/,,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))$(if $(filter WNT,$(OS)), )) \ + && cd $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/helpcontent2/source/text \ + && ( \ + $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs) \ --stringparam app $(APP) \ --stringparam Language $(HELP_LANG) \ --stringparam local $(if $(HELP_ONLINE),'no','yes') \ --stringparam productname "$(gb_PRODUCTNAME_HTML)" \ --stringparam productversion "$(PRODUCTVERSION)" \ $(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \ - | sort -k3b -s >$@ + <$$RESPONSEFILE || { rm $$RESPONSEFILE; exit 1; } \ + ) | sort -k3b -s >$@ && rm "$$RESPONSEFILE" $(call gb_Trace_EndRange,$*/$(@F),XSL) # The various gid_File_Help_*_Zip in scp2 that use EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG expect |