# HG changeset patch
# User ohair
# Date 1291169420 28800
# Node ID 2ca799d83d3c023892acdfb3466e86b82eaebff7
# Parent  0fc262af204ff29ed9c6638c01585360b188ba2c# Parent  c7db7adb83b4de2b82cee4bc0e34bc63154a3f21
Merge

diff -r 0fc262af204f -r 2ca799d83d3c make/defs.make
--- a/make/defs.make	Mon Nov 29 15:43:36 2010 -0500
+++ b/make/defs.make	Tue Nov 30 18:10:20 2010 -0800
@@ -101,15 +101,14 @@
 endif
 
 ifdef HOTSPOT_BUILD_VERSION
-# specified in command line (PRT build)
+# specified in command line
 else
-  ifdef JPRT_BUILD_VERSION
-# JPR build
-    HOTSPOT_BUILD_VERSION=$(JPRT_BUILD_VERSION)
+  ifdef COOKED_BUILD_NUMBER
+# JRE build
+    HOTSPOT_BUILD_VERSION=
   else
-    ifdef COOKED_BUILD_NUMBER
-# JRE build
-      HOTSPOT_BUILD_VERSION=
+    ifdef USER_RELEASE_SUFFIX
+      HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX)
     else
       HOTSPOT_BUILD_VERSION=internal
     endif
diff -r 0fc262af204f -r 2ca799d83d3c make/jprt.gmk
--- a/make/jprt.gmk	Mon Nov 29 15:43:36 2010 -0500
+++ b/make/jprt.gmk	Tue Nov 30 18:10:20 2010 -0800
@@ -25,9 +25,6 @@
 # JPRT rule to build this workspace
 
 JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-ifdef JPRT_BUILD_VERSION
-  MILESTONE=$(JPRT_BUILD_VERSION)
-endif
 
 ifeq ($(OSNAME),windows)
   ZIPFLAGS=-q
diff -r 0fc262af204f -r 2ca799d83d3c make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make	Mon Nov 29 15:43:36 2010 -0500
+++ b/make/linux/makefiles/buildtree.make	Tue Nov 30 18:10:20 2010 -0800
@@ -37,7 +37,7 @@
 # OS_FAMILY	- operating system
 # VARIANT	- core, compiler1, compiler2, or tiered
 # HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
-# HOTSPOT_BUILD_VERSION   - internal, PRTjob ID, JPRTjob ID
+# HOTSPOT_BUILD_VERSION   - internal, internal-$(USER_RELEASE_SUFFIX) or empty
 # JRE_RELEASE_VERSION     - <major>.<minor>.<micro> (1.7.0)
 #
 # Builds the directory trees with makefiles plus some convenience files in
diff -r 0fc262af204f -r 2ca799d83d3c make/solaris/makefiles/buildtree.make
--- a/make/solaris/makefiles/buildtree.make	Mon Nov 29 15:43:36 2010 -0500
+++ b/make/solaris/makefiles/buildtree.make	Tue Nov 30 18:10:20 2010 -0800
@@ -37,7 +37,7 @@
 # OS_FAMILY	- operating system
 # VARIANT	- core, compiler1, compiler2, or tiered
 # HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
-# HOTSPOT_BUILD_VERSION   - internal, PRTjob ID, JPRTjob ID
+# HOTSPOT_BUILD_VERSION   - internal, internal-$(USER_RELEASE_SUFFIX) or empty
 # JRE_RELEASE_VERSION     - <major>.<minor>.<micro> (1.7.0)
 #
 # Builds the directory trees with makefiles plus some convenience files in
diff -r 0fc262af204f -r 2ca799d83d3c make/windows/projectfiles/common/Makefile
--- a/make/windows/projectfiles/common/Makefile	Mon Nov 29 15:43:36 2010 -0500
+++ b/make/windows/projectfiles/common/Makefile	Tue Nov 30 18:10:20 2010 -0800
@@ -65,7 +65,11 @@
 !else
 HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)"
 !endif
+!if "$(USER_RELEASE_SUFFIX)" != ""
+HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
+!else
 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
+!endif
 !if "$(HOTSPOT_BUILD_VERSION)" != ""
 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
 !endif