WebSVN – DevTools – Diff – /core_devl/trunk/CFG/RULES.STD

 #.. Generic Copy/Remove the specified file
+#
 #   Usage:      $(call CopyFile,Text,dest,file,path,fmode)
 #               $(call UncopyFile,Text,file)
+#
+#		Note: dest, file and path
+#		    may have spaces in them
+#		    These will have been escaped with a'\' which will
+#		    need to be removed.
+#
+#		    May have '$' in themwhich we will need to escape
+#
 define CopyFile
-	@(echo ------ $1 "$2"; \
+	@(dest="$(subst \$(space),$(space),$(subst $$,\$$,$(2)))"; \
-        dest=$(subst $$,\$$,$(2)); file=$(subst $$,\$$,$(3)); path=$(4); fmode=$(5); \
+        file="$(subst \$(space),$(space),$(subst $$,\$$,$(3)))"; \
+        path="$(subst \$(space),$(space),$(subst $$,\$$,$(4)))"; \
+        fmode="$(5)"; \
+	echo ------ "$1 $$dest"; \
         if [ ! -f "$$file" ] ; then echo "$1 source file not found: $$file" ; exit 1; fi;\
 	if [ ! -d "$$path" ] ; then $(mkdir) -p "$$path"; fi; \
 	if [ -f "$$dest" -a ! -w "$$dest" ]; then $(chmod) -f +w "$$dest"; fi; \
 	$(rm) -f "$$dest"; \
         $(cp) "$$file" "$$dest" ;\
         if [ ! -f "$$dest" ] ; then echo "$1 file not found after copy: $$dest" ; exit 1; fi; \
         );
 endef
 define UncopyFile
-	@(echo ------ $1 "$2"; \
+	@(file="$(subst \$(space),$(space),$(subst $$,\$$,$(2)))"; \
-        file=$(subst $$,\$$,$2); \
+        echo ------ $1 "$$file"; \
 	if [ -f "$$file" ]; then \
 		if [ ! -w "$$file" ]; then $(chmod) -f +w "$$file"; fi; \
 		$(rm) -f "$$file"; \
 	fi);
 endef
 ##

Subversion Repositories DevTools