Mercurial > hg > truffle

diff mx/suite.py @ 21938:0a6e10379b9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Keeping only Truffle-related modules in this repository
author Jaroslav Tulach <jaroslav.tulach@oracle.com>
date Fri, 12 Jun 2015 17:02:36 +0200
parents 91b861398ad6
children 0a00a5bd7c70
line wrap: on
line diff
--- a/mx/suite.py	Fri Jun 12 14:53:05 2015 +0200
+++ b/mx/suite.py	Fri Jun 12 17:02:36 2015 +0200
@@ -156,915 +156,6 @@
 
   "projects" : {
 
-    # ------------- JVMCI:Service -------------
-
-    "com.oracle.jvmci.service" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,JVMCI",
-    },
-
-    "com.oracle.jvmci.service.processor" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.service"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,Codegen,HotSpot",
-    },
-
-    # ------------- JVMCI:API -------------
-
-    "com.oracle.jvmci.common" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,JVMCI",
-    },
-
-    "com.oracle.jvmci.meta" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,JVMCI",
-    },
-
-    "com.oracle.jvmci.code" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.meta"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,JVMCI",
-    },
-
-    "com.oracle.jvmci.runtime" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.code"
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,JVMCI",
-    },
-
-    "com.oracle.jvmci.runtime.test" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "JUNIT",
-        "com.oracle.jvmci.common",
-        "com.oracle.jvmci.runtime",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,JVMCI",
-    },
-
-    "com.oracle.jvmci.debug" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "dependencies" : [
-        "com.oracle.jvmci.options",
-        "com.oracle.jvmci.code",
-        "com.oracle.jvmci.service",
-      ],
-      "annotationProcessors" : ["com.oracle.jvmci.options.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,Debug",
-    },
-
-    "com.oracle.jvmci.debug.test" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "JUNIT",
-        "com.oracle.jvmci.debug",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,Debug,Test",
-    },
-
-    "com.oracle.jvmci.options" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI",
-    },
-
-    "com.oracle.jvmci.compiler" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.debug",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.options.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI",
-    },
-
-    "com.oracle.jvmci.options.processor" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.options",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,Codegen",
-    },
-
-    "com.oracle.jvmci.options.test" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.options",
-        "JUNIT",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.options.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI",
-    },
-
-    # ------------- JVMCI:HotSpot -------------
-
-    "com.oracle.jvmci.amd64" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.code"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,AMD64",
-    },
-
-    "com.oracle.jvmci.sparc" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.code"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,SPARC",
-    },
-
-    "com.oracle.jvmci.hotspot" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.hotspotvmconfig",
-        "FINDBUGS",
-        "com.oracle.jvmci.runtime",
-        "com.oracle.jvmci.common",
-        "com.oracle.jvmci.compiler",
-      ],
-      "annotationProcessors" : [
-        "com.oracle.jvmci.hotspotvmconfig.processor",
-        "com.oracle.jvmci.options.processor",
-        "com.oracle.jvmci.service.processor",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI",
-    },
-
-    "com.oracle.jvmci.hotspotvmconfig" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,HotSpot",
-    },
-
-    "com.oracle.jvmci.hotspotvmconfig.processor" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.hotspotvmconfig", "com.oracle.jvmci.common"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,HotSpot,Codegen",
-    },
-
-    "com.oracle.jvmci.hotspot.amd64" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.amd64",
-        "com.oracle.jvmci.hotspot",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,HotSpot,AMD64",
-    },
-
-    "com.oracle.jvmci.hotspot.sparc" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.sparc",
-        "com.oracle.jvmci.hotspot",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,HotSpot,SPARC",
-    },
-
-    "com.oracle.jvmci.hotspot.jfr" : {
-      "subDir" : "jvmci",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.hotspot",
-        "JFR",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "javaCompliance" : "1.8",
-      "profile" : "",
-      "workingSets" : "JVMCI,HotSpot",
-    },
-
-    # ------------- NFI -------------
-
-    "com.oracle.nfi" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.7",
-    },
-
-    "com.oracle.nfi.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["test"],
-      "dependencies" : [
-        "com.oracle.nfi",
-        "com.oracle.jvmci.common",
-        "JUNIT",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.7",
-    },
-
-    # ------------- Graal -------------
-
-    "com.oracle.graal.code" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.service",
-        "com.oracle.jvmci.code",
-      ],
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal",
-    },
-
-    "com.oracle.graal.api.collections" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,Graal",
-    },
-
-    "com.oracle.graal.api.directives" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,Graal",
-    },
-
-    "com.oracle.graal.api.directives.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "dependencies" : [
-        "com.oracle.graal.compiler.test",
-      ],
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,Graal",
-    },
-
-    "com.oracle.graal.api.runtime" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.service",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,Graal",
-    },
-
-    "com.oracle.graal.api.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "JUNIT",
-        "com.oracle.graal.api.runtime",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,Graal,Test",
-    },
-
-    "com.oracle.graal.api.replacements" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.meta"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,Graal,Replacements",
-    },
-
-    "com.oracle.graal.hotspot" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.hotspot",
-        "com.oracle.graal.replacements",
-        "com.oracle.graal.runtime",
-        "com.oracle.graal.code",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : [
-        "com.oracle.graal.replacements.verifier",
-        "com.oracle.jvmci.service.processor",
-      ],
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,HotSpot",
-    },
-
-    "com.oracle.graal.hotspot.amd64" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.hotspot.amd64",
-        "com.oracle.graal.compiler.amd64",
-        "com.oracle.graal.hotspot",
-        "com.oracle.graal.replacements.amd64",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,HotSpot,AMD64",
-    },
-
-    "com.oracle.graal.hotspot.sparc" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.hotspot",
-        "com.oracle.jvmci.hotspot.sparc",
-        "com.oracle.graal.compiler.sparc",
-        "com.oracle.graal.replacements.sparc",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor", "com.oracle.graal.compiler.match.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,HotSpot,SPARC",
-    },
-
-    "com.oracle.graal.hotspot.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.replacements.test",
-        "com.oracle.graal.hotspot",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,HotSpot,Test",
-    },
-
-    "com.oracle.graal.hotspot.amd64.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.asm.amd64",
-        "com.oracle.graal.hotspot.test",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,HotSpot,AMD64,Test",
-    },
-
-    "com.oracle.graal.nodeinfo" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Graph",
-    },
-
-    "com.oracle.graal.nodeinfo.processor" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "dependencies" : [
-        "com.oracle.graal.nodeinfo",
-      ],
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Graph",
-    },
-
-    "com.oracle.graal.graph" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.nodeinfo",
-        "com.oracle.graal.compiler.common",
-        "com.oracle.graal.api.collections",
-        "com.oracle.graal.api.runtime",
-        "FINDBUGS",
-      ],
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : ["com.oracle.graal.nodeinfo.processor"],
-      "workingSets" : "Graal,Graph",
-    },
-
-    "com.oracle.graal.graph.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "dependencies" : [
-        "JUNIT",
-        "com.oracle.graal.graph",
-      ],
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Graph,Test",
-    },
-
-    "com.oracle.graal.asm" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.code"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Assembler",
-    },
-
-    "com.oracle.graal.asm.amd64" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.asm",
-        "com.oracle.jvmci.amd64",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Assembler,AMD64",
-    },
-
-    "com.oracle.graal.asm.sparc" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.asm",
-        "com.oracle.jvmci.sparc",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Assembler,SPARC",
-    },
-
-    "com.oracle.graal.bytecode" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Java",
-    },
-
-    "com.oracle.graal.asm.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.code",
-        "com.oracle.graal.test",
-        "com.oracle.jvmci.runtime",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Assembler,Test",
-    },
-
-    "com.oracle.graal.asm.amd64.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.asm.test",
-        "com.oracle.jvmci.common",
-        "com.oracle.graal.asm.amd64",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Assembler,AMD64,Test",
-    },
-
-    "com.oracle.graal.lir" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.compiler.common",
-        "com.oracle.graal.asm",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,LIR",
-    },
-
-    "com.oracle.graal.lir.jtt" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.jtt",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,LIR",
-    },
-
-    "com.oracle.graal.lir.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "JUNIT",
-        "com.oracle.graal.lir",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,LIR",
-    },
-
-    "com.oracle.graal.lir.amd64" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.lir",
-        "com.oracle.graal.asm.amd64",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,LIR,AMD64",
-    },
-
-    "com.oracle.graal.lir.sparc" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.asm.sparc",
-        "com.oracle.graal.lir",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,LIR,SPARC",
-    },
-
-    "com.oracle.graal.word" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.nodes"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "API,Graal",
-    },
-
-    "com.oracle.graal.replacements" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.api.directives",
-        "com.oracle.graal.java",
-        "com.oracle.graal.loop",
-        "com.oracle.graal.word",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : [
-        "com.oracle.graal.replacements.verifier",
-        "com.oracle.jvmci.service.processor",
-      ],
-      "workingSets" : "Graal,Replacements",
-    },
-
-    "com.oracle.graal.replacements.amd64" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-          "com.oracle.graal.replacements",
-          "com.oracle.graal.lir.amd64",
-          "com.oracle.graal.compiler",
-          ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "workingSets" : "Graal,Replacements,AMD64",
-    },
-
-    "com.oracle.graal.replacements.sparc" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-          "com.oracle.graal.replacements",
-          "com.oracle.graal.compiler",
-          ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Replacements,SPARC",
-    },
-
-    "com.oracle.graal.replacements.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.compiler.test",
-        "com.oracle.graal.replacements",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Replacements,Test",
-      "jacoco" : "exclude",
-    },
-
-    "com.oracle.graal.replacements.verifier" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.api.replacements",
-        "com.oracle.graal.graph",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Replacements",
-    },
-
-    "com.oracle.graal.nodes" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.graph",
-        "com.oracle.graal.api.replacements",
-        "com.oracle.graal.lir",
-        "com.oracle.graal.bytecode",
-        "com.oracle.jvmci.compiler",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : ["com.oracle.graal.replacements.verifier"],
-      "workingSets" : "Graal,Graph",
-    },
-
-    "com.oracle.graal.nodes.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.compiler.test"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Graph",
-    },
-
-    "com.oracle.graal.phases" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.nodes"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Phases",
-    },
-
-    "com.oracle.graal.phases.common" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.phases"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Phases",
-    },
-
-    "com.oracle.graal.phases.common.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.runtime",
-        "JUNIT",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Test",
-    },
-
-    "com.oracle.graal.virtual" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.phases.common"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Phases",
-    },
-
-    "com.oracle.graal.virtual.bench" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["JMH"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Bench",
-    },
-
-    "com.oracle.graal.loop" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.phases.common"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Phases",
-    },
-
-    "com.oracle.graal.compiler" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.virtual",
-        "com.oracle.graal.loop",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "workingSets" : "Graal",
-    },
-
-    "com.oracle.graal.compiler.match.processor" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.compiler",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Codegen",
-    },
-
-    "com.oracle.graal.compiler.amd64" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.compiler",
-        "com.oracle.graal.lir.amd64",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.graal.compiler.match.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,AMD64",
-    },
-
-    "com.oracle.graal.compiler.amd64.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.amd64",
-        "com.oracle.graal.lir.jtt",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,AMD64,Test",
-    },
-
-    "com.oracle.graal.compiler.sparc" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.compiler",
-        "com.oracle.graal.lir.sparc"
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,SPARC",
-    },
-
-    "com.oracle.graal.compiler.sparc.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.sparc",
-        "com.oracle.graal.compiler.test",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,SPARC,Test",
-    },
-
-    "com.oracle.graal.runtime" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.compiler"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal",
-    },
-
-    "com.oracle.graal.java" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.phases",
-        "com.oracle.graal.graphbuilderconf",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Java",
-    },
-
-    "com.oracle.graal.graphbuilderconf" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.nodes",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Java",
-    },
-
-    "com.oracle.graal.compiler.common" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.debug",
-        "com.oracle.jvmci.common",
-      ],
-      "annotationProcessors" : ["com.oracle.jvmci.options.processor"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Java",
-    },
-
-    "com.oracle.graal.printer" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.code",
-        "com.oracle.graal.java",
-        "com.oracle.graal.compiler",
-      ],
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Graph",
-    },
-
-    "com.oracle.graal.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.debug",
-        "JUNIT",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Test",
-    },
-
-    "com.oracle.graal.compiler.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.api.directives",
-        "com.oracle.graal.java",
-        "com.oracle.graal.test",
-        "com.oracle.graal.runtime",
-        "JAVA_ALLOCATION_INSTRUMENTER",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Test",
-      "jacoco" : "exclude",
-    },
-
-    "com.oracle.graal.jtt" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.compiler.test",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Test",
-      "jacoco" : "exclude",
-    },
-
     # ------------- Truffle -------------
 
     "com.oracle.truffle.api" : {
@@ -1081,7 +172,7 @@
         "com.oracle.truffle.api",
         "JUNIT",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
       "javaCompliance" : "1.7",
       "annotationProcessors" : ["com.oracle.truffle.dsl.processor"],
       "workingSets" : "API,Truffle,Test",
@@ -1104,7 +195,7 @@
         "com.oracle.truffle.dsl.processor",
         "JUNIT",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
       "javaCompliance" : "1.7",
       "annotationProcessors" : ["com.oracle.truffle.dsl.processor"],
       "workingSets" : "API,Truffle,Codegen,Test",
@@ -1115,7 +206,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.truffle.api.dsl"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
       "javaCompliance" : "1.7",
       "workingSets" : "Truffle,Codegen",
     },
