OpenJDK / jdk / jdk
changeset 7403:56d379ba4a3c
Merge
| author | ohair |
|---|---|
| date | Tue, 30 Nov 2010 18:10:20 -0800 |
| parents | ebde7415b521 554c8ae9c3e0 |
| children | 880f771f1781 |
| files | hotspot/make/linux/makefiles/buildtree.make hotspot/make/solaris/makefiles/buildtree.make hotspot/make/windows/projectfiles/common/Makefile |
| diffstat | 5 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/make/defs.make Mon Nov 29 15:43:36 2010 -0500 +++ b/hotspot/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
--- a/hotspot/make/jprt.gmk Mon Nov 29 15:43:36 2010 -0500 +++ b/hotspot/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
--- a/hotspot/make/linux/makefiles/buildtree.make Mon Nov 29 15:43:36 2010 -0500 +++ b/hotspot/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
--- a/hotspot/make/solaris/makefiles/buildtree.make Mon Nov 29 15:43:36 2010 -0500 +++ b/hotspot/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
--- a/hotspot/make/windows/projectfiles/common/Makefile Mon Nov 29 15:43:36 2010 -0500 +++ b/hotspot/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