comparison mx.jvmci/mx_jvmci.py @ 22170:480635800a1b

buildjmhdeps should use Graal for JAVA_HOME
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Sat, 11 Jul 2015 07:28:17 +0200
parents f9ddf6b6dd6b
children 2eff41bef7cd
comparison
equal deleted inserted replaced
22169:f9ddf6b6dd6b 22170:480635800a1b
1587 mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved') 1587 mx.log('Skipping dependency ' + groupId + '.' + artifactId + ' as ' + name + ' cannot be resolved')
1588 return 1588 return
1589 allDeps.append(name) 1589 allDeps.append(name)
1590 d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None) 1590 d = mx.Distribution(_suite, name=artifactId, subDir=_suite.dir, path=path, sourcesPath=path, deps=allDeps, mainClass=None, excludedDependencies=[], distDependencies=[], javaCompliance=None)
1591 d.make_archive() 1591 d.make_archive()
1592 env = os.environ.copy()
1593 env['JAVA_HOME'] = get_jdk(vmToCheck='server')
1594 env['MAVEN_OPTS'] = '-server -XX:-UseJVMCIClassLoader'
1592 cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId, 1595 cmd = ['mvn', 'install:install-file', '-DgroupId=' + groupId, '-DartifactId=' + artifactId,
1593 '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path] 1596 '-Dversion=1.0-SNAPSHOT', '-Dpackaging=jar', '-Dfile=' + d.path]
1594 if not mx._opts.verbose: 1597 if not mx._opts.verbose:
1595 cmd.append('-q') 1598 cmd.append('-q')
1596 if args.settings: 1599 if args.settings:
1597 cmd = cmd + ['-s', args.settings] 1600 cmd = cmd + ['-s', args.settings]
1598 mx.run(cmd) 1601 mx.run(cmd, env=env)
1599 os.unlink(d.path) 1602 os.unlink(d.path)
1600 1603
1601 jmhPath = _get_jmh_path() 1604 jmhPath = _get_jmh_path()
1602 for root, _, filenames in os.walk(jmhPath): 1605 for root, _, filenames in os.walk(jmhPath):
1603 for f in [join(root, n) for n in filenames if n == 'pom.mxdeps']: 1606 for f in [join(root, n) for n in filenames if n == 'pom.mxdeps']: