Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6380:4f121e8c7e4b
8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00
Reviewed-by: dholmes, ihse
author | erikj |
---|---|
date | Thu, 19 Sep 2013 13:32:42 +0200 |
parents | 728bfc6b1979 |
children | ba78cf016157 |
files | make/common/shared/Defs.gmk |
diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs.gmk Fri Sep 13 19:19:55 2013 +0400 +++ b/make/common/shared/Defs.gmk Thu Sep 19 13:32:42 2013 +0200 @@ -296,10 +296,8 @@ RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE) endif -# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set -ifdef BUILD_NUMBER - FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER) -else +# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set +ifndef BUILD_NUMBER BUILD_NUMBER = b00 ifndef USER_RELEASE_SUFFIX BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M') @@ -307,10 +305,16 @@ USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' ) endif export USER_RELEASE_SUFFIX +endif + +# FULL_VERSION is RELEASE and BUILD_NUMBER if USER_RELEASE_SUFFIX is not set +ifndef USER_RELEASE_SUFFIX + FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER) +else FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) endif -# Promoted build location +># Promoted build location PROMOTED_RE_AREA = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted PROMOTED_BUILD_LATEST = latest PROMOTED_BUILD_BASEDIR = $(PROMOTED_RE_AREA)/$(PROMOTED_BUILD_LATEST)