121 |
121 |
122 # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro |
122 # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro |
123 # or make/hotspot_distro. |
123 # or make/hotspot_distro. |
124 !ifndef HOTSPOT_VM_DISTRO |
124 !ifndef HOTSPOT_VM_DISTRO |
125 !if exists($(WorkSpace)\src\closed) |
125 !if exists($(WorkSpace)\src\closed) |
126 |
|
127 # if the build is for JDK6 or earlier version, it should include jdk6_hotspot_distro, |
|
128 # instead of hotspot_distro. |
|
129 JDK6_OR_EARLIER=0 |
|
130 !if "$(JDK_MAJOR_VERSION)" != "" && "$(JDK_MINOR_VERSION)" != "" && "$(JDK_MICRO_VERSION)" != "" |
|
131 !if $(JDK_MAJOR_VERSION) == 1 && $(JDK_MINOR_VERSION) < 7 |
|
132 JDK6_OR_EARLIER=1 |
|
133 !endif |
|
134 !else |
|
135 !if $(JDK_MAJOR_VER) == 1 && $(JDK_MINOR_VER) < 7 |
|
136 JDK6_OR_EARLIER=1 |
|
137 !endif |
|
138 !endif |
|
139 |
|
140 !if $(JDK6_OR_EARLIER) == 1 |
|
141 !include $(WorkSpace)\make\jdk6_hotspot_distro |
|
142 !else |
|
143 !include $(WorkSpace)\make\hotspot_distro |
126 !include $(WorkSpace)\make\hotspot_distro |
144 !endif |
|
145 !else |
127 !else |
146 !include $(WorkSpace)\make\openjdk_distro |
128 !include $(WorkSpace)\make\openjdk_distro |
147 !endif |
129 !endif |
148 !endif |
130 !endif |
149 |
|
150 # Following the Web Start / Plugin model here.... |
|
151 # We can have update versions like "01a", but Windows requires |
|
152 # we use only integers in the file version field. So: |
|
153 # JDK_UPDATE_VER = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION |
|
154 # |
|
155 JDK_UPDATE_VER=0 |
|
156 JDK_BUILD_NUMBER=0 |
|
157 |
131 |
158 HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(ARCH_TEXT) $(VARIANT_TEXT) VM |
132 HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(ARCH_TEXT) $(VARIANT_TEXT) VM |
159 |
133 |
160 # JDK ProductVersion: |
134 # JDK ProductVersion: |
161 # 1.5.0_<wx>-b<yz> will have DLL version 5.0.wx*10.yz |
135 # 1.5.0_<wx>-b<yz> will have DLL version 5.0.wx*10.yz |
162 # Thus, 1.5.0_10-b04 will be 5.0.100.4 |
136 # Thus, 1.5.0_10-b04 will be 5.0.100.4 |
163 # 1.6.0-b01 will be 6.0.0.1 |
137 # 1.6.0-b01 will be 6.0.0.1 |
164 # 1.6.0_01a-b02 will be 6.0.11.2 |
138 # 1.6.0_01a-b02 will be 6.0.11.2 |
165 # |
139 # |
166 # JDK_* variables are defined in make/jdk_version or on command line |
140 # STANDALONE_JDK_* variables are defined in make/jdk_version or on command line |
167 # |
141 # |
168 JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER) |
142 !if "$(JDK_VER)" == "" |
169 JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER) |
143 JDK_VER=$(STANDALONE_JDK_MAJOR_VER),$(STANDALONE_JDK_MINOR_VER),$(STANDALONE_JDK_SECURITY_VER),$(STANDALONE_JDK_PATCH_VER) |
170 !if "$(JRE_RELEASE_VERSION)" == "" |
144 !endif |
171 JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER) |
145 !if "$(JDK_DOTVER)" == "" |
172 !else |
146 JDK_DOTVER=$(STANDALONE_JDK_MAJOR_VER).$(STANDALONE_JDK_MINOR_VER).$(STANDALONE_JDK_SECURITY_VER).$(STANDALONE_JDK_PATCH_VER) |
173 JRE_RELEASE_VER=$(JRE_RELEASE_VERSION) |
147 !endif |
174 !endif |
148 !if "$(VERSION_SHORT)" == "" |
175 !if "$(JDK_MKTG_VERSION)" == "" |
149 VERSION_SHORT=$(STANDALONE_JDK_MAJOR_VER).$(STANDALONE_JDK_MINOR_VER).$(STANDALONE_JDK_SECURITY_VER) |
176 JDK_MKTG_VERSION=$(JDK_MINOR_VER).$(JDK_MICRO_VER) |
150 !endif |
177 !endif |
151 |
178 |
|
179 # Hotspot Express VM FileVersion: |
|
180 # 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers). |
|
181 # |
|
182 # |
|
183 HS_VER=$(JDK_VER) |
152 HS_VER=$(JDK_VER) |
184 HS_DOTVER=$(JDK_DOTVER) |
153 HS_DOTVER=$(JDK_DOTVER) |
185 |
154 |
186 !if "$(HOTSPOT_RELEASE_VERSION)" == "" |
155 !if "$(HOTSPOT_RELEASE_VERSION)" == "" |
187 HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
156 HOTSPOT_RELEASE_VERSION=$(VERSION_STRING) |
188 !endif |
157 !endif |
189 |
158 |
190 !if "$(HOTSPOT_BUILD_VERSION)" == "" |
159 !if "$(HOTSPOT_VERSION_STRING)" == "" |
191 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) |
160 HOTSPOT_VERSION_STRING=$(HOTSPOT_RELEASE_VERSION) |
192 !else |
|
193 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) |
|
194 !endif |
161 !endif |
195 |
162 |
196 # End VERSIONINFO parameters |
163 # End VERSIONINFO parameters |
197 |
164 |
198 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK |
165 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK |
278 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ |
245 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ |
279 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ |
246 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ |
280 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ |
247 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ |
281 @ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK) >> $@ |
248 @ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK) >> $@ |
282 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ |
249 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ |
283 @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@ |
250 @ echo HS_NAME=$(PRODUCT_NAME) $(VERSION_SHORT) >> $@ |
284 @ echo HS_BUILD_VER=$(HS_BUILD_VER) >> $@ |
251 @ echo HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) >> $@ |
285 @ echo BUILD_WIN_SA=$(BUILD_WIN_SA) >> $@ |
252 @ echo BUILD_WIN_SA=$(BUILD_WIN_SA) >> $@ |
286 @ echo SA_BUILD_VERSION=$(HS_BUILD_VER) >> $@ |
253 @ echo SA_BUILD_VERSION=$(HOTSPOT_VERSION_STRING) >> $@ |
287 @ echo SA_INCLUDE=$(SA_INCLUDE) >> $@ |
254 @ echo SA_INCLUDE=$(SA_INCLUDE) >> $@ |
288 @ echo SA_LIB=$(SA_LIB) >> $@ |
255 @ echo SA_LIB=$(SA_LIB) >> $@ |
289 @ echo JDK_VER=$(JDK_VER) >> $@ |
256 @ echo JDK_VER=$(JDK_VER) >> $@ |
290 @ echo JDK_DOTVER=$(JDK_DOTVER) >> $@ |
257 @ echo JDK_DOTVER=$(JDK_DOTVER) >> $@ |
291 @ echo JRE_RELEASE_VER=$(JRE_RELEASE_VER) >> $@ |
258 @ echo VERSION_STRING=$(VERSION_STRING) >> $@ |
292 @ echo BUILDARCH=$(BUILDARCH) >> $@ |
259 @ echo BUILDARCH=$(BUILDARCH) >> $@ |
293 @ echo Platform_arch=$(Platform_arch) >> $@ |
260 @ echo Platform_arch=$(Platform_arch) >> $@ |
294 @ echo Platform_arch_model=$(Platform_arch_model) >> $@ |
261 @ echo Platform_arch_model=$(Platform_arch_model) >> $@ |
295 @ echo CXX=$(CXX) >> $@ |
262 @ echo CXX=$(CXX) >> $@ |
296 @ echo LD=$(LD) >> $@ |
263 @ echo LD=$(LD) >> $@ |