From 101d88a6550f25f42e4f7b96307da9f29106db34 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Fri, 11 May 2012 08:21:30 -0700 Subject: [PATCH 1/2] 7168208: Change use of @ in one sed command involving paths to different character Reviewed-by: ohair --- jdk/make/common/Release.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index d8ec1b713d7..6143e261774 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -1311,8 +1311,8 @@ $(TEMP_PREV_JDK_COMPARISON): install-previous-jdk $(DIRDIFF_JARFILE) @$(java-vm-cleanup) # Clean up names in the messages printed out -CAT_FILTER = $(SED) -e "s@$(JDK_IMAGE_DIR)@JDK_IMAGE@g" \ - -e "s@$(JRE_IMAGE_DIR)@JRE_IMAGE@g" +CAT_FILTER = $(SED) -e "s|$(JDK_IMAGE_DIR)|JDK_IMAGE|g" \ + -e "s|$(JRE_IMAGE_DIR)|JRE_IMAGE|g" # Report on the jre image comparison compare-image-jre: $(TEMP_PREV_JRE_COMPARISON) From 9b0ee815d46f08fb5dd30f67e23580f1fe028891 Mon Sep 17 00:00:00 2001 From: Michael Fang Date: Tue, 15 May 2012 11:46:41 -0700 Subject: [PATCH 2/2] 7157855: jvisualvm.1 not included in binaries Reviewed-by: katleman, thurka --- jdk/make/common/Release.gmk | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index 6143e261774..4d8ddb1a6c7 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -156,6 +156,7 @@ JDK_MAN_PAGES = \ jstack.1 \ jstat.1 \ jstatd.1 \ + jvisualvm.1 \ native2ascii.1 \ rmic.1 \ schemagen.1 \