diff options
33 files changed, 86 insertions, 86 deletions
diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk index 582b0315d458..ac567038b690 100644 --- a/extensions/CustomTarget_so_activex_idl.mk +++ b/extensions/CustomTarget_so_activex_idl.mk @@ -38,7 +38,7 @@ $(call gb_CustomTarget_get_target,extensions/source/activex/idl) : \ $(EXAI)/so_activex.tlb : \ $(SRCDIR)/extensions/source/activex/so_activex.idl | $(EXAI)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ midl.exe \ -tlb $@ \ -h $(EXAI)/so_activex.h \ diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index ef2204a17597..9c49027a7377 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -40,7 +40,7 @@ filter_XcuFilterTypesTarget_get_clean_target = \ $(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \ @@ -54,7 +54,7 @@ $(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) $(call filter_XcuFilterTypesTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ rm -f $(call filter_XcuFilterTypesTarget_get_target,$*) \ $(call gb_XcuModuleTarget_get_outdir_target,$*)) @@ -87,7 +87,7 @@ filter_XcuFilterFiltersTarget_get_clean_target = \ $(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \ @@ -120,7 +120,7 @@ filter_XcuFilterOthersTarget_get_clean_target = \ $(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ RESPONSEFILE2=`$(gb_MKTEMP)` && \ @@ -158,7 +158,7 @@ filter_XcuFilterInternalTarget_get_clean_target = \ $(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),XCU,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \ @@ -204,7 +204,7 @@ filter_XcuResTarget_get_target = \ $(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(true),XCU,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \ @@ -229,7 +229,7 @@ define filter_XcuResTarget__rule $$(call filter_XcuResTarget_get_target,$(1)) : \ $(filter_XSLT_langfilter) $(filter_XcuFilterUiTarget) $$(call gb_Output_announce,$(1),$(true),XCU,1) - $$(call gb_Helper_abbreviate_dirs_native,\ + $$(call gb_Helper_abbreviate_dirs,\ mkdir -p $$(dir $$@) && \ $(gb_XSLTPROC) --nonet --stringparam lang $(1) \ $(filter_XSLT_langfilter) \ diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk index d841dbd526e3..f46670a078e2 100644 --- a/filter/CustomTarget_svg.mk +++ b/filter/CustomTarget_svg.mk @@ -62,7 +62,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) $(filter_GEN_svg_Script_hxx) : \ $(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) | $(FISS)/.dir $(call gb_Output_announce,$@,build,PY ,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \ $(filter_SRC_svg_PresentationEngine) \ $(filter_GEN_svg_Script_hxx)) diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index 54f5a4b543f4..55c655401a27 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ $(IPBI)/dict_%.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic \ $(call gb_Executable_get_target_for_build,gendict) | $(IPBI)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(IPBI)/dict_%.cxx,%,$@)) ifeq ($(SYSTEM_GENBRK),) @@ -72,7 +72,7 @@ BRKFILES := $(subst .txt,.brk,$(notdir \ # Output of gencmn is redirected to OpenOffice_tmp.c with the -t switch. $(IPBI)/OpenOffice_dat.c : $(patsubst %.brk,$(IPBI)/%_brk.c,$(BRKFILES)) $(GENCMNTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMN,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(shell $(gb_MKTEMP)) && \ $(foreach brk,$(BRKFILES),echo '$(brk)' >> $${RESPONSEFILE} && ) \ $(GENCMN) -n OpenOffice -t tmp -S -d $(IPBI)/ 0 $${RESPONSEFILE} && \ @@ -84,13 +84,13 @@ $(IPBI)/OpenOffice_dat.c : $(patsubst %.brk,$(IPBI)/%_brk.c,$(BRKFILES)) $(GENCM $(IPBI)/%_brk.c : $(IPBI)/%.brk $(GENCCODETARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CCD,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ $(GENCCODE) -n OpenOffice -d $(IPBI)/ $< \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) $(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ $(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) # fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4 diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 951a2cab36d3..413767ca13b2 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -38,7 +38,7 @@ $(call gb_CustomTarget_get_target,i18npool/collator) : \ $(IPCO)/collator_%.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt \ $(call gb_Executable_get_target_for_build,gencoll_rule) | $(IPCO)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,gencoll_rule) $< $@ $*) $(IPCO)/lrl_include.hxx : $(SRCDIR)/i18npool/source/collator/data | $(IPCO)/.dir diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk index 681dd4c1e6e7..1968fb6c65ca 100644 --- a/i18npool/CustomTarget_indexentry.mk +++ b/i18npool/CustomTarget_indexentry.mk @@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_target,i18npool/indexentry) : \ $(IPIE)/%.cxx : $(SRCDIR)/i18npool/source/indexentry/data/%.txt \ $(call gb_Executable_get_target_for_build,genindex_data) | $(IPIE)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,genindex_data) $< $@.tmp $* && \ sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index e506d465b6c7..c4e8dc9c2b2e 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \ $(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \ $(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \ @@ -49,7 +49,7 @@ $(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \ $(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ -o $@ $(SOLARENV)/bin/packcomponents.xslt $<) diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk index da58b1b33a54..6a5f10d79468 100644 --- a/i18npool/CustomTarget_textconversion.mk +++ b/i18npool/CustomTarget_textconversion.mk @@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_target,i18npool/textconversion) : \ $(IPTC)/%.cxx : $(SRCDIR)/i18npool/source/textconversion/data/%.dic \ $(call gb_Executable_get_target_for_build,genconv_dict) | $(IPTC)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,genconv_dict) $* $< $@.tmp && \ sed 's/\(^.*get\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) diff --git a/jvmfwk/CustomTarget_jreproperties.mk b/jvmfwk/CustomTarget_jreproperties.mk index ffeb5787ca9c..610549a21ebf 100644 --- a/jvmfwk/CustomTarget_jreproperties.mk +++ b/jvmfwk/CustomTarget_jreproperties.mk @@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,jvmfwk/jreproperties) : $(JFJP)/JREProperties. $(JFJP)/JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \ | $(JFJP)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ cd $(dir $@) && $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index 7bf0ba77555e..5f13b6bbd801 100644 --- a/officecfg/CustomTarget_registry.mk +++ b/officecfg/CustomTarget_registry.mk @@ -41,7 +41,7 @@ $(OCRG)/$(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \ $(OCDIR)/schema/org/openoffice/$(if $(1),$(1)/$(if $(2),$(2)/))%.xcs \ $(OCDIR)/cppheader.xsl | $(gb_XSLTPROCTARGET) $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),XSL,1) - $$(call gb_Helper_abbreviate_dirs_native, \ + $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ $$(gb_XSLTPROC) --nonet --stringparam ns1 \ $(if $(1), \ diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk index a4ec5f603a07..54f698cd986a 100644 --- a/packimages/CustomTarget_images.mk +++ b/packimages/CustomTarget_images.mk @@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_target,packimages/images) : \ $(PIIM)/images.zip : $(PIIM)/sorted.lst $(PIIM)/commandimagelist.ilst $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy -c $(PIIM) \ -l $(PIIM) -l $(OUTDIR)/res/img -s $< -o $@ \ @@ -48,7 +48,7 @@ $(PIIM)/images.zip : $(PIIM)/sorted.lst $(PIIM)/commandimagelist.ilst $(PIIM)/images_%.zip : $(PIIM)/sorted.lst $(PIIM)/commandimagelist.ilst $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \ $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) \ @@ -65,7 +65,7 @@ $(PIIM)/images_brand.zip :| $(PIIM)/.dir $(PIIM)/commandimagelist.ilst :| $(PIIM)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \ sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \ $(PERL) $(SOLARENV)/bin/sort.pl > $@.$(INPATH) && \ @@ -74,7 +74,7 @@ $(PIIM)/commandimagelist.ilst :| $(PIIM)/.dir $(PIIM)/sorted.lst : $(SRCDIR)/packimages/pack/image-sort.lst | $(PIIM)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@) # vim: set noet sw=4 ts=4: diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk index 31a7739f7645..d0436f834b13 100644 --- a/ridljar/CustomTarget_javamaker.mk +++ b/ridljar/CustomTarget_javamaker.mk @@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,ridljar/javamaker) : $(RJJM)/done $(RJJM)/done : $(OUTDIR)/bin/udkapi.rdb \ $(call gb_Executable_get_target_for_build,javamaker) | $(RJJM)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,javamaker -BUCR -O$(RJJM)/class $<) && touch $@) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk index c0be5b6cb95b..1b0206272437 100644 --- a/sal/CustomTarget_generated.mk +++ b/sal/CustomTarget_generated.mk @@ -40,7 +40,7 @@ $(SAUT)/rtlbootstrap.mk :| $(SAUT)/.dir else $(SAUT)/rtlbootstrap.mk : $(SAUT)/sal/typesizes.h | $(SAUT)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(SAUT)/bootstrap.cxx && \ $(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I$(SAUT) -I$(SRCDIR)/sal/rtl/source \ -I$(SRCDIR)/sal/inc $(SAUT)/bootstrap.cxx > $@.tmp && \ diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 9e5a6ab817d5..10a4bcbb85af 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -53,7 +53,7 @@ gb_SrsPartMergeTarget_TRANSEXCOMMAND := \ define gb_SrsPartMergeTarget__command $(call gb_Output_announce,$(3),$(true),srs,1) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ @@ -77,7 +77,7 @@ gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for gb_SrsPartTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET) define gb_SrsPartTarget__command -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "-s \ @@ -334,7 +334,7 @@ $(call gb_ResTarget_get_clean_target,%) : $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET) $(call gb_Output_announce,$*,$(true),RES,2) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) $(OUTDIR)/bin \ $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index ee57d7643d2f..89dde76d7c3b 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -37,7 +37,7 @@ gb_ComponentTarget_get_source = $(1)/$(2).component define gb_ComponentTarget__command $(call gb_Output_announce,$(3),$(true),CMP,1) $(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME set at component target: $(1))) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XSLTPROC) --nonet --stringparam uri \ '$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(subst \d,$$,$(COMPONENTPREFIX)))$(LIBFILENAME)' -o $(1) \ diff --git a/solenv/gbuild/ComponentsTarget.mk b/solenv/gbuild/ComponentsTarget.mk index 813443959615..b211488a42ba 100644 --- a/solenv/gbuild/ComponentsTarget.mk +++ b/solenv/gbuild/ComponentsTarget.mk @@ -49,30 +49,30 @@ endef $(call gb_ComponentsTarget_get_target,%): \ $(call gb_ComponentsTarget_get_target,%).input $(call gb_Output_announce,$*,$(true),CPS,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@)) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(gb_XSLTPROC) --nonet --stringparam prefix $(WORKDIR) -o $@ \ $(SOLARENV)/bin/packcomponents.xslt $@.input) $(call gb_ComponentsTarget_get_clean_target,%): \ $(call gb_ComponentsTarget_get_clean_target,%).input $(call gb_Output_announce,$*,$(false),CPS,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ rm -f $(call gb_ComponentsTarget_get_target,$*)) $(call gb_ComponentsTarget_get_target,%).input: $(call gb_Output_announce,$*,$(true),CPI,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@)) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ printf '<list>%s</list>' \ "$(foreach i,$(COMPONENTFILES),<filename>$(subst $(WORKDIR),,$i)</filename>)" \ > $@) $(call gb_ComponentsTarget_get_clean_target,%).input: $(call gb_Output_announce,$*,$(false),CPI,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ rm -f $(call gb_ComponentsTarget_get_target,$*).input) # vim: set noet sw=4: diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index ff19c1188631..02d87a665f5d 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -72,7 +72,7 @@ gb_XcsTarget_DTD_Schema := $(OUTDIR)/xml/registry/component-schema.dtd define gb_XcsTarget__command $(call gb_Output_announce,$(2),$(true),XCS,1) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XSLTPROC) --nonet \ --noout \ @@ -120,7 +120,7 @@ gb_XcuDataTarget_DTD_ComponentUpdate := $(OUTDIR)/xml/registry/component-update. define gb_XcuDataTarget__command $(call gb_Output_announce,$(2),$(true),XCU,2) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XSLTPROC) --nonet \ --noout \ @@ -171,7 +171,7 @@ endef define gb_XcuModuleTarget__command $(call gb_Output_announce,$(2),$(true),XCU,3) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XSLTPROC) --nonet \ -o $(1) \ @@ -249,7 +249,7 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_C # PRJNAME is computed from the stem (parameter $(2)) define gb_XcuMergeTarget__command $(call gb_Output_announce,$(2),$(true),XCU,5) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ @@ -282,7 +282,7 @@ endef # locale is extracted from the stem (parameter $(2)) define gb_XcuResTarget__command $(call gb_Output_announce,$(2),$(true),XCU,6) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XSLTPROC) --nonet \ -o $(1) \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 94582a892c7f..b8b867251207 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -81,7 +81,7 @@ $(call gb_CppunitTest_get_clean_target,%) : .PHONY : $(call gb_CppunitTest_get_target,%) $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET) $(call gb_Output_announce,$*,$(true),CUT,2) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ ($(gb_CppunitTest_CPPTESTPRECOMMAND) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index faa0de34c434..912018cbae4a 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -74,7 +74,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : else $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXTARGET) $(call gb_Output_announce,$*/description.xml,$(true),XRM,3) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Extension_get_workdir,$*) && \ $(gb_Extension_XRMEXCOMMAND) \ -p $(PRJNAME) \ @@ -89,7 +89,7 @@ endif $(call gb_Extension_get_target,%) : \ $(call gb_Extension_get_workdir,%)/description.xml $(call gb_Output_announce,$*,$(true),OXT,3) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \ $(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) && \ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 8e8d0242a460..3ac278db50c0 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -48,7 +48,7 @@ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1)))) endef define gb_Helper_abbreviate_dirs_native -$(call gb_Helper_abbreviate_dirs,$(1)) +$$(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use gb_Helper_abbreviate_dirs instead.) endef define gb_Helper_native_path diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index f8271097c583..e01e2fd8118a 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -27,7 +27,7 @@ .PHONY : $(call gb_InternalUnoApi_get_clean_target,%) $(call gb_InternalUnoApi_get_clean_target,%) : - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_InternalUnoApi_get_target,$*)) # Note: The rdb root for the internal rdbs should be / . On the other diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index ac1c151913dd..d0baa4a1ccbf 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -56,7 +56,7 @@ endef # the other one(s), which seems to work .-) define gb_Jar__command $(call gb_Output_announce,$*,$(true),JAR,3) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \ echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \ $(if $(JARCLASSPATH),echo "Class-Path: $(strip $(JARCLASSPATH))" >> $(call gb_Jar_get_manifest_target,$(1)) &&) \ diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index e5b617f9580c..d9f7b071dae6 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -38,7 +38,7 @@ gb_JavaClassSet_JAVACDEBUG := -g endif define gb_JavaClassSet__command -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(if $(filter-out $(JARDEPS),$(4)), \ rm -rf $(call gb_JavaClassSet_get_classdir,$(2))/* && \ diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 40c23aae06c1..c74a7ce2b748 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -43,7 +43,7 @@ ifneq (,$(strip $(OOO_JUNIT_JAR))) .PHONY : $(call gb_JunitTest_get_target,%) $(call gb_JunitTest_get_target,%) : $(call gb_Output_announce,$*,$(true),JUT,2) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ rm -rf $(call gb_JunitTest_get_userdir,$*) && \ mkdir -p $(call gb_JunitTest_get_userdir,$*) && \ (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \ diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 86aee2d532b9..7a85ff27af75 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -38,7 +38,7 @@ $(strip $(if $(call gb_Rdb__is_old_component_target,$(component))\ endef define gb_Rdb__command -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ (\ echo '<list>' && \ @@ -56,7 +56,7 @@ $(call gb_Rdb_get_target,%) : .PHONY : $(call gb_Rdb_get_clean_target,%) $(call gb_Rdb_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RDB,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*)) # DO NOT DEFINE: it overwrites the definition from Package.mk for xml/ diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 9510ef9400ab..7f414363eacb 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -39,7 +39,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET $(call gb_Output_announce,$*,$(true),SDI,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) $(dir $(call gb_SdiTarget_get_dep_target,$*))) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ cd $(dir $<) && \ $(gb_SdiTarget_SVIDLCOMMAND) -quiet \ $(INCLUDE) \ diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 2b51f8c9750a..9ecf1edd90e3 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -27,7 +27,7 @@ .PHONY : $(call gb_UnoApi_get_clean_target,%) $(call gb_UnoApi_get_clean_target,%) : - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApi_get_target,$*)) define gb_UnoApi_UnoApi diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 733e6214b5d6..5742f94058cb 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -298,7 +298,7 @@ $(call gb_UnoApiHeadersTarget_get_target,%) : .PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%) $(call gb_UnoApiHeadersTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HPP,3) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ rm -rf \ $(call gb_UnoApiHeadersTarget_get_dir,$*) \ $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \ diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk index 38f133536455..f6d84f5d0d7e 100644 --- a/solenv/gbuild/Zip.mk +++ b/solenv/gbuild/Zip.mk @@ -46,7 +46,7 @@ $(call gb_Zip_get_clean_target,%) : # --filesync makes sure that all files in the zip package will be removed that no longer are in $(FILES) $(call gb_Zip_get_target,%) : $(call gb_Output_announce,$*,$(true),ZIP,3) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(call gb_Zip_get_target,$*)) && \ cd $(LOCATION) && $(gb_Zip_ZIPCOMMAND) -rX --filesync $(call gb_Zip_get_target,$*) $(FILES) ) @@ -59,7 +59,7 @@ $(call gb_Zip_get_final_target,%) : $(call gb_Zip_get_outdir_target,%) # the preparation target is here to ensure proper ordering of actions in cases # when we want to, e.g., create a zip from files created by a custom target $(call gb_Zip__get_preparation_target,%) : - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && touch $@) # clear file list, set location (zipping uses relative paths) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 3c7fde579296..d40a185a9559 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -262,7 +262,7 @@ endef # $(call gb_CObject__command,object,relative-source,source,dep-file) define gb_CObject__command $(call gb_Output_announce,$(2).c,$(true),C ,3) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ $(DEFS) \ @@ -282,7 +282,7 @@ endef # $(call gb_CxxObject__command,object,relative-source,source,dep-file) define gb_CxxObject__command $(call gb_Output_announce,$(2).cxx,$(true),CXX,3) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \ $(DEFS) \ @@ -304,7 +304,7 @@ gb_AsmObject_get_source = $(1)/$(2).asm define gb_AsmObject__command $(call gb_Output_announce,$(2),$(true),ASM,3) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ "$(ML_EXE)" $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \ echo "$(1) : $(3)" > $(4) @@ -326,7 +326,7 @@ gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ rm -f $(1) && \ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \ @@ -638,7 +638,7 @@ endef ifeq ($(gb_FULLDEPS),$(true)) define gb_SrsPartTarget__command_dep -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ $(INCLUDE) \ $(DEFS) \ @@ -661,7 +661,7 @@ gb_WinResTarget_POSTFIX :=.res define gb_WinResTarget__command $(call gb_Output_announce,$(2),$(true),RES,3) -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_RC) \ $(DEFS) $(FLAGS) \ @@ -676,7 +676,7 @@ $(eval $(call gb_Helper_make_dep_targets,\ ifeq ($(gb_FULLDEPS),$(true)) define gb_WinResTarget__command_dep -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ $(INCLUDE) \ $(DEFS) \ diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk index 78eda26c437e..ff53b92ecf79 100644 --- a/unoil/CustomTarget_climaker.mk +++ b/unoil/CustomTarget_climaker.mk @@ -41,7 +41,7 @@ $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ $(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \ $(call gb_Executable_get_target_for_build,climaker) | $(UICM)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,climaker \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ --out $@ \ @@ -56,13 +56,13 @@ $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ $(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \ $(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@) $(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \ $(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ al -out:$@ \ -version:$(CLI_OOOTYPES_POLICY_VERSION) \ -keyfile:$(OUTDIR)/bin/cliuno.snk \ diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk index 943732a61d7c..94e70af7d813 100644 --- a/unoil/CustomTarget_javamaker.mk +++ b/unoil/CustomTarget_javamaker.mk @@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,unoil/javamaker) : $(UIJM)/done $(UIJM)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ $(call gb_Executable_get_target_for_build,javamaker) | $(UIJM)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) - $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_abbreviate_dirs, \ rm -r $(UIJM) && \ $(call gb_Helper_execute,javamaker -BUCR -O$(UIJM) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ touch $@) diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 95fe26697c9a..278e6c12f67c 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -50,19 +50,19 @@ wf_GEN_doctok_Resources_cxx := $(WFSG)/resources.cxx $(wf_GEN_doctok_SprmIds_hxx) : $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model) | $(WFSG)/doctok/.dir $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)) > $@ $(wf_GEN_doctok_ResourceIds_hxx) : $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model) | $(WFSG)/doctok/.dir $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)) > $@ $(wf_GEN_doctok_Resources_hxx) : $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model) | $(WFSG)/doctok/.dir $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)) > $@ $(wf_GEN_doctok_Resources_cxx) : $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl) | $(WFSG)/doctok/.dir $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model)) > $@ # ooxml @@ -102,48 +102,48 @@ $(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tm $(wf_GEN_ooxml_FastTokens_hxx) : $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)) > $@ $(wf_GEN_ooxml_Factory_hxx) : $(WFDIR)ooxml/factoryinc.xsl $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@ $(wf_GEN_ooxml_Factory_cxx) : $(WFDIR)ooxml/factoryimpl.xsl $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@ $(WFSG)/OOXMLFactory%.cxx : $(WFDIR)ooxml/factoryimpl_ns.xsl $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@ $(WFSG)/OOXMLFactory%.hxx : $(WFDIR)ooxml/factory_ns.xsl $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@ $(wf_GEN_ooxml_FactoryValues_hxx) : $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ $(wf_GEN_ooxml_FactoryValues_cxx) : $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ $(wf_GEN_ooxml_ResourceIds_hxx) : $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed) | $(WFSG)/ooxml/.dir $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ $(wf_GEN_ooxml_NamespaceIds_hxx) : $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ $(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_token_xml) $(call gb_Output_announce,$@,build,GPF,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_token_xml)) \ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_token_xml)) \ | tr -d '\r' | $(GPERF) -I -t -E -S1 -c -G -LC++ > $@ $(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $^) > $@ # rtftok @@ -173,11 +173,11 @@ wf_GEN_ooxml_preprocess_xsl=$(WFSG)/modelpreprocess.xsl $(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ $(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) > $@ $(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrheader $(WFDIR)resourcemodel/qnametostrfooter $(wf_SRC_ooxml_FactoryTools_xsl) $(wf_SRC_doctok_ResourceTools_xsl) $(call gb_Output_announce,$@,build,CAT,1) @@ -185,7 +185,7 @@ $(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_Q $(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) > $@ $(wf_GEN_model_SprmCodeToStr_cxx): $(WFDIR)resourcemodel/sprmcodetostrheader $(wf_GEN_model_SprmCodeToStr_tmp) $(WFDIR)resourcemodel/sprmcodetostrfooter $(call gb_Output_announce,$@,build,CAT,1) @@ -201,7 +201,7 @@ $(wf_GEN_ooxml_preprocess_xsl) : $(wf_SRC_ooxml_Preprocess_xsl) $(wf_GEN_ooxml_Model_processed) : $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_GEN_ooxml_preprocess_xsl) $(wf_SRC_ooxml_Model) $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_SRC_ooxml_Model)) > $@ + $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_SRC_ooxml_Model)) > $@ # all |