# HG changeset patch
# User erikj
# Date 1508247969 -7200
# Node ID e8bda13da40b87372f08983f69edb7df5615d93f
# Parent  a6d4932d582ecd9d9c1a7ed16781aee3af7a5acd
8189434: SetupCopyFiles does not handle files with $ in them
Reviewed-by: ihse

diff -r a6d4932d582e -r e8bda13da40b make/CompileDemos.gmk
--- a/make/CompileDemos.gmk	Mon Jun 26 17:00:45 2017 +0200
+++ b/make/CompileDemos.gmk	Tue Oct 17 15:46:09 2017 +0200
@@ -299,7 +299,7 @@
   $(eval $(call SetupCopyFiles, COPY_TO_TEST_IMAGE, \
       SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
       DEST := $(TEST_IMAGE_DIR)/jdk/demos, \
-      FILES := $(call DoubleDollar, $(call CacheFind, $(SUPPORT_OUTPUTDIR)/demos/image)), \
+      FILES := $(call CacheFind, $(SUPPORT_OUTPUTDIR)/demos/image), \
   ))
 
   IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)
diff -r a6d4932d582e -r e8bda13da40b make/Images.gmk
--- a/make/Images.gmk	Mon Jun 26 17:00:45 2017 +0200
+++ b/make/Images.gmk	Tue Oct 17 15:46:09 2017 +0200
@@ -324,9 +324,8 @@
 
   DEMO_FILES := \
       $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
-        $(call DoubleDollar, \
         $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
-            -type f -a ! \( -name "_the*" -o -name "javac_state" \) )) \
+            -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \
       )
 
   ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
diff -r a6d4932d582e -r e8bda13da40b make/common/MakeBase.gmk
--- a/make/common/MakeBase.gmk	Mon Jun 26 17:00:45 2017 +0200
+++ b/make/common/MakeBase.gmk	Tue Oct 17 15:46:09 2017 +0200
@@ -781,10 +781,19 @@
   $1_SRC := $$(patsubst %/,%,$$($1_SRC))
   $1_DEST := $$(patsubst %/,%,$$($1_DEST))
 
+  # Need to wrap arguments in DoubleDollar because of the eval nested inside an
+  # eval macro body.
   $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
-      $$(eval $$(call AddFileToCopy, $$($1_SRC)/$$f, \
-      $$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)), \
-      $1, $$($1_MACRO), $$($1_LOG_ACTION))))
+    $$(eval $$(call AddFileToCopy, \
+        $$(call DoubleDollar, $$($1_SRC)/$$f), \
+        $$(call DoubleDollar, \
+            $$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)) \
+        ), \
+        $1, \
+        $$($1_MACRO), \
+        $$($1_LOG_ACTION) \
+    )) \
+  )
 
 endef