Mercurial > hg > graal-compiler

diff mx/suite.py @ 21607:71b338926f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved JVMCI classes into their own distributions (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Fri, 29 May 2015 22:27:38 +0200
parents 7a7cf422160b
children 2f92172fa320
line wrap: on
line diff
--- a/mx/suite.py	Fri May 29 13:19:05 2015 -0700
+++ b/mx/suite.py	Fri May 29 22:27:38 2015 +0200
@@ -358,15 +358,6 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "com.oracle.jvmci.hotspot.loader" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,HotSpot",
-    },
-
     "com.oracle.graal.hotspot.jfr" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
@@ -1248,6 +1239,41 @@
   },
 
   "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"],
+      "distDependencies" : [
+        "JVMCI_API",
+      ],
+    },
+
     "GRAAL" : {
       "path" : "build/graal.jar",
       "subDir" : "graal",
@@ -1259,13 +1285,10 @@
         "com.oracle.graal.hotspot.jfr",
       ],
       "exclude" : ["FINDBUGS"],
-    },
-
-    "JVMCI_LOADER" : {
-      "path" : "build/jvmci-loader.jar",
-      "subDir" : "graal",
-      "sourcesPath" : "build/jvmci-loader.src.zip",
-      "dependencies" : ["com.oracle.jvmci.hotspot.loader"],
+      "distDependencies" : [
+        "JVMCI_HOTSPOT",
+        "TRUFFLE",
+      ],
     },
 
     "TRUFFLE" : {
@@ -1306,5 +1329,4 @@
       "distDependencies" : ["TRUFFLE"],
     }
   },
-
 }