Mercurial > hg > truffle

comparison make/defs.make @ 1977:c7db7adb83b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1859:62aa74bafa73 1977:c7db7adb83b4
99 ifndef HOTSPOT_RELEASE_VERSION 99 ifndef HOTSPOT_RELEASE_VERSION
100 HOTSPOT_RELEASE_VERSION=$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER) 100 HOTSPOT_RELEASE_VERSION=$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)
101 endif 101 endif
102 102
103 ifdef HOTSPOT_BUILD_VERSION 103 ifdef HOTSPOT_BUILD_VERSION
104 # specified in command line (PRT build) 104 # specified in command line
105 else 105 else
106 ifdef JPRT_BUILD_VERSION 106 ifdef COOKED_BUILD_NUMBER
107 # JPR build 107 # JRE build
108 HOTSPOT_BUILD_VERSION=$(JPRT_BUILD_VERSION) 108 HOTSPOT_BUILD_VERSION=
109 else 109 else
110 ifdef COOKED_BUILD_NUMBER 110 ifdef USER_RELEASE_SUFFIX
111 # JRE build 111 HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX)
112 HOTSPOT_BUILD_VERSION=
113 else 112 else
114 HOTSPOT_BUILD_VERSION=internal 113 HOTSPOT_BUILD_VERSION=internal
115 endif 114 endif
116 endif 115 endif
117 endif 116 endif