Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
4177:c843578c269d | 4178:d1b26c17910a |
---|---|
150 'tradebeans', | 150 'tradebeans', |
151 'tradesoap', | 151 'tradesoap', |
152 'xalan' | 152 'xalan' |
153 ] | 153 ] |
154 | 154 |
155 dacapo = mx.check_get_env('DACAPO_CP') | 155 dacapo = mx.get_env('DACAPO_CP') |
156 if dacapo is None: | |
157 dacapo = _graal_home + r'/lib/dacapo-9.12-bach.jar' | |
158 | |
156 if not isfile(dacapo) or not dacapo.endswith('.jar'): | 159 if not isfile(dacapo) or not dacapo.endswith('.jar'): |
157 mx.abort('Specified DaCapo jar file does not exist or is not a jar file: ' + dacapo) | 160 mx.abort('Specified DaCapo jar file does not exist or is not a jar file: ' + dacapo) |
158 | 161 |
159 vmOpts = ['-Xms1g', '-Xmx2g', '-cp', dacapo] | 162 vmOpts = ['-Xms1g', '-Xmx2g', '-cp', dacapo] |
160 | 163 |
161 selected = [] | 164 selected = [] |
162 while len(args) != 0 and args[0][0] not in ['-', '@']: | 165 while len(args) != 0 and args[0][0] not in ['-', '@']: |
163 bm = args[0] | 166 bm = args[0] |
595 major = int(parts[1]) | 598 major = int(parts[1]) |
596 if not major >= 7: | 599 if not major >= 7: |
597 mx.abort('Requires Java version 1.7 or greater, got version ' + version) | 600 mx.abort('Requires Java version 1.7 or greater, got version ' + version) |
598 | 601 |
599 if (_vmSourcesAvailable): | 602 if (_vmSourcesAvailable): |
600 global _vmbuild | 603 if hasattr(opts, 'vmbuild'): |
601 if not opts.vmbuild is None: | 604 global _vmbuild |
602 _vmbuild = opts.vmbuild | 605 _vmbuild = opts.vmbuild |