Mercurial > hg > truffle

changeset 21705:729e6acde6c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added JVMCI_UTIL distribution
author Doug Simon <doug.simon@oracle.com>
date Wed, 03 Jun 2015 16:23:33 +0200
parents 5db03b62b621
children 4c00096fc415
files mx/mx_graal.py mx/suite.py
diffstat 2 files changed, 85 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Wed Jun 03 18:07:07 2015 +0200
+++ b/mx/mx_graal.py	Wed Jun 03 16:23:33 2015 +0200
@@ -99,6 +99,7 @@
     JDKDeployedDist('TRUFFLE'),
     JDKDeployedDist('JVMCI_SERVICE'),
     JDKDeployedDist('JVMCI_API', usesJVMCIClassLoader=True),
+    JDKDeployedDist('JVMCI_UTIL', usesJVMCIClassLoader=True),
     JDKDeployedDist('JVMCI_HOTSPOT', usesJVMCIClassLoader=True),
     JDKDeployedDist('GRAAL', usesJVMCIClassLoader=True),
     JDKDeployedDist('GRAAL_TRUFFLE', usesJVMCIClassLoader=True)
--- a/mx/suite.py	Wed Jun 03 18:07:07 2015 +0200
+++ b/mx/suite.py	Wed Jun 03 16:23:33 2015 +0200
@@ -3,6 +3,8 @@
   "name" : "graal",
   "libraries" : {
 
+    # ------------- Libraries -------------
+
       "JLINE" : {
       "path" : "lib/jline-2.11.jar",
       "urls" : [
@@ -154,7 +156,7 @@
 
   "projects" : {
 
-    # ------------- JVMCI -------------
+    # ------------- JVMCI:Service -------------
 
     "com.oracle.jvmci.service" : {
       "subDir" : "graal",
@@ -173,6 +175,8 @@
       "workingSets" : "JVMCI,Codegen,HotSpot",
     },
 
+    # ------------- JVMCI:API -------------
+
     "com.oracle.jvmci.common" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
@@ -222,43 +226,6 @@
       "workingSets" : "API,JVMCI",
     },
 
-    "com.oracle.jvmci.hotspot" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "com.oracle.jvmci.hotspotvmconfig",
-        "com.oracle.jvmci.options",
-        "com.oracle.jvmci.debug",
-        "com.oracle.jvmci.runtime",
-        "com.oracle.jvmci.common",
-        "FINDBUGS",
-      ],
-      "annotationProcessors" : [
-        "com.oracle.jvmci.hotspotvmconfig.processor",
-        "com.oracle.jvmci.options.processor",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI",
-    },
-
-    "com.oracle.jvmci.hotspotvmconfig" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,HotSpot",
-    },
-
-    "com.oracle.jvmci.hotspotvmconfig.processor" : {
-      "subDir" : "graal",
-      "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.debug" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
@@ -317,19 +284,7 @@
       "workingSets" : "JVMCI",
     },
 
-    "com.oracle.jvmci.hotspot.jfr" : {
-      "subDir" : "graal",
-      "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",
-    },
+    # ------------- JVMCI:Util -------------
 
     "com.oracle.jvmci.amd64" : {
       "subDir" : "graal",
@@ -340,6 +295,54 @@
       "workingSets" : "JVMCI,AMD64",
     },
 
+    "com.oracle.jvmci.sparc" : {
+      "subDir" : "graal",
+      "sourceDirs" : ["src"],
+      "dependencies" : ["com.oracle.jvmci.code"],
+      "checkstyle" : "com.oracle.graal.graph",
+      "javaCompliance" : "1.8",
+      "workingSets" : "JVMCI,SPARC",
+    },
+
+    # ------------- JVMCI:HotSpot -------------
+
+    "com.oracle.jvmci.hotspot" : {
+      "subDir" : "graal",
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "com.oracle.jvmci.hotspotvmconfig",
+        "com.oracle.jvmci.options",
+        "com.oracle.jvmci.debug",
+        "com.oracle.jvmci.runtime",
+        "com.oracle.jvmci.common",
+        "FINDBUGS",
+      ],
+      "annotationProcessors" : [
+        "com.oracle.jvmci.hotspotvmconfig.processor",
+        "com.oracle.jvmci.options.processor",
+      ],
+      "checkstyle" : "com.oracle.graal.graph",
+      "javaCompliance" : "1.8",
+      "workingSets" : "JVMCI",
+    },
+
+    "com.oracle.jvmci.hotspotvmconfig" : {
+      "subDir" : "graal",
+      "sourceDirs" : ["src"],
+      "checkstyle" : "com.oracle.graal.graph",
+      "javaCompliance" : "1.8",
+      "workingSets" : "JVMCI,HotSpot",
+    },
+
+    "com.oracle.jvmci.hotspotvmconfig.processor" : {
+      "subDir" : "graal",
+      "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" : "graal",
       "sourceDirs" : ["src"],
@@ -353,15 +356,6 @@
       "workingSets" : "JVMCI,HotSpot,AMD64",
     },
 
-    "com.oracle.jvmci.sparc" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.jvmci.code"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,SPARC",
-    },
-
     "com.oracle.jvmci.hotspot.sparc" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
@@ -375,6 +369,20 @@
       "workingSets" : "JVMCI,HotSpot,SPARC",
     },
 
+    "com.oracle.jvmci.hotspot.jfr" : {
+      "subDir" : "graal",
+      "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" : {
@@ -1291,6 +1299,8 @@
 
   "distributions" : {
 
+    # ------------- Distributions -------------
+
     "JVMCI_SERVICE" : {
       "path" : "build/jvmci-service.jar",
       "subDir" : "graal",
@@ -1315,6 +1325,19 @@
       ],
     },
 
+    "JVMCI_UTIL" : {
+      "path" : "build/jvmci-util.jar",
+      "subDir" : "graal",
+      "sourcesPath" : "build/jvmci-util.src.zip",
+      "dependencies" : [
+        "com.oracle.jvmci.amd64",
+        "com.oracle.jvmci.sparc",
+      ],
+      "distDependencies" : [
+        "JVMCI_API",
+      ],
+    },
+
     "JVMCI_HOTSPOT" : {
       "path" : "build/jvmci-hotspot.jar",
       "subDir" : "graal",
@@ -1326,6 +1349,7 @@
       ],
       "distDependencies" : [
         "JVMCI_API",
+        "JVMCI_UTIL",
       ],
     },