equal
deleted
inserted
replaced
159 PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ |
159 PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ |
160 JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@ |
160 JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@ |
161 COMPANY_NAME:=@COMPANY_NAME@ |
161 COMPANY_NAME:=@COMPANY_NAME@ |
162 MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ |
162 MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ |
163 MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ |
163 MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ |
|
164 USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ |
164 |
165 |
165 # Different version strings generated from the above information. |
166 # Different version strings generated from the above information. |
166 JDK_VERSION:=@JDK_VERSION@ |
167 JDK_VERSION:=@JDK_VERSION@ |
167 RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) |
168 RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) |
168 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ |
169 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ |
171 ifeq ($(MILESTONE),) |
172 ifeq ($(MILESTONE),) |
172 RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE) |
173 RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE) |
173 else |
174 else |
174 RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) |
175 RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) |
175 endif |
176 endif |
176 ifeq ($(JDK_BUILD_NUMBER),b00) |
177 |
177 USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ |
178 ifneq ($(USER_RELEASE_SUFFIX),) |
178 FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER) |
179 FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER) |
179 else |
180 else |
180 FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER) |
181 FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER) |
181 endif |
182 endif |
182 JRE_RELEASE_VERSION:=$(FULL_VERSION) |
183 JRE_RELEASE_VERSION:=$(FULL_VERSION) |