# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1396551270 -7200
# Node ID c64cd1dd4bd16a2012fb1d8aca0a103ad14a4d65
# Parent  e1ce6c66f56e04252a46a1752c17bfa61c4dbb80
moved Maven installation of Graal dependency from build to jmh command

diff -r e1ce6c66f56e -r c64cd1dd4bd1 mx/mx_graal.py
--- a/mx/mx_graal.py	Thu Apr 03 20:53:52 2014 +0200
+++ b/mx/mx_graal.py	Thu Apr 03 20:54:30 2014 +0200
@@ -404,15 +404,6 @@
     graalJar = graalDist.path
     jdks = _jdksDir()
 
-    m2Install = mx.get_env('MAVEN_INSTALL_GRAAL_JAR', None)
-    if m2Install and m2Install.lower() == 'true':
-        cmd = ['mvn', 'install:install-file', '-q',
-               '-Dfile=' + graalJar, '-DgroupId=com.oracle.graal', '-DartifactId=graal',
-               '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar']
-        if graalDist.sourcesPath:
-            cmd = cmd + ['-Dsources=' + graalDist.sourcesPath]
-        mx.run(cmd)
-
     if exists(jdks):
         for e in os.listdir(jdks):
             jreLibDir = join(jdks, e, 'jre', 'lib')
@@ -1363,6 +1354,18 @@
 
     def _blackhole(x):
         mx.logv(x[:-1])
+
+
+    # (Re)install graal.jar into the local m2 repository since the micros-graal
+    # benchmarks have it as a dependency
+    graalDist = mx.distribution('GRAAL')
+    cmd = ['mvn', 'install:install-file', '-q',
+           '-Dfile=' + graalDist.path, '-DgroupId=com.oracle.graal', '-DartifactId=graal',
+           '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar']
+    if graalDist.sourcesPath:
+        cmd = cmd + ['-Dsources=' + graalDist.sourcesPath]
+    mx.run(cmd)
+
     mx.log("Building benchmarks...")
     mx.run(['mvn', 'package'], cwd=jmhPath, out=_blackhole)