changeset 5023:e3478500d252

Merge
author lana
date Fri, 18 May 2012 15:15:38 -0700
parents e15839c985d1 18a1b4f0681a
children d75496a7c71b
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri May 18 14:22:43 2012 -0700
+++ b/.hgtags	Fri May 18 15:15:38 2012 -0700
@@ -172,3 +172,6 @@
 26243ee3de2ec24bc616b2e002b2ef22429e7129 jdk7u6-b05
 bdba5717e827fe1944f7474bfafe29a21f024a0b jdk7u6-b06
 37fe62ce49ccb748df9cdc681f1f30f61778ccc9 jdk7u6-b07
+a5949f7b86939e97a8c44b9a0cea2c51602d271f jdk7u6-b08
+9e4fcaae817566977095c7beb72e2523e924a9d1 jdk7u6-b09
+a2bd61800667c38d759a0e02a756063d47dbcdc0 jdk7u6-b10
--- a/make/common/Release-macosx.gmk	Fri May 18 14:22:43 2012 -0700
+++ b/make/common/Release-macosx.gmk	Fri May 18 15:15:38 2012 -0700
@@ -29,8 +29,8 @@
 
 # Defines the release targets for Mac OS X build products
 
-JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/$(THIS_JDK_VERSION).jdk/Contents
-JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/$(THIS_JDK_VERSION).jre/Contents
+JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
+JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents
 
 MACOSX_SRC	 = $(JDK_TOPDIR)/src/macosx