changeset 21981:da5e694d2b3c

Using groupId=com.oracle.[suite.name] when deploying the artifacts. Iterating thru all distributions (except ap ones). Using name of the JAR file as artifactId.
author Jaroslav Tulach <jaroslav.tulach@oracle.com>
date Fri, 26 Jun 2015 14:09:56 +0200
parents cf1503da2456
children 6691b182e1a1
files mx.truffle/mx_truffle.py mx.truffle/suite.py
diffstat 2 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mx.truffle/mx_truffle.py	Fri Jun 26 09:42:29 2015 +0200
+++ b/mx.truffle/mx_truffle.py	Fri Jun 26 14:09:56 2015 +0200
@@ -1206,10 +1206,18 @@
 
 def maven_install_truffle(args):
     """install Truffle into your local Maven repository"""
-    for name in ['TRUFFLE', 'TRUFFLE_TCK', 'TRUFFLE_DSL_PROCESSOR', 'TRUFFLE_SL']:
+    for name in mx._dists:
+        dist = mx._dists[name]
+        if dist.isProcessorDistribution:
+            continue
         mx.archive(["@" + name])
-        path = mx._dists[name].path
-        mx.run(['mvn', 'install:install-file', '-DgroupId=com.oracle', '-DartifactId=' + name.lower(), '-Dversion=' + graal_version('SNAPSHOT'), '-Dpackaging=jar', '-Dfile=' + path])
+        path = dist.path
+        slash = path.rfind('/')
+        dot = path.rfind('.')
+        if dot <= slash:
+            raise Exception('Dot should be after / in ' + path)
+        artifactId = path[slash + 1: dot]
+        mx.run(['mvn', 'install:install-file', '-DgroupId=com.oracle.' + dist.suite.name, '-DartifactId=' + artifactId, '-Dversion=' + graal_version('SNAPSHOT'), '-Dpackaging=jar', '-Dfile=' + path])
 
 def c1visualizer(args):
     """run the Cl Compiler Visualizer"""
--- a/mx.truffle/suite.py	Fri Jun 26 09:42:29 2015 +0200
+++ b/mx.truffle/suite.py	Fri Jun 26 14:09:56 2015 +0200
@@ -329,7 +329,7 @@
     # ------------- Distributions -------------
 
     "TRUFFLE" : {
-      "path" : "build/truffle.jar",
+      "path" : "build/truffle-api.jar",
       "subDir" : "truffle",
       "sourcesPath" : "build/truffle.src.zip",
       "javaCompliance" : "1.7",