Mercurial > hg > truffle
diff make/defs.make @ 1977:c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
Reviewed-by: jcoomes, dholmes, andrew, kvn
author | ohair |
---|---|
date | Tue, 30 Nov 2010 18:07:18 -0800 |
parents | 126ea7725993 |
children | b76d12f4ab2d |
line wrap: on
line diff
--- a/make/defs.make Thu Nov 04 15:54:20 2010 -0700 +++ b/make/defs.make Tue Nov 30 18:07:18 2010 -0800 @@ -101,15 +101,14 @@ endif ifdef HOTSPOT_BUILD_VERSION -# specified in command line (PRT build) +# specified in command line else - ifdef JPRT_BUILD_VERSION -# JPR build - HOTSPOT_BUILD_VERSION=$(JPRT_BUILD_VERSION) + ifdef COOKED_BUILD_NUMBER +# JRE build + HOTSPOT_BUILD_VERSION= else - ifdef COOKED_BUILD_NUMBER -# JRE build - HOTSPOT_BUILD_VERSION= + ifdef USER_RELEASE_SUFFIX + HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX) else HOTSPOT_BUILD_VERSION=internal endif