Mercurial > hg > graal-compiler

diff mx.graal/suite.py @ 22915:c5aa3f4aac72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert javaCompliance for Graal projects to 1.8
author Doug Simon <doug.simon@oracle.com>
date Sat, 31 Oct 2015 12:49:00 +0100
parents 6ecf989e8556
children be55d92d4cb6
line wrap: on
line diff
--- a/mx.graal/suite.py	Sat Oct 31 12:48:50 2015 +0100
+++ b/mx.graal/suite.py	Sat Oct 31 12:49:00 2015 +0100
@@ -1,6 +1,5 @@
 import mx
 JDK9 = mx.get_jdk(tag='default').javaCompliance >= "1.9"
-_8_9 = "1.9" if JDK9 else "1.8"
 
 def deps(l):
     """
@@ -91,7 +90,8 @@
     },
 
     # 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.
+    # This library is not added to the boot class path at run time and so code
+    # compiled against this library must be run on (JVMCI enabled) JDK9.
     "JVMCI" : {
         "sha1" : "f4f0d6cfa751fa644163008810d5123c4c298104",
         "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/jvmci-b0e383e27552.jar"],
@@ -118,7 +118,7 @@
         "mx:JUNIT",
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
     },
 
     # ------------- Graal -------------
@@ -131,7 +131,7 @@
         "jvmci:JVMCI_API",
       ]),
       "annotationProcessors" : deps(["jvmci:JVMCI_OPTIONS_PROCESSOR"]),
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,Debug",
     },
 
@@ -143,7 +143,7 @@
         "com.oracle.graal.debug",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,Debug,Test",
     },
 
@@ -156,7 +156,7 @@
       ]),
       "annotationProcessors" : deps(["jvmci:JVMCI_SERVICE_PROCESSOR"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal",
     },
 
@@ -164,7 +164,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "API,Graal",
     },
 
@@ -172,7 +172,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "API,Graal",
     },
 
@@ -183,7 +183,7 @@
       "dependencies" : [
         "com.oracle.graal.compiler.test",
       ],
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "API,Graal",
     },
 
@@ -194,7 +194,7 @@
         "jvmci:JVMCI_API",
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "API,Graal",
     },
 
@@ -206,7 +206,7 @@
         "com.oracle.graal.api.runtime",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "API,Graal,Test",
     },
 
@@ -215,7 +215,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : deps(["jvmci:JVMCI_API"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "API,Graal,Replacements",
     },
 
@@ -237,7 +237,7 @@
         "jvmci:JVMCI_OPTIONS_PROCESSOR",
         "jvmci:JVMCI_SERVICE_PROCESSOR",
       ]),
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,HotSpot",
     },
 
@@ -254,7 +254,7 @@
         "jvmci:JVMCI_SERVICE_PROCESSOR",
         "GRAAL_NODEINFO_PROCESSOR"
       ]),
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,HotSpot,AMD64",
     },
 
@@ -268,7 +268,7 @@
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "annotationProcessors" : deps(["jvmci:JVMCI_SERVICE_PROCESSOR"]),
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,HotSpot,SPARC",
     },
 
@@ -281,7 +281,7 @@
       ],
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,HotSpot,Test",
     },
 
@@ -294,7 +294,7 @@
       ],
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,HotSpot,AMD64,Test",
     },
 
@@ -302,7 +302,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Graph",
     },
 
@@ -313,7 +313,7 @@
       "dependencies" : [
         "com.oracle.graal.nodeinfo",
       ],
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Graph",
     },
 
@@ -325,7 +325,7 @@
         "com.oracle.graal.compiler.common",
         "com.oracle.graal.api.collections",
       ],
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : deps([
         "jvmci:JVMCI_OPTIONS_PROCESSOR",
         "GRAAL_NODEINFO_PROCESSOR"
@@ -343,7 +343,7 @@
         "com.oracle.graal.graph",
       ],
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Graph,Test",
     },
 
@@ -352,7 +352,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : deps(["jvmci:JVMCI_API"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Assembler",
     },
 
@@ -363,7 +363,7 @@
         "com.oracle.graal.asm",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Assembler,AMD64",
     },
 
@@ -374,7 +374,7 @@
         "com.oracle.graal.asm",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Assembler,SPARC",
     },
 
@@ -382,7 +382,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Java",
     },
 
@@ -395,7 +395,7 @@
         "com.oracle.graal.debug",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Assembler,Test",
     },
 
@@ -407,7 +407,7 @@
         "com.oracle.graal.asm.amd64",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Assembler,AMD64,Test",
     },
 
@@ -420,7 +420,7 @@
       ],
       "annotationProcessors" : deps(["jvmci:JVMCI_OPTIONS_PROCESSOR"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,LIR",
     },
 
@@ -432,7 +432,7 @@
       ],
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,LIR",
       "findbugs" : "false",
     },
@@ -445,7 +445,7 @@
         "com.oracle.graal.lir",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,LIR",
     },
 
@@ -458,7 +458,7 @@
       ],
       "annotationProcessors" : deps(["jvmci:JVMCI_OPTIONS_PROCESSOR"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,LIR,AMD64",
     },
 
@@ -470,7 +470,7 @@
         "com.oracle.graal.lir",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,LIR,SPARC",
     },
 
@@ -479,7 +479,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.graal.nodes"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
       "workingSets" : "API,Graal",
     },
@@ -494,7 +494,7 @@
         "com.oracle.graal.word",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : deps([
         "jvmci:JVMCI_OPTIONS_PROCESSOR",
         "GRAAL_REPLACEMENTS_VERIFIER",
@@ -512,7 +512,7 @@
           "com.oracle.graal.compiler",
           ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : [
         "GRAAL_NODEINFO_PROCESSOR",
       ],
@@ -527,7 +527,7 @@
           "com.oracle.graal.compiler",
           ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Replacements,SPARC",
     },
 
@@ -540,7 +540,7 @@
       ],
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Replacements,Test",
       "jacoco" : "exclude",
     },
@@ -553,7 +553,7 @@
         "com.oracle.graal.graph",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Replacements",
     },
 
@@ -567,7 +567,7 @@
         "com.oracle.graal.bytecode",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : [
         "GRAAL_NODEINFO_PROCESSOR",
         "GRAAL_REPLACEMENTS_VERIFIER",
@@ -580,7 +580,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.graal.compiler.test"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Graph",
     },
 
@@ -590,7 +590,7 @@
       "dependencies" : ["com.oracle.graal.nodes"],
       "annotationProcessors" : deps(["jvmci:JVMCI_OPTIONS_PROCESSOR"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Phases",
     },
 
@@ -603,7 +603,7 @@
         "jvmci:JVMCI_OPTIONS_PROCESSOR"
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Phases",
     },
 
@@ -616,7 +616,7 @@
         "mx:JUNIT",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Test",
     },
 
@@ -629,7 +629,7 @@
         "GRAAL_NODEINFO_PROCESSOR"
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Phases",
     },
 
@@ -638,7 +638,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : ["JMH"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : ["JMH"],
       "workingSets" : "Graal,Bench",
     },
@@ -653,7 +653,7 @@
         "com.oracle.graal.runtime",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : ["JMH"],
       "workingSets" : "Graal,Bench",
     },
@@ -664,7 +664,7 @@
       "dependencies" : ["com.oracle.graal.phases.common"],
       "annotationProcessors" : deps(["jvmci:JVMCI_OPTIONS_PROCESSOR"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Phases",
     },
 
@@ -676,7 +676,7 @@
         "com.oracle.graal.loop",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : deps([
         "jvmci:JVMCI_SERVICE_PROCESSOR",
         "jvmci:JVMCI_OPTIONS_PROCESSOR",
@@ -691,7 +691,7 @@
         "com.oracle.graal.compiler",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Codegen",
     },
 
@@ -708,7 +708,7 @@
         "GRAAL_NODEINFO_PROCESSOR",
         "GRAAL_COMPILER_MATCH_PROCESSOR"
       ],
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,AMD64",
     },
 
@@ -720,7 +720,7 @@
         "jvmci:JVMCI_HOTSPOT"
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,AMD64,Test",
     },
 
@@ -736,7 +736,7 @@
         "GRAAL_NODEINFO_PROCESSOR",
         "GRAAL_COMPILER_MATCH_PROCESSOR"
       ],
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,SPARC",
     },
 
@@ -748,7 +748,7 @@
         "jvmci:JVMCI_HOTSPOT"
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,SPARC,Test",
     },
 
@@ -757,7 +757,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.graal.compiler"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal",
     },
 
@@ -770,7 +770,7 @@
       ],
       "annotationProcessors" : deps(["jvmci:JVMCI_OPTIONS_PROCESSOR"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Java",
     },
 
@@ -781,7 +781,7 @@
         "com.oracle.graal.nodes",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Java",
     },
 
@@ -793,7 +793,7 @@
       ],
       "annotationProcessors" : deps(["jvmci:JVMCI_OPTIONS_PROCESSOR"]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Java",
     },
 
@@ -810,7 +810,7 @@
         "jvmci:JVMCI_SERVICE_PROCESSOR"
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Graph",
     },
 
@@ -821,7 +821,7 @@
         "mx:JUNIT",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Test",
     },
 
@@ -838,7 +838,7 @@
       ],
       "annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Test",
       "jacoco" : "exclude",
     },
@@ -850,7 +850,7 @@
         "com.oracle.graal.compiler.test",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Test",
       "jacoco" : "exclude",
       "findbugs" : "false",
@@ -875,7 +875,7 @@
         "jvmci:JVMCI_SERVICE_PROCESSOR",
         "truffle:TRUFFLE_DSL_PROCESSOR",
       ]),
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Truffle",
       "jacoco" : "exclude",
     },
@@ -893,7 +893,7 @@
         "truffle:TRUFFLE_DSL_PROCESSOR"
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal,Truffle,Test",
       "jacoco" : "exclude",
     },
@@ -907,7 +907,7 @@
         "com.oracle.nfi",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : deps([
         "jvmci:JVMCI_OPTIONS_PROCESSOR",
         "jvmci:JVMCI_SERVICE_PROCESSOR"
@@ -923,7 +923,7 @@
         "com.oracle.graal.hotspot.amd64",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : deps([
         "jvmci:JVMCI_SERVICE_PROCESSOR",
       ]),
@@ -938,7 +938,7 @@
         "com.oracle.graal.asm.sparc",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "annotationProcessors" : deps(["jvmci:JVMCI_SERVICE_PROCESSOR"]),
       "workingSets" : "Graal,Truffle,SPARC",
     },
@@ -956,7 +956,7 @@
         "jvmci:JVMCI_SERVICE_PROCESSOR",
       ]),
       "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : _8_9,
+      "javaCompliance" : "1.8",
       "workingSets" : "Graal",
     },
   },