Mercurial > hg > truffle
comparison make/windows/build.make @ 10405:f2110083203d
8005849: JEP 167: Event-Based JVM Tracing
Reviewed-by: acorn, coleenp, sla
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
author | sla |
---|---|
date | Mon, 10 Jun 2013 11:30:51 +0200 |
parents | f36e073d56a4 |
children | 836a62f43af9 |
comparison
equal
deleted
inserted
replaced
10404:d0add7016434 | 10405:f2110083203d |
---|---|
194 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) | 194 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) |
195 !endif | 195 !endif |
196 | 196 |
197 # End VERSIONINFO parameters | 197 # End VERSIONINFO parameters |
198 | 198 |
199 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK | |
200 !ifndef OPENJDK | |
201 !if !exists($(WorkSpace)\src\closed) | |
202 OPENJDK=true | |
203 !endif | |
204 !endif | |
199 | 205 |
200 # We don't support SA on ia64, and we can't | 206 # We don't support SA on ia64, and we can't |
201 # build it if we are using a version of Vis Studio | 207 # build it if we are using a version of Vis Studio |
202 # older than .Net 2003. | 208 # older than .Net 2003. |
203 # SA_INCLUDE and SA_LIB are hold-overs from a previous | 209 # SA_INCLUDE and SA_LIB are hold-overs from a previous |
271 @ echo HS_VER=$(HS_VER) >> $@ | 277 @ echo HS_VER=$(HS_VER) >> $@ |
272 @ echo HS_DOTVER=$(HS_DOTVER) >> $@ | 278 @ echo HS_DOTVER=$(HS_DOTVER) >> $@ |
273 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ | 279 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ |
274 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ | 280 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ |
275 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ | 281 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ |
282 @ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK) >> $@ | |
276 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ | 283 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ |
277 @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@ | 284 @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@ |
278 @ echo HS_BUILD_VER=$(HS_BUILD_VER) >> $@ | 285 @ echo HS_BUILD_VER=$(HS_BUILD_VER) >> $@ |
279 @ echo BUILD_WIN_SA=$(BUILD_WIN_SA) >> $@ | 286 @ echo BUILD_WIN_SA=$(BUILD_WIN_SA) >> $@ |
280 @ echo SA_BUILD_VERSION=$(HS_BUILD_VER) >> $@ | 287 @ echo SA_BUILD_VERSION=$(HS_BUILD_VER) >> $@ |