Mercurial > hg > truffle
diff mx.truffle/suite.py @ 22025:854e52a0869c
Merge with truffle
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 21 Jul 2015 16:20:18 +0200 |
| parents | 4e9d4f4a63da 5bc7f7b867ab |
| children | ed613cfa37da |
line wrap: on
line diff
--- a/mx.truffle/suite.py Tue Jul 21 16:06:31 2015 +0200 +++ b/mx.truffle/suite.py Tue Jul 21 16:20:18 2015 +0200 @@ -144,19 +144,10 @@ "workingSets" : "Truffle,Tools", }, - "com.oracle.truffle.tools.debug.engine" : { - "subDir" : "truffle", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.truffle.tools"], - "checkstyle" : "com.oracle.truffle.api", - "javaCompliance" : "1.7", - "workingSets" : "Truffle,Tools", - }, - "com.oracle.truffle.tools.debug.shell" : { "subDir" : "truffle", "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.truffle.tools.debug.engine", + "dependencies" : ["com.oracle.truffle.tools", "JLINE"], "checkstyle" : "com.oracle.truffle.api", "javaCompliance" : "1.7", @@ -171,7 +162,6 @@ "com.oracle.truffle.api.object", "com.oracle.truffle.tools", ], - "checkstyle" : "com.oracle.truffle.dsl.processor", "javaCompliance" : "1.7", "annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"], "workingSets" : "Truffle,SimpleLanguage", @@ -182,9 +172,9 @@ "sourceDirs" : ["src"], "dependencies" : [ "com.oracle.truffle.tck", - "com.oracle.truffle.sl" + "com.oracle.truffle.sl", ], - "checkstyle" : "com.oracle.truffle.dsl.processor", + "checkstyle" : "com.oracle.truffle.sl", "javaCompliance" : "1.7", "workingSets" : "Truffle,SimpleLanguage,Test", }, @@ -194,7 +184,7 @@ "sourceDirs" : ["src"], "dependencies" : ["com.oracle.truffle.tools.debug.shell", "com.oracle.truffle.sl"], - "checkstyle" : "com.oracle.truffle.api", + "checkstyle" : "com.oracle.truffle.sl", "javaCompliance" : "1.7", "workingSets" : "Truffle,SimpleLanguage,Tools", }, @@ -207,7 +197,7 @@ "TRUFFLE" : { "path" : "build/truffle-api.jar", "subDir" : "truffle", - "sourcesPath" : "build/truffle.src.zip", + "sourcesPath" : "build/truffle-api.src.zip", "javaCompliance" : "1.7", "dependencies" : [ "com.oracle.truffle.api.dsl",