120 endif |
120 endif |
121 |
121 |
122 # hotspot version definitions |
122 # hotspot version definitions |
123 include $(GAMMADIR)/make/jdk_version |
123 include $(GAMMADIR)/make/jdk_version |
124 |
124 |
|
125 # JDK_PREVIOUS_VERSION is only needed to facilitate standalone builds |
|
126 ifeq ($(JDK_PREVIOUS_VERSION),) |
|
127 JDK_PREVIOUS_VERSION=$(STANDALONE_JDK_PREVIOUS_VERSION) |
|
128 endif |
125 # Java versions needed |
129 # Java versions needed |
126 ifeq ($(PREVIOUS_JDK_VERSION),) |
130 ifeq ($(VERSION_MAJOR),) |
127 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION) |
131 VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER) |
128 endif |
132 endif |
129 ifeq ($(JDK_MAJOR_VERSION),) |
133 ifeq ($(VERSION_MINOR),) |
130 JDK_MAJOR_VERSION=$(JDK_MAJOR_VER) |
134 VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER) |
131 endif |
135 endif |
132 ifeq ($(JDK_MINOR_VERSION),) |
136 ifeq ($(VERSION_SECURITY),) |
133 JDK_MINOR_VERSION=$(JDK_MINOR_VER) |
137 VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER) |
134 endif |
138 endif |
135 ifeq ($(JDK_MICRO_VERSION),) |
139 ifeq ($(VERSION_PATCH),) |
136 JDK_MICRO_VERSION=$(JDK_MICRO_VER) |
140 VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER) |
137 endif |
141 endif |
138 ifeq ($(JDK_BUILD_NUMBER),) |
142 ifeq ($(VERSION_BUILD),) |
139 JDK_BUILD_NUMBER=0 |
143 VERSION_BUILD=0 |
140 endif |
144 endif |
141 ifeq ($(JDK_MKTG_VERSION),) |
145 ifeq ($(VERSION_SHORT),) |
142 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) |
146 VERSION_SHORT=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY) |
143 endif |
147 endif |
144 ifeq ($(JDK_VERSION),) |
148 ifeq ($(VERSION_STRING),) |
145 ifeq ($(BUILD_FLAVOR), product) |
149 # Note that this is an extremely rough and incorrect approximation of a correct version string. |
146 JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) |
150 VERSION_STRING=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY)-internal |
147 else |
151 endif |
148 JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)-$(BUILD_FLAVOR) |
152 |
149 endif |
153 ifneq ($(HOTSPOT_RELEASE_VERSION),) |
150 endif |
154 # Allow old command-line overrides |
151 ifeq ($(FULL_VERSION),) |
155 HOTSPOT_VERSION_STRING := $(HOTSPOT_RELEASE_VERSION) |
152 FULL_VERSION="$(JDK_VERSION)" |
|
153 endif |
|
154 |
|
155 # FULL_VERSION is only used to define JRE_RELEASE_VERSION which is used |
|
156 # as JRE version in VM -Xinternalversion output. |
|
157 ifndef JRE_RELEASE_VERSION |
|
158 JRE_RELEASE_VERSION=$(FULL_VERSION) |
|
159 endif |
|
160 |
|
161 ifndef HOTSPOT_RELEASE_VERSION |
|
162 HOTSPOT_RELEASE_VERSION=$(FULL_VERSION) |
|
163 endif |
|
164 |
|
165 ifdef HOTSPOT_BUILD_VERSION |
|
166 # specified in command line |
|
167 else |
156 else |
168 ifdef COOKED_BUILD_NUMBER |
157 # Normally get from surrounding JDK build |
169 # JRE build |
158 HOTSPOT_VERSION_STRING := $(VERSION_STRING) |
170 HOTSPOT_BUILD_VERSION= |
159 endif |
171 else |
160 |
172 ifdef USER_RELEASE_SUFFIX |
161 ifneq ($(HOTSPOT_BUILD_VERSION),) |
173 HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX) |
162 # If old command-lines variable exists, append to version string |
174 else |
163 HOTSPOT_VERSION_STRING := $(HOTSPOT_VERSION_STRING)-$(HOTSPOT_BUILD_VERSION) |
175 HOTSPOT_BUILD_VERSION=internal |
164 else |
176 endif |
165 ifeq ($(SPEC),) |
|
166 # If building standalone, add -internal. |
|
167 HOTSPOT_VERSION_STRING := $(HOTSPOT_VERSION_STRING)-internal |
177 endif |
168 endif |
178 endif |
169 endif |
179 |
170 |
180 # Windows should have OS predefined |
171 # Windows should have OS predefined |
181 ifeq ($(OS),) |
172 ifeq ($(OS),) |
231 ifneq ($(ALT_OUTPUTDIR),) |
222 ifneq ($(ALT_OUTPUTDIR),) |
232 OUTPUTDIR=$(ALT_OUTPUTDIR) |
223 OUTPUTDIR=$(ALT_OUTPUTDIR) |
233 endif |
224 endif |
234 |
225 |
235 # Find latest promoted JDK area |
226 # Find latest promoted JDK area |
236 JDK_IMPORT_PATH=$(SLASH_JAVA)/re/j2se/$(JDK_VERSION)/promoted/latest/binaries/$(PLATFORM) |
227 JDK_IMPORT_PATH=$(SLASH_JAVA)/re/j2se/$(VERSION_STRING)/promoted/latest/binaries/$(PLATFORM) |
237 ifneq ($(ALT_JDK_IMPORT_PATH),) |
228 ifneq ($(ALT_JDK_IMPORT_PATH),) |
238 JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH) |
229 JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH) |
239 endif |
230 endif |
240 |
231 |
241 # Other parts of JDK build may require an import JDK that can be executed |
232 # Other parts of JDK build may require an import JDK that can be executed |
244 ifneq ($(ALT_JDK_TARGET_IMPORT_PATH),) |
235 ifneq ($(ALT_JDK_TARGET_IMPORT_PATH),) |
245 JDK_IMPORT_PATH=$(ALT_JDK_TARGET_IMPORT_PATH) |
236 JDK_IMPORT_PATH=$(ALT_JDK_TARGET_IMPORT_PATH) |
246 endif |
237 endif |
247 |
238 |
248 # Find JDK used for javac compiles |
239 # Find JDK used for javac compiles |
249 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM) |
240 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(JDK_PREVIOUS_VERSION)/latest/binaries/$(PLATFORM) |
250 ifneq ($(ALT_BOOTDIR),) |
241 ifneq ($(ALT_BOOTDIR),) |
251 BOOTDIR=$(ALT_BOOTDIR) |
242 BOOTDIR=$(ALT_BOOTDIR) |
252 endif |
243 endif |
253 |
244 |
254 # Select name of the export directory and honor ALT overrides |
245 # Select name of the export directory and honor ALT overrides |
335 # Required make macro settings for all platforms |
326 # Required make macro settings for all platforms |
336 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
327 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
337 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |
328 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |
338 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) |
329 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) |
339 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) |
330 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) |
340 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
331 MAKE_ARGS += VERSION_STRING=$(VERSION_STRING) |
341 |
|
342 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile |
|
343 # to overwrite the default definition since OS specific Makefile also |
|
344 # includes this make/defs.make file. |
|
345 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) |
|
346 |
332 |
347 MAKE_ARGS += BOOT_JDK_SOURCETARGET="$(BOOT_JDK_SOURCETARGET)" |
333 MAKE_ARGS += BOOT_JDK_SOURCETARGET="$(BOOT_JDK_SOURCETARGET)" |
348 |
334 |
349 # Various export sub directories |
335 # Various export sub directories |
350 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include |
336 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include |