Mercurial > hg > truffle
diff mx/commands.py @ 4178:d1b26c17910a
Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 02 Jan 2012 21:52:23 +0100 |
| parents | c843578c269d |
| children | fa6b78681c54 |
line wrap: on
line diff
--- a/mx/commands.py Mon Jan 02 17:47:48 2012 +0100 +++ b/mx/commands.py Mon Jan 02 21:52:23 2012 +0100 @@ -152,10 +152,13 @@ 'xalan' ] - dacapo = mx.check_get_env('DACAPO_CP') + dacapo = mx.get_env('DACAPO_CP') + if dacapo is None: + dacapo = _graal_home + r'/lib/dacapo-9.12-bach.jar' + if not isfile(dacapo) or not dacapo.endswith('.jar'): mx.abort('Specified DaCapo jar file does not exist or is not a jar file: ' + dacapo) - + vmOpts = ['-Xms1g', '-Xmx2g', '-cp', dacapo] selected = [] @@ -597,6 +600,6 @@ mx.abort('Requires Java version 1.7 or greater, got version ' + version) if (_vmSourcesAvailable): - global _vmbuild - if not opts.vmbuild is None: + if hasattr(opts, 'vmbuild'): + global _vmbuild _vmbuild = opts.vmbuild