@@ -1142,7 +233,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.truffle.api.object"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
       "javaCompliance" : "1.7",
       "workingSets" : "Truffle",
     },
@@ -1151,11 +242,23 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.truffle.object"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
       "javaCompliance" : "1.7",
       "workingSets" : "Truffle",
     },
 
+    "com.oracle.truffle.tck" : {
+      "subDir" : "graal",
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "com.oracle.truffle.api",
+        "JUNIT"
+      ],
+      "checkstyle" : "com.oracle.truffle.api",
+      "javaCompliance" : "1.7",
+      "workingSets" : "Truffle,Tools",
+    },
+
     "com.oracle.truffle.tools" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
@@ -1205,7 +308,7 @@
         "com.oracle.truffle.tools",
         "FINDBUGS"
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
       "javaCompliance" : "1.8",
       "annotationProcessors" : ["com.oracle.truffle.dsl.processor"],
       "workingSets" : "Truffle,SimpleLanguage",
@@ -1215,10 +318,10 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "com.oracle.truffle.api.test",
+        "com.oracle.truffle.tck",
         "com.oracle.truffle.sl"
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
       "javaCompliance" : "1.8",
       "workingSets" : "Truffle,SimpleLanguage,Test",
     },
@@ -1231,139 +334,12 @@
       "javaCompliance" : "1.8",
       "workingSets" : "Truffle,SimpleLanguage,Tools",
     },
-
-    # ------------- GraalTruffle -------------
-
-    "com.oracle.graal.truffle" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.truffle.api",
-        "com.oracle.graal.runtime",
-        "com.oracle.graal.replacements",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Truffle",
-      "jacoco" : "exclude",
-    },
-
-    "com.oracle.graal.truffle.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.truffle",
-        "com.oracle.graal.graph.test",
-        "com.oracle.graal.compiler.test",
-        "com.oracle.truffle.sl.test",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,Truffle,Test",
-      "jacoco" : "exclude",
-    },
-
-    "com.oracle.graal.truffle.hotspot" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.truffle",
-        "com.oracle.graal.hotspot",
-        "com.oracle.nfi",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "workingSets" : "Graal,Truffle",
-    },
-
-    "com.oracle.graal.truffle.hotspot.amd64" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.truffle.hotspot",
-        "com.oracle.graal.hotspot.amd64",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "workingSets" : "Graal,Truffle",
-    },
-
-    "com.oracle.graal.truffle.hotspot.sparc" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.graal.truffle.hotspot",
-        "com.oracle.graal.asm.sparc",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
-      "workingSets" : "Graal,Truffle,SPARC",
-    }
   },
 
   "distributions" : {
 
     # ------------- Distributions -------------
 
-    "JVMCI_SERVICE" : {
-      "path" : "build/jvmci-service.jar",
-      "subDir" : "graal",
-      "sourcesPath" : "build/jvmci-service.src.zip",
-      "dependencies" : ["com.oracle.jvmci.service"],
-      "exclude" : ["FINDBUGS"],
-    },
-
-    "JVMCI_API" : {
-      "path" : "build/jvmci-api.jar",
-      "subDir" : "graal",
-      "sourcesPath" : "build/jvmci-api.src.zip",
-      "dependencies" : [
-        "com.oracle.jvmci.runtime",
-        "com.oracle.jvmci.options",
-        "com.oracle.jvmci.common",
-        "com.oracle.jvmci.debug",
-      ],
-      "exclude" : ["FINDBUGS"],
-      "distDependencies" : [
-        "JVMCI_SERVICE",
-      ],
-    },
-
-    "JVMCI_HOTSPOT" : {
-      "path" : "build/jvmci-hotspot.jar",
-      "subDir" : "graal",
-      "sourcesPath" : "build/jvmci-hotspot.src.zip",
-      "dependencies" : [
-        "com.oracle.jvmci.hotspot.amd64",
-        "com.oracle.jvmci.hotspot.sparc",
-        "com.oracle.jvmci.hotspot.jfr",
-      ],
-      "distDependencies" : [
-        "JVMCI_API",
-      ],
-    },
-
-    "GRAAL" : {
-      "path" : "build/graal.jar",
-      "subDir" : "graal",
-      "sourcesPath" : "build/graal.src.zip",
-      "dependencies" : [
-        "com.oracle.graal.hotspot.amd64",
-        "com.oracle.graal.hotspot.sparc",
-        "com.oracle.graal.hotspot",
-        "com.oracle.graal.printer",
-      ],
-      "exclude" : ["FINDBUGS"],
-      "distDependencies" : [
-        "JVMCI_SERVICE",
-        "JVMCI_HOTSPOT",
-        "TRUFFLE",
-      ],
-    },
-
     "TRUFFLE" : {
       "path" : "build/truffle.jar",
       "subDir" : "graal",
@@ -1371,26 +347,22 @@
       "javaCompliance" : "1.7",
       "dependencies" : [
         "com.oracle.truffle.api.dsl",
-        "com.oracle.nfi",
         "com.oracle.truffle.object.basic",
         "com.oracle.truffle.tools"
       ],
+      "distDependencies" : [
+      ],
     },
 
-    "GRAAL_TRUFFLE" : {
-      "path" : "build/graal-truffle.jar",
+    "TRUFFLE-TCK" : {
+      "path" : "build/truffle-tck.jar",
       "subDir" : "graal",
-      "sourcesPath" : "build/graal-truffle.src.zip",
+      "sourcesPath" : "build/truffle-tck.src.zip",
+      "javaCompliance" : "1.7",
       "dependencies" : [
-        "com.oracle.graal.truffle",
-        "com.oracle.graal.truffle.hotspot.amd64",
-        "com.oracle.graal.truffle.hotspot.sparc"
+        "com.oracle.truffle.tck"
       ],
-      "exclude" : ["FINDBUGS"],
-      "distDependencies" : [
-        "GRAAL",
-        "TRUFFLE",
-      ],
+      "distDependencies" : ["TRUFFLE"],
     },
 
     "TRUFFLE-DSL-PROCESSOR" : {