Mercurial > hg > truffle

comparison make/windows/build.make @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 43223d3f5dcd f2110083203d
children be896a1983c0
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
196 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) 196 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)
197 !endif 197 !endif
198 198
199 # End VERSIONINFO parameters 199 # End VERSIONINFO parameters
200 200
201 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK
202 !ifndef OPENJDK
203 !if !exists($(WorkSpace)\src\closed)
204 OPENJDK=true
205 !endif
206 !endif
201 207
202 # We don't support SA on ia64, and we can't 208 # We don't support SA on ia64, and we can't
203 # build it if we are using a version of Vis Studio 209 # build it if we are using a version of Vis Studio
204 # older than .Net 2003. 210 # older than .Net 2003.
205 # SA_INCLUDE and SA_LIB are hold-overs from a previous 211 # SA_INCLUDE and SA_LIB are hold-overs from a previous
273 @ echo HS_VER=$(HS_VER) >> $@ 279 @ echo HS_VER=$(HS_VER) >> $@
274 @ echo HS_DOTVER=$(HS_DOTVER) >> $@ 280 @ echo HS_DOTVER=$(HS_DOTVER) >> $@
275 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ 281 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@
276 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ 282 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@
277 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ 283 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@
284 @ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK) >> $@
278 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ 285 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@
279 @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@ 286 @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@
280 @ echo HS_BUILD_VER=$(HS_BUILD_VER) >> $@ 287 @ echo HS_BUILD_VER=$(HS_BUILD_VER) >> $@
281 @ echo BUILD_WIN_SA=$(BUILD_WIN_SA) >> $@ 288 @ echo BUILD_WIN_SA=$(BUILD_WIN_SA) >> $@
282 @ echo SA_BUILD_VERSION=$(HS_BUILD_VER) >> $@ 289 @ echo SA_BUILD_VERSION=$(HS_BUILD_VER) >> $@