7128699: Fix bundle name so it contains the bugfix number in the name.
authorskovatch
Wed, 25 Apr 2012 12:18:10 -0700
changeset 12517 bf025a5bf549
parent 12387 7b5cbc36fac7
child 12518 593f1b183333
7128699: Fix bundle name so it contains the bugfix number in the name. Reviewed-by: robilad
jdk/make/common/Release-macosx.gmk
--- a/jdk/make/common/Release-macosx.gmk	Thu Apr 19 12:18:58 2012 -0700
+++ b/jdk/make/common/Release-macosx.gmk	Wed Apr 25 12:18:10 2012 -0700
@@ -29,14 +29,14 @@
 
 # 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
 
 BUNDLE_ID ?= net.java.openjdk
-BUNLDE_ID_JRE ?= $(BUNDLE_ID).jre
-BUNLDE_ID_JDK ?= $(BUNDLE_ID).jdk
+BUNDLE_ID_JRE ?= $(BUNDLE_ID).jre
+BUNDLE_ID_JDK ?= $(BUNDLE_ID).jdk
 
 BUNDLE_NAME ?= OpenJDK $(JDK_MINOR_VERSION)
 BUNDLE_NAME_JRE ?= $(BUNDLE_NAME)