equal
deleted
inserted
replaced
226 else |
226 else |
227 RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE) |
227 RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE) |
228 endif |
228 endif |
229 |
229 |
230 # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set |
230 # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set |
231 ifdef BUILD_NUMBER |
231 ifndef FULL_VERSION |
232 FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER) |
232 ifdef BUILD_NUMBER |
233 else |
233 FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER) |
234 BUILD_NUMBER = b00 |
234 else |
235 USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`) |
235 BUILD_NUMBER = b00 |
236 FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) |
236 USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`) |
|
237 FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) |
|
238 endif |
|
239 export FULL_VERSION |
237 endif |
240 endif |
238 |
241 |
239 # Promoted build location |
242 # Promoted build location |
240 PROMOTED_RE_AREA = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted |
243 PROMOTED_RE_AREA = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted |
241 PROMOTED_BUILD_LATEST = latest |
244 PROMOTED_BUILD_LATEST = latest |