diff options
| author | amurillo <none@none> | 2015-07-21 15:35:12 -0700 |
|---|---|---|
| committer | amurillo <none@none> | 2015-07-21 15:35:12 -0700 |
| commit | 060340f7d9d9979c247ad7765662dab418e4ba5d (patch) | |
| tree | ccbeb4898e2476f171c0120bd052c5cf1aef6b26 /make | |
| parent | 1394c0b943b69630fbcc3cd7ea18ae3381b0ddb3 (diff) | |
| download | jdk8u_hotspot-060340f7d9d9979c247ad7765662dab418e4ba5d.tar.gz | |
8079410: Hotspot version to share the same update and build version from JDK
Reviewed-by: dholmes, dcubed
Diffstat (limited to 'make')
| -rw-r--r-- | make/defs.make | 12 | ||||
| -rw-r--r-- | make/hotspot_version | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/make/defs.make b/make/defs.make index c70b3db7a..25c0b168e 100644 --- a/make/defs.make +++ b/make/defs.make @@ -116,6 +116,18 @@ endif # hotspot version definitions include $(GAMMADIR)/make/hotspot_version +# When config parameter --with-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 --with-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) diff --git a/make/hotspot_version b/make/hotspot_version index f64747c97..b0b82b861 100644 --- a/make/hotspot_version +++ b/make/hotspot_version @@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 HS_MINOR_VER=66 -HS_BUILD_NUMBER=03 +HS_BUILD_NUMBER=00 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 |