Mercurial > hg > graal-compiler

changeset 22320:b1ed20090527

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolve cyclic dependencies involving annotation processors.
author Roland Schatz <roland.schatz@oracle.com>
date Fri, 24 Jul 2015 13:43:47 +0200
parents 42f424266138
children eb013f1a71a0
files mx.graal/mx_graal.py mx.graal/suite.py
diffstat 2 files changed, 45 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mx.graal/mx_graal.py	Fri Jul 24 11:09:11 2015 +0200
+++ b/mx.graal/mx_graal.py	Fri Jul 24 13:43:47 2015 +0200
@@ -70,6 +70,9 @@
                 fp.write(os.linesep.join(content))
 
 mx_jvmci.jdkDeployedDists += [
+    JvmciJDKDeployedDist('GRAAL_NODEINFO'),
+    JvmciJDKDeployedDist('GRAAL_API'),
+    JvmciJDKDeployedDist('GRAAL_COMPILER'),
     GraalJDKDeployedDist(),
     JvmciJDKDeployedDist('GRAAL_TRUFFLE'),
 ]
--- a/mx.graal/suite.py	Fri Jul 24 11:09:11 2015 +0200
+++ b/mx.graal/suite.py	Fri Jul 24 13:43:47 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "486822772780ac210c484d4ae2d457d1ef6c01fd",
+               "version" : "6128b5118a28cec509865f88b63e13a732c032a7",
                "urls" : [
                     {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -898,6 +898,41 @@
 
     # ------------- Distributions -------------
 
+    "GRAAL_NODEINFO" : {
+      "path" : "build/graal-nodeinfo.jar",
+      "subDir" : "graal",
+      "sourcesPath" : "build/graal-nodeinfo.src.zip",
+      "dependencies" : [
+        "com.oracle.graal.nodeinfo",
+      ],
+    },
+
+    "GRAAL_API" : {
+      "path" : "build/graal-api.jar",
+      "subDir" : "graal",
+      "sourcesPath" : "build/graal-api.src.zip",
+      "dependencies" : [
+        "com.oracle.graal.api.replacements",
+        "com.oracle.graal.graph",
+      ],
+      "distDependencies" : [
+        "jvmci:JVMCI_API",
+        "GRAAL_NODEINFO",
+      ],
+    },
+
+    "GRAAL_COMPILER" : {
+      "path" : "build/graal-compiler.jar",
+      "subDir" : "graal",
+      "sourcesPath" : "build/graal-compiler.src.zip",
+      "dependencies" : [
+        "com.oracle.graal.compiler",
+      ],
+      "distDependencies" : [
+        "GRAAL_API",
+      ],
+    },
+
     "GRAAL" : {
       "path" : "build/graal.jar",
       "subDir" : "graal",
@@ -911,6 +946,7 @@
       "distDependencies" : [
         "jvmci:JVMCI_HOTSPOT",
         "jvmci:JVMCI_OPTIONS_PROCESSOR",
+        "GRAAL_COMPILER",
       ],
     },
 
@@ -971,6 +1007,9 @@
       "subDir" : "graal",
       "sourcesPath" : "build/graal-nodeinfo-processor.src.zip",
       "dependencies" : ["com.oracle.graal.nodeinfo.processor"],
+      "distDependencies" : [
+        "GRAAL_NODEINFO",
+      ],
     },
 
     "GRAAL_REPLACEMENTS_VERIFIER" : {
@@ -979,7 +1018,7 @@
       "sourcesPath" : "build/graal-replacements-verifier.src.zip",
       "dependencies" : ["com.oracle.graal.replacements.verifier"],
       "distDependencies" : [
-        "jvmci:JVMCI_API",
+        "GRAAL_API",
       ],
     },
 
@@ -989,8 +1028,7 @@
       "sourcesPath" : "build/graal-compiler-match-processor.src.zip",
       "dependencies" : ["com.oracle.graal.compiler.match.processor"],
       "distDependencies" : [
-        "jvmci:JVMCI_SERVICE",
-        "jvmci:JVMCI_API",
+        "GRAAL_COMPILER",
       ]
     },
   },