gbuild: remove gb_Helper_abbreviate_dirs_native

Change-Id: I0a3ad6553692fc21eaf96cf35e9c343b4d716c21

17 files changed, 37 insertions, 37 deletions

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) \