Mercurial > hg > truffle

comparison make/windows/build.make @ 21559:be896a1983c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 836a62f43af9
children
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
108 !else 108 !else
109 VARIANT_TEXT=Server 109 VARIANT_TEXT=Server
110 !endif 110 !endif
111 !elseif "$(Variant)" == "tiered" 111 !elseif "$(Variant)" == "tiered"
112 VARIANT_TEXT=Tiered 112 VARIANT_TEXT=Tiered
113 !elseif "$(Variant)" == "graal" 113 !elseif "$(Variant)" == "jvmci"
114 VARIANT_TEXT=Graal 114 VARIANT_TEXT=JVMCI
115 !endif 115 !endif
116 116
117 ######################################################################### 117 #########################################################################
118 # Parameters for VERSIONINFO resource for jvm.dll. 118 # Parameters for VERSIONINFO resource for jvm.dll.
119 # These can be overridden via the nmake.exe command line. 119 # These can be overridden via the nmake.exe command line.
306 @ if "$(ZIPEXE)" NEQ "" echo ZIPEXE=$(ZIPEXE) >> $@ 306 @ if "$(ZIPEXE)" NEQ "" echo ZIPEXE=$(ZIPEXE) >> $@
307 307
308 checks: checkVariant checkWorkSpace checkSA 308 checks: checkVariant checkWorkSpace checkSA
309 309
310 checkVariant: 310 checkVariant:
311 @ if "$(Variant)"=="" echo Need to specify "Variant=[graal|tiered|compiler2|compiler1|core]" && false 311 @ if "$(Variant)"=="" echo Need to specify "Variant=[jvmci|tiered|compiler2|compiler1|core]" && false
312 @ if "$(Variant)" NEQ "graal" if "$(Variant)" NEQ "tiered" if "$(Variant)" NEQ "compiler2" if "$(Variant)" NEQ "compiler1" if "$(Variant)" NEQ "core" \ 312 @ if "$(Variant)" NEQ "jvmci" if "$(Variant)" NEQ "tiered" if "$(Variant)" NEQ "compiler2" if "$(Variant)" NEQ "compiler1" if "$(Variant)" NEQ "core" \
313 echo Need to specify "Variant=[graal|tiered|compiler2|compiler1|core]" && false 313 echo Need to specify "Variant=[jvmci|tiered|compiler2|compiler1|core]" && false
314 314
315 checkWorkSpace: 315 checkWorkSpace:
316 @ if "$(WorkSpace)"=="" echo Need to specify "WorkSpace=..." && false 316 @ if "$(WorkSpace)"=="" echo Need to specify "WorkSpace=..." && false
317 317
318 checkBuildID: 318 checkBuildID: