Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/defs.make	Thu Nov 04 15:54:20 2010 -0700
     1.2 +++ b/make/defs.make	Tue Nov 30 18:07:18 2010 -0800
     1.3 @@ -101,15 +101,14 @@
     1.4  endif
     1.5  
     1.6  ifdef HOTSPOT_BUILD_VERSION
     1.7 -# specified in command line (PRT build)
     1.8 +# specified in command line
     1.9  else
    1.10 -  ifdef JPRT_BUILD_VERSION
    1.11 -# JPR build
    1.12 -    HOTSPOT_BUILD_VERSION=$(JPRT_BUILD_VERSION)
    1.13 +  ifdef COOKED_BUILD_NUMBER
    1.14 +# JRE build
    1.15 +    HOTSPOT_BUILD_VERSION=
    1.16    else
    1.17 -    ifdef COOKED_BUILD_NUMBER
    1.18 -# JRE build
    1.19 -      HOTSPOT_BUILD_VERSION=
    1.20 +    ifdef USER_RELEASE_SUFFIX
    1.21 +      HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX)
    1.22      else
    1.23        HOTSPOT_BUILD_VERSION=internal
    1.24      endif

     2.1 --- a/make/jprt.gmk	Thu Nov 04 15:54:20 2010 -0700
     2.2 +++ b/make/jprt.gmk	Tue Nov 30 18:07:18 2010 -0800
     2.3 @@ -25,9 +25,6 @@
     2.4  # JPRT rule to build this workspace
     2.5  
     2.6  JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
     2.7 -ifdef JPRT_BUILD_VERSION
     2.8 -  MILESTONE=$(JPRT_BUILD_VERSION)
     2.9 -endif
    2.10  
    2.11  ifeq ($(OSNAME),windows)
    2.12    ZIPFLAGS=-q

     3.1 --- a/make/linux/makefiles/buildtree.make	Thu Nov 04 15:54:20 2010 -0700
     3.2 +++ b/make/linux/makefiles/buildtree.make	Tue Nov 30 18:07:18 2010 -0800
     3.3 @@ -37,7 +37,7 @@
     3.4  # OS_FAMILY	- operating system
     3.5  # VARIANT	- core, compiler1, compiler2, or tiered
     3.6  # HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
     3.7 -# HOTSPOT_BUILD_VERSION   - internal, PRTjob ID, JPRTjob ID
     3.8 +# HOTSPOT_BUILD_VERSION   - internal, internal-$(USER_RELEASE_SUFFIX) or empty
     3.9  # JRE_RELEASE_VERSION     - <major>.<minor>.<micro> (1.7.0)
    3.10  #
    3.11  # Builds the directory trees with makefiles plus some convenience files in

     4.1 --- a/make/solaris/makefiles/buildtree.make	Thu Nov 04 15:54:20 2010 -0700
     4.2 +++ b/make/solaris/makefiles/buildtree.make	Tue Nov 30 18:07:18 2010 -0800
     4.3 @@ -37,7 +37,7 @@
     4.4  # OS_FAMILY	- operating system
     4.5  # VARIANT	- core, compiler1, compiler2, or tiered
     4.6  # HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
     4.7 -# HOTSPOT_BUILD_VERSION   - internal, PRTjob ID, JPRTjob ID
     4.8 +# HOTSPOT_BUILD_VERSION   - internal, internal-$(USER_RELEASE_SUFFIX) or empty
     4.9  # JRE_RELEASE_VERSION     - <major>.<minor>.<micro> (1.7.0)
    4.10  #
    4.11  # Builds the directory trees with makefiles plus some convenience files in

     5.1 --- a/make/windows/projectfiles/common/Makefile	Thu Nov 04 15:54:20 2010 -0700
     5.2 +++ b/make/windows/projectfiles/common/Makefile	Tue Nov 30 18:07:18 2010 -0800
     5.3 @@ -108,7 +108,11 @@
     5.4  !else
     5.5  HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)"
     5.6  !endif
     5.7 +!if "$(USER_RELEASE_SUFFIX)" != ""
     5.8 +HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
     5.9 +!else
    5.10  HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
    5.11 +!endif
    5.12  !if "$(HOTSPOT_BUILD_VERSION)" != ""
    5.13  HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
    5.14  !endif