changeset 22174:a7b17cb2ce37

annotation processor dependencies must be Distributions or Libraries; inter-suite references must be qualified with suite prefix
author Doug Simon <doug.simon@oracle.com>
date Mon, 20 Jul 2015 00:25:22 +0200
parents 1a7f71d13b6e
children c09467f52cf7
files mx.jvmci/suite.py
diffstat 1 files changed, 33 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/suite.py	Sat Jul 18 11:25:01 2015 +0200
+++ b/mx.jvmci/suite.py	Mon Jul 20 00:25:22 2015 +0200
@@ -114,7 +114,7 @@
         "jdk.internal.jvmci.code",
         "jdk.internal.jvmci.service",
       ],
-      "annotationProcessors" : ["jdk.internal.jvmci.options.processor"],
+      "annotationProcessors" : ["JVMCI_OPTIONS_PROCESSOR"],
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,Debug",
     },
@@ -126,7 +126,7 @@
         "JUNIT",
         "jdk.internal.jvmci.debug",
       ],
-      "annotationProcessors" : ["jdk.internal.jvmci.options.processor"],
+      "annotationProcessors" : ["JVMCI_OPTIONS_PROCESSOR"],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,Debug,Test",
@@ -147,7 +147,7 @@
         "jdk.internal.jvmci.debug",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["jdk.internal.jvmci.options.processor"],
+      "annotationProcessors" : ["JVMCI_OPTIONS_PROCESSOR"],
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI",
     },
@@ -171,7 +171,7 @@
         "JUNIT",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["jdk.internal.jvmci.options.processor"],
+      "annotationProcessors" : ["JVMCI_OPTIONS_PROCESSOR"],
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI",
     },
@@ -206,9 +206,9 @@
         "jdk.internal.jvmci.compiler",
       ],
       "annotationProcessors" : [
-        "jdk.internal.jvmci.hotspotvmconfig.processor",
-        "jdk.internal.jvmci.options.processor",
-        "jdk.internal.jvmci.service.processor",
+        "JVMCI_HOTSPOTVMCONFIG_PROCESSOR",
+        "JVMCI_OPTIONS_PROCESSOR",
+        "JVMCI_SERVICE_PROCESSOR",
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",
@@ -241,8 +241,8 @@
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "annotationProcessors" : [
-        "jdk.internal.jvmci.hotspotvmconfig.processor",
-        "jdk.internal.jvmci.service.processor",
+        "JVMCI_HOTSPOTVMCONFIG_PROCESSOR",
+        "JVMCI_SERVICE_PROCESSOR",
       ],
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,HotSpot,AMD64",
@@ -257,8 +257,8 @@
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "annotationProcessors" : [
-        "jdk.internal.jvmci.hotspotvmconfig.processor",
-        "jdk.internal.jvmci.service.processor",
+        "JVMCI_HOTSPOTVMCONFIG_PROCESSOR",
+        "JVMCI_SERVICE_PROCESSOR",
       ],
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,HotSpot,SPARC",
@@ -272,7 +272,7 @@
         "JFR",
       ],
       "checkstyle" : "com.oracle.graal.graph",
-      "annotationProcessors" : ["jdk.internal.jvmci.service.processor"],
+      "annotationProcessors" : ["JVMCI_SERVICE_PROCESSOR"],
       "javaCompliance" : "1.8",
       "profile" : "",
       "workingSets" : "JVMCI,HotSpot",
@@ -318,5 +318,26 @@
         "JVMCI_API",
       ],
     },
+
+    "JVMCI_OPTIONS_PROCESSOR" : {
+      "path" : "build/jvmci-options-processor.jar",
+      "subDir" : "jvmci",
+      "sourcesPath" : "build/jvmci-options-processor.src.zip",
+      "dependencies" : ["jdk.internal.jvmci.options.processor"],
+    },
+
+    "JVMCI_HOTSPOTVMCONFIG_PROCESSOR" : {
+      "path" : "build/jvmci-hotspotvmconfig-processor.jar",
+      "subDir" : "jvmci",
+      "sourcesPath" : "build/jvmci-hotspotvmconfig-processor.src.zip",
+      "dependencies" : ["jdk.internal.jvmci.hotspotvmconfig.processor"],
+    },
+
+    "JVMCI_SERVICE_PROCESSOR" : {
+      "path" : "build/jvmci-service-processor.jar",
+      "subDir" : "jvmci",
+      "sourcesPath" : "build/jvmci-service-processor.src.zip",
+      "dependencies" : ["jdk.internal.jvmci.service.processor"],
+    },
   },
 }