Mercurial > hg > truffle
diff mx/suite.py @ 21562:47bebae7454f
Merge.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 28 May 2015 21:58:33 +0200 |
| parents | be896a1983c0 28cbfacd0518 |
| children | a880844225e4 |
line wrap: on
line diff
--- a/mx/suite.py Thu May 28 17:13:22 2015 +0200 +++ b/mx/suite.py Thu May 28 21:58:33 2015 +0200 @@ -166,12 +166,11 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ - "com.oracle.jvmci.runtime", + "com.oracle.jvmci.hotspotvmconfig", + "com.oracle.jvmci.options", + "com.oracle.jvmci.debug", "com.oracle.jvmci.common", - "com.oracle.jvmci.hotspotvmconfig", - "com.oracle.jvmci.debug", - "com.oracle.jvmci.options", - "FINDBUGS" + "FINDBUGS", ], "annotationProcessors" : [ "com.oracle.jvmci.hotspotvmconfig.processor", @@ -348,15 +347,6 @@ "workingSets" : "Graal,HotSpot", }, - "com.oracle.graal.hotspot.sourcegen" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.graal.hotspot"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,HotSpot", - }, - "com.oracle.graal.hotspot.jfr" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -425,6 +415,9 @@ "com.oracle.jvmci.options" : { "subDir" : "graal", "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.runtime", + ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", "workingSets" : "Graal", @@ -861,10 +854,9 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ - "com.oracle.jvmci.common", - "com.oracle.jvmci.code", "com.oracle.jvmci.options", "com.oracle.jvmci.debug", + "com.oracle.jvmci.common", ], "annotationProcessors" : ["com.oracle.jvmci.options.processor"], "checkstyle" : "com.oracle.graal.graph",