equal
deleted
inserted
replaced
112 # Further defaults are platform and arch specific |
112 # Further defaults are platform and arch specific |
113 endif |
113 endif |
114 endif |
114 endif |
115 |
115 |
116 # hotspot version definitions |
116 # hotspot version definitions |
117 include $(GAMMADIR)/make/hotspot_version |
117 include $(GAMMADIR)/make/jdk_version |
118 |
118 |
119 # Java versions needed |
119 # Java versions needed |
120 ifeq ($(PREVIOUS_JDK_VERSION),) |
120 ifeq ($(PREVIOUS_JDK_VERSION),) |
121 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION) |
121 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION) |
122 endif |
122 endif |
126 ifeq ($(JDK_MINOR_VERSION),) |
126 ifeq ($(JDK_MINOR_VERSION),) |
127 JDK_MINOR_VERSION=$(JDK_MINOR_VER) |
127 JDK_MINOR_VERSION=$(JDK_MINOR_VER) |
128 endif |
128 endif |
129 ifeq ($(JDK_MICRO_VERSION),) |
129 ifeq ($(JDK_MICRO_VERSION),) |
130 JDK_MICRO_VERSION=$(JDK_MICRO_VER) |
130 JDK_MICRO_VERSION=$(JDK_MICRO_VER) |
|
131 endif |
|
132 ifeq ($(JDK_BUILD_NUMBER),) |
|
133 JDK_BUILD_NUMBER=0 |
131 endif |
134 endif |
132 ifeq ($(JDK_MKTG_VERSION),) |
135 ifeq ($(JDK_MKTG_VERSION),) |
133 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) |
136 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) |
134 endif |
137 endif |
135 ifeq ($(JDK_VERSION),) |
138 ifeq ($(JDK_VERSION),) |
144 ifndef JRE_RELEASE_VERSION |
147 ifndef JRE_RELEASE_VERSION |
145 JRE_RELEASE_VERSION=$(FULL_VERSION) |
148 JRE_RELEASE_VERSION=$(FULL_VERSION) |
146 endif |
149 endif |
147 |
150 |
148 ifndef HOTSPOT_RELEASE_VERSION |
151 ifndef HOTSPOT_RELEASE_VERSION |
149 HOTSPOT_RELEASE_VERSION=$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER) |
152 HOTSPOT_RELEASE_VERSION=$(FULL_VERSION) |
150 endif |
153 endif |
151 |
154 |
152 ifdef HOTSPOT_BUILD_VERSION |
155 ifdef HOTSPOT_BUILD_VERSION |
153 # specified in command line |
156 # specified in command line |
154 else |
157 else |
323 # Required make macro settings for all platforms |
326 # Required make macro settings for all platforms |
324 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
327 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
325 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |
328 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |
326 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) |
329 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) |
327 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) |
330 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) |
328 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) |
|
329 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
331 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
330 |
332 |
331 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile |
333 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile |
332 # to overwrite the default definition since OS specific Makefile also |
334 # to overwrite the default definition since OS specific Makefile also |
333 # includes this make/defs.make file. |
335 # includes this make/defs.make file. |