equal
deleted
inserted
replaced
115 ######################################################################### |
115 ######################################################################### |
116 # Parameters for VERSIONINFO resource for jvm.dll. |
116 # Parameters for VERSIONINFO resource for jvm.dll. |
117 # These can be overridden via the nmake.exe command line. |
117 # These can be overridden via the nmake.exe command line. |
118 # They are overridden by RE during the control builds. |
118 # They are overridden by RE during the control builds. |
119 # |
119 # |
120 !include "$(WorkSpace)/make/hotspot_version" |
120 !include "$(WorkSpace)/make/jdk_version" |
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) |
161 # 1.5.0_<wx>-b<yz> will have DLL version 5.0.wx*10.yz |
161 # 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 |
162 # Thus, 1.5.0_10-b04 will be 5.0.100.4 |
163 # 1.6.0-b01 will be 6.0.0.1 |
163 # 1.6.0-b01 will be 6.0.0.1 |
164 # 1.6.0_01a-b02 will be 6.0.11.2 |
164 # 1.6.0_01a-b02 will be 6.0.11.2 |
165 # |
165 # |
166 # JDK_* variables are defined in make/hotspot_version or on command line |
166 # JDK_* variables are defined in make/jdk_version or on command line |
167 # |
167 # |
168 JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER) |
168 JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER) |
169 JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER) |
169 JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER) |
170 !if "$(JRE_RELEASE_VERSION)" == "" |
170 !if "$(JRE_RELEASE_VERSION)" == "" |
171 JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER) |
171 JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER) |
177 !endif |
177 !endif |
178 |
178 |
179 # Hotspot Express VM FileVersion: |
179 # Hotspot Express VM FileVersion: |
180 # 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers). |
180 # 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers). |
181 # |
181 # |
182 # HS_* variables are defined in make/hotspot_version |
182 # |
183 # |
183 HS_VER=$(JDK_VER) |
184 HS_VER=$(HS_MAJOR_VER),$(HS_MINOR_VER),0,$(HS_BUILD_NUMBER) |
184 HS_DOTVER=$(JDK_DOTVER) |
185 HS_DOTVER=$(HS_MAJOR_VER).$(HS_MINOR_VER).0.$(HS_BUILD_NUMBER) |
|
186 |
185 |
187 !if "$(HOTSPOT_RELEASE_VERSION)" == "" |
186 !if "$(HOTSPOT_RELEASE_VERSION)" == "" |
188 HOTSPOT_RELEASE_VERSION=$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER) |
187 HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
189 !endif |
188 !endif |
190 |
189 |
191 !if "$(HOTSPOT_BUILD_VERSION)" == "" |
190 !if "$(HOTSPOT_BUILD_VERSION)" == "" |
192 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) |
191 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) |
193 !else |
192 !else |