comparison mx.graal/mx_graal.py @ 22199:5522e8ffa5f5

buildjmhdeps should use Graal for JAVA_HOME
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Fri, 10 Jul 2015 18:06:37 -0700
parents 4485282cce66
children 38d47f5c7215
comparison
equal deleted inserted replaced
22198:6f83839fcbc8 22199:5522e8ffa5f5
1793 mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved') 1793 mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved')
1794 return 1794 return
1795 allDeps.append(name) 1795 allDeps.append(name)
1796 d = mx.Distribution(graalSuite, name=artifactId, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None) 1796 d = mx.Distribution(graalSuite, name=artifactId, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None)
1797 d.make_archive() 1797 d.make_archive()
1798 env = os.environ.copy()
1799 env['JAVA_HOME'] = _jdk(vmToCheck='server')
1800 env['MAVEN_OPTS'] = '-server -XX:-UseJVMCIClassLoader'
1798 cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId, 1801 cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId,
1799 '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path] 1802 '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path]
1800 if not mx._opts.verbose: 1803 if not mx._opts.verbose:
1801 cmd.append('-q') 1804 cmd.append('-q')
1802 if args.settings: 1805 if args.settings:
1803 cmd = cmd + ['-s', args.settings] 1806 cmd = cmd + ['-s', args.settings]
1804 mx.run(cmd) 1807 mx.run(cmd, env=env)
1805 os.unlink(d.path) 1808 os.unlink(d.path)
1806 1809
1807 jmhPath = _get_jmh_path() 1810 jmhPath = _get_jmh_path()
1808 for root, _, filenames in os.walk(jmhPath): 1811 for root, _, filenames in os.walk(jmhPath):
1809 for f in [join(root, n) for n in filenames if n == 'pom.mxdeps']: 1812 for f in [join(root, n) for n in filenames if n == 'pom.mxdeps']: