Mercurial > hg > openjdk > jdk9
changeset 2318:8d337fd6333e jdk-9+144
8160491: tar.gz bundles missing files containing $
Reviewed-by: ihse
author | erikj |
---|---|
date | Mon, 07 Nov 2016 14:15:49 +0100 |
parents | 9ae47deec185 |
children | 7493bf3d3459 2a1f97c0ad3d |
files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh make/Bundles.gmk make/Images.gmk make/common/MakeBase.gmk test/make/TestJavaCompilation.gmk test/make/TestMakeBase.gmk |
diffstat | 7 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Mon Nov 07 13:25:18 2016 +0100 +++ b/common/autoconf/flags.m4 Mon Nov 07 14:15:49 2016 +0100 @@ -280,7 +280,7 @@ else # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' @@ -305,7 +305,7 @@ # Default works for linux, might work on other platforms as well. PICFLAG='-fPIC' SHARED_LIBRARY_FLAGS='-shared' - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' @@ -315,7 +315,7 @@ C_FLAG_REORDER='-xF' CXX_FLAG_REORDER='-xF' SHARED_LIBRARY_FLAGS="-G" - SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN[$]1' + SET_EXECUTABLE_ORIGIN='-R\$$ORIGIN[$]1' SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-h [$]1' SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
--- a/common/autoconf/generated-configure.sh Mon Nov 07 13:25:18 2016 +0100 +++ b/common/autoconf/generated-configure.sh Mon Nov 07 14:15:49 2016 +0100 @@ -5093,7 +5093,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1478079760 +DATE_WHEN_GENERATED=1478524503 ############################################################################### # @@ -49070,7 +49070,7 @@ else # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$$$ORIGIN$1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN$1' SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-soname=$1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=$1' @@ -49095,7 +49095,7 @@ # Default works for linux, might work on other platforms as well. PICFLAG='-fPIC' SHARED_LIBRARY_FLAGS='-shared' - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$$$ORIGIN$1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN$1' SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-soname=$1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=$1' @@ -49105,7 +49105,7 @@ C_FLAG_REORDER='-xF' CXX_FLAG_REORDER='-xF' SHARED_LIBRARY_FLAGS="-G" - SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1' + SET_EXECUTABLE_ORIGIN='-R\$$ORIGIN$1' SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-h $1' SET_SHARED_LIBRARY_MAPFILE='-M$1'
--- a/make/Bundles.gmk Mon Nov 07 13:25:18 2016 +0100 +++ b/make/Bundles.gmk Mon Nov 07 14:15:49 2016 +0100 @@ -256,7 +256,7 @@ $(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \ BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \ - FILES := $(call DoubleDollar, $(DEMOS_BUNDLE_FILES)), \ + FILES := $(DEMOS_BUNDLE_FILES), \ BASE_DIR := $(JDK_IMAGE_DIR), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \ )) @@ -271,7 +271,7 @@ $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ - FILES := $(call DoubleDollar, $(TEST_BUNDLE_FILES)), \ + FILES := $(TEST_BUNDLE_FILES), \ BASE_DIR := $(TEST_IMAGE_DIR), \ ))
--- a/make/Images.gmk Mon Nov 07 13:25:18 2016 +0100 +++ b/make/Images.gmk Mon Nov 07 14:15:49 2016 +0100 @@ -366,9 +366,9 @@ DEMO_FILES := \ $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \ - $(call DoubleDollar, $(call DoubleDollar, \ + $(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)
--- a/make/common/MakeBase.gmk Mon Nov 07 13:25:18 2016 +0100 +++ b/make/common/MakeBase.gmk Mon Nov 07 14:15:49 2016 +0100 @@ -454,7 +454,7 @@ Too many named arguments to macro, please update MAX_PARAMS in MakeBase.gmk)) # Iterate over 2 3 4... and evaluate the named parameters with $1_ as prefix $(foreach i,$(PARAM_SEQUENCE), $(if $(strip $($i)),\ - $(strip $1)_$(strip $($i)))$(NEWLINE)) + $(strip $1)_$(strip $(call DoubleDollar, $($i))))$(NEWLINE)) # Debug print all named parameter names and values $(if $(findstring $(LOG_LEVEL),debug trace), \ $(info $0 $(strip $1) $(foreach i,$(PARAM_SEQUENCE), \
--- a/test/make/TestJavaCompilation.gmk Mon Nov 07 13:25:18 2016 +0100 +++ b/test/make/TestJavaCompilation.gmk Mon Nov 07 14:15:49 2016 +0100 @@ -202,9 +202,9 @@ DEPENDENCIES := $(OUTPUT_DIR)/_jar3_created, \ SRCS := $(JAR3_SRC_ROOT1) $(JAR3_SRC_ROOT2), \ EXTRA_FILES := extra-file \ - dir2/file$$$$foo.dollar \ + dir2/file$$foo.dollar \ $(JAR3_SRC_ROOT2)/extra-file-abs, \ - EXCLUDE_FILES := dir1/file1$$$$foo.class, \ + EXCLUDE_FILES := dir1/file1$$foo.class, \ JAR := $(JAR3_FILE), \ ))
--- a/test/make/TestMakeBase.gmk Mon Nov 07 13:25:18 2016 +0100 +++ b/test/make/TestMakeBase.gmk Mon Nov 07 14:15:49 2016 +0100 @@ -209,9 +209,9 @@ test ! -e $(VARDEP_FLAG_FILE) # # Test including some problematic characters - $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR='value4 \$$$$ORIGIN' $(VARDEP_TARGET_FILE) + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR='value4 \$$ORIGIN' $(VARDEP_TARGET_FILE) $(RM) $(VARDEP_FLAG_FILE) - $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR='value4 \$$$$ORIGIN' $(VARDEP_TARGET_FILE) + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR='value4 \$$ORIGIN' $(VARDEP_TARGET_FILE) test ! -e $(VARDEP_FLAG_FILE) # Test specifying a specific value file to store variable in