add function for converting path to URL

sdext/CppunitTest_pdfimport.mk

@@ -28,7 +28,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,sdext_pdfimport))
 
 $(eval $(call gb_CppunitTest_add_defs,sdext_pdfimport,\
-    -DPDFIMPORT_EXECUTABLE_LOCATION=\"$(call gb_CppunitTarget__make_url,\
+    -DPDFIMPORT_EXECUTABLE_LOCATION=\"$(call gb_Helper_make_url,\
         $(dir $(call gb_Executable_get_target,xpdfimport)))\" \
 ))
 

solenv/gbuild/CppunitTest.mk

@@ -57,20 +57,17 @@ endif
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
 
-# TODO: move this to platform under suitable name
-gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(strip $(1))
-
 define gb_CppunitTest__make_args
 --headless \
 $(if $(strip $(CONFIGURATION_LAYERS)),\
 	"-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
 $(if $(strip $(UNO_TYPES)),\
-	"-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_CppunitTarget__make_url,$(item)))") \
+	"-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \
 $(if $(strip $(UNO_SERVICES)),\
-	"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_CppunitTarget__make_url,$(item)))") \
+	"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \
 $(if $(URE),\
 	$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
-		-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))) \
+		-env:$(dir)=$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \
 	--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \
 $(ARGS)
 endef
@@ -278,7 +275,7 @@ endef
 gb_ComponentTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
 
 define gb_CppunitTest__use_configuration
-$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_CppunitTarget__make_url,$(3))
+$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_Helper_make_url,$(3))
 
 endef
 

solenv/gbuild/platform/WNT_INTEL_GCC.mk

@@ -142,6 +142,11 @@ define gb_Helper_native_path
 $(1)
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file://$(strip $(1))
+endef
+
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).s

solenv/gbuild/platform/WNT_INTEL_MSC.mk

@@ -267,6 +267,11 @@ define gb_Helper_native_path
 $(shell cygpath -m $(1))
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file:///$(strip $(1))
+endef
+
 # YaccTarget class
 
 define gb_YaccTarget__command

solenv/gbuild/platform/com_GCC_defs.mk

@@ -176,6 +176,11 @@ define gb_Helper_native_path
 $(1)
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file://$(strip $(1))
+endef
+
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
 

solenv/gbuild/platform/solaris.mk

@@ -164,6 +164,11 @@ define gb_Helper_native_path
 $(1)
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file://$(strip $(1))
+endef
+
 ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
 gb_LinkTarget_LDFLAGS += \
 	-Wl,--dynamic-list-cpp-new \