Mercurial > hg > graal-compiler
changeset 23226:951f005de2cd
removed JVMCI library
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 31 Dec 2015 15:37:16 +0100 |
parents | 2375d87e535d |
children | 706aa729f311 |
files | mx.graal/suite.py |
diffstat | 1 files changed, 6 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/suite.py Thu Dec 31 09:31:02 2015 +0100 +++ b/mx.graal/suite.py Thu Dec 31 15:37:16 2015 +0100 @@ -2,29 +2,8 @@ JDK9 = mx.get_jdk(tag='default').javaCompliance >= "1.9" def deps(l): - """ - If using JDK9, replaces dependencies starting with 'jvmci:' with 'JVMCI'. - Otherwise, excludes "JVMCI". - """ - if JDK9: - res = [] - for e in l: - if e.startswith("jvmci:"): - if not "JVMCI" in res: - res.append("JVMCI") - else: - res.append(e) - return res - else: - return [d for d in l if d != "JVMCI"] - -def libs(d): - """ - If not using JDK9, excludes "JVMCI" library. - """ - if not JDK9: - del d["JVMCI"] - return d + """ Filters out dependencies starting with 'jvmci:' if using JDK9. """ + return [d for d in l if not JDK9 or not d.startswith("jvmci:")] def suites(l): """ Filters out suites named 'jvmci' if using JDK9. """ @@ -58,7 +37,7 @@ "defaultLicense" : "GPLv2-CPE", - "libraries" : libs({ + "libraries" : { # ------------- Libraries ------------- @@ -90,18 +69,7 @@ "sourceSha1" : "12a67f0dcdfe7e43218bf38c1d7fd766122a3dc7", "sourceUrls" : ["https://lafo.ssw.uni-linz.ac.at/pub/jmh/jmh-runner-1.11.2-sources.jar"], }, - - # Library that allows Graal to compile against JVMCI without the jvmci suite. - # This library is not added to the boot class path at run time and so code - # compiled against this library must be run on (a JVMCI enabled) JDK9. - "JVMCI" : { - "sha1" : "c9d62b2b7408592cd8805aa1cdb2f01189b81dff", - "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/jvmci-5ecfc0f99fed.jar"], - "sourceSha1" : "ef74ca52fa2d09ab3dfc210e8be6c87ef02f4693", - "sourceUrls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/jvmci-5ecfc0f99fed.src.zip"], - "license": "GPLv2-CPE", - }, - }), + }, "projects" : { @@ -162,7 +130,7 @@ ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", - "workingSets" : "JVMCI,Codegen", + "workingSets" : "Graal,Codegen", }, "com.oracle.graal.options.test" : { @@ -174,7 +142,7 @@ ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", - "workingSets" : "JVMCI", + "workingSets" : "Graal", }, "com.oracle.graal.debug" : { @@ -1170,7 +1138,6 @@ "com.oracle.graal.api.runtime", "com.oracle.graal.graph", ], - "exclude" : deps(["JVMCI"]), "distDependencies" : deps([ "jvmci:JVMCI_API", "GRAAL_NODEINFO", @@ -1183,7 +1150,6 @@ "dependencies" : [ "com.oracle.graal.compiler", ], - "exclude" : deps(["JVMCI"]), "distDependencies" : [ "GRAAL_API", "GRAAL_SERVICEPROVIDER", @@ -1205,7 +1171,6 @@ "com.oracle.graal.replacements.sparc", "com.oracle.graal.salver", ], - "exclude" : deps(["JVMCI"]), "distDependencies" : [ "GRAAL_API", "GRAAL_COMPILER", @@ -1220,7 +1185,6 @@ "com.oracle.graal.hotspot.sparc", "com.oracle.graal.hotspot", ], - "exclude" : deps(["JVMCI"]), "distDependencies" : deps([ "jvmci:JVMCI_HOTSPOT", "GRAAL_COMPILER", @@ -1254,7 +1218,6 @@ "exclude" : deps([ "mx:JUNIT", "JAVA_ALLOCATION_INSTRUMENTER", - "JVMCI" ]), }, @@ -1381,7 +1344,6 @@ "com.oracle.graal.truffle.hotspot.amd64", "com.oracle.graal.truffle.hotspot.sparc" ], - "exclude" : deps(["JVMCI"]), "distDependencies" : [ "truffle:TRUFFLE_API", ],