Mercurial > hg > graal-jvmci-8

changeset 22323:6128b5118a28

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:13:31 +0200
parents 486822772780
children 6885cc0a1575
files mx.jvmci/mx_jvmci.py mx.jvmci/suite.py
diffstat 2 files changed, 30 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Fri Jul 24 11:08:17 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Fri Jul 24 13:13:31 2015 +0200
@@ -171,6 +171,8 @@
     LibJDKDeployedDist('JVMCI_SERVICE', partOfHotSpot=True),
     JvmciJDKDeployedDist('JVMCI_API', partOfHotSpot=True),
     JvmciJDKDeployedDist('JVMCI_HOTSPOT', partOfHotSpot=True),
+    JvmciJDKDeployedDist('JVMCI_HOTSPOTVMCONFIG', partOfHotSpot=True),
+    JvmciJDKDeployedDist('JVMCI_OPTIONS', partOfHotSpot=True),
     HotSpotVMJDKDeployedDist('JVM_<vmbuild>_<vm>'),
 ]
 
--- a/mx.jvmci/suite.py	Fri Jul 24 11:08:17 2015 +0200
+++ b/mx.jvmci/suite.py	Fri Jul 24 13:13:31 2015 +0200
@@ -304,22 +304,38 @@
       "dependencies" : ["jdk.internal.jvmci.service"],
     },
 
+    "JVMCI_OPTIONS" : {
+      "path" : "build/jvmci-options.jar",
+      "subDir" : "jvmci",
+      "sourcesPath" : "build/jvmci-options.src.zip",
+      "dependencies" : ["jdk.internal.jvmci.options"],
+    },
+
     "JVMCI_API" : {
       "path" : "build/jvmci-api.jar",
       "subDir" : "jvmci",
       "sourcesPath" : "build/jvmci-api.src.zip",
       "dependencies" : [
         "jdk.internal.jvmci.runtime",
-        "jdk.internal.jvmci.options",
         "jdk.internal.jvmci.common",
         "jdk.internal.jvmci.compiler",
         "jdk.internal.jvmci.debug",
       ],
       "distDependencies" : [
+        "JVMCI_OPTIONS",
         "JVMCI_SERVICE",
       ],
     },
 
+    "JVMCI_HOTSPOTVMCONFIG" : {
+      "path" : "build/jvmci-hotspotvmconfig.jar",
+      "subDir" : "jvmci",
+      "sourcesPath" : "build/jvmci-hotspotvmconfig.src.zip",
+      "dependencies" : [
+        "jdk.internal.jvmci.hotspotvmconfig",
+      ],
+    },
+
     "JVMCI_HOTSPOT" : {
       "path" : "build/jvmci-hotspot.jar",
       "subDir" : "jvmci",
@@ -330,6 +346,7 @@
         "jdk.internal.jvmci.hotspot.jfr",
       ],
       "distDependencies" : [
+        "JVMCI_HOTSPOTVMCONFIG",
         "JVMCI_SERVICE",
         "JVMCI_API",
       ],
@@ -353,6 +370,9 @@
       "subDir" : "jvmci",
       "sourcesPath" : "build/jvmci-options-processor.src.zip",
       "dependencies" : ["jdk.internal.jvmci.options.processor"],
+      "distDependencies" : [
+        "JVMCI_OPTIONS",
+      ],
     },
 
     "JVMCI_HOTSPOTVMCONFIG_PROCESSOR" : {
@@ -360,6 +380,10 @@
       "subDir" : "jvmci",
       "sourcesPath" : "build/jvmci-hotspotvmconfig-processor.src.zip",
       "dependencies" : ["jdk.internal.jvmci.hotspotvmconfig.processor"],
+      "distDependencies" : [
+        "JVMCI_API",
+        "JVMCI_HOTSPOTVMCONFIG",
+      ],
     },
 
     "JVMCI_SERVICE_PROCESSOR" : {
@@ -367,6 +391,9 @@
       "subDir" : "jvmci",
       "sourcesPath" : "build/jvmci-service-processor.src.zip",
       "dependencies" : ["jdk.internal.jvmci.service.processor"],
+      "distDependencies" : [
+        "JVMCI_SERVICE",
+      ],
     },
   },
 }