Mercurial > hg > openjdk > jdk6 > hotspot

changeset 4127:2b11876adba6 jdk6-b40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8079410: Hotspot version to share the same update and build version from JDK Reviewed-by: dholmes, dcubed
author amurillo
date Fri, 12 Aug 2016 16:28:57 +0100
parents 91ddf3008907
children 1943edc6f06a
files make/defs.make make/hotspot_version
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/defs.make	Fri Aug 12 16:14:32 2016 +0100
+++ b/make/defs.make	Fri Aug 12 16:28:57 2016 +0100
@@ -67,6 +67,18 @@
 # hotspot version definitions
 include $(GAMMADIR)/make/hotspot_version
 
+# When config parameter JDK_UPDATE_VERSION is defined,
+# Hotspot minor version should be set to that
+ifneq ($(JDK_UPDATE_VERSION),)
+  HS_MINOR_VER=$(JDK_UPDATE_VERSION)
+endif
+
+# When config parameter JDK_BUILD_NUMBER is defined,
+# Hotspot build number should be set to that
+ifneq ($(JDK_BUILD_NUMBER),)
+  HS_BUILD_NUMBER=$(subst b,,$(JDK_BUILD_NUMBER))
+endif
+
 # Java versions needed
 ifeq ($(PREVIOUS_JDK_VERSION),)
   PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
--- a/make/hotspot_version	Fri Aug 12 16:14:32 2016 +0100
+++ b/make/hotspot_version	Fri Aug 12 16:28:57 2016 +0100
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=25
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=00
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=6