Mercurial > hg > truffle
diff mx/mx_graal.py @ 16417:9fe3cb463079
mx: classpath function now accepts distributions as well (which are prepend to the class path)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 07 Jul 2014 14:51:53 +0200 |
| parents | ad431bf0de07 |
| children | 7520833c6e7f |
line wrap: on
line diff
--- a/mx/mx_graal.py Mon Jul 07 12:16:36 2014 +0200 +++ b/mx/mx_graal.py Mon Jul 07 14:51:53 2014 +0200 @@ -1899,7 +1899,7 @@ def sl(args): """run an SL program""" vmArgs, slArgs = _extract_VM_args(args) - vm(vmArgs + ['-cp', mx.classpath("com.oracle.truffle.sl"), "com.oracle.truffle.sl.SLMain"] + slArgs) + vm(vmArgs + ['-cp', mx.classpath(["TRUFFLE", "com.oracle.truffle.sl"]), "com.oracle.truffle.sl.SLMain"] + slArgs) def isGraalEnabled(vm): return vm != 'original' and not vm.endswith('nograal') @@ -2075,7 +2075,7 @@ cmd = ['-jar', findbugsJar, '-textui', '-low', '-maxRank', '15'] if sys.stdout.isatty(): cmd.append('-progress') - cmd = cmd + ['-auxclasspath', mx.classpath([p.name for p in nonTestProjects]), '-output', findbugsResults, '-exitcode'] + args + outputDirs + cmd = cmd + ['-auxclasspath', mx.classpath(['GRAAL'] + [p.name for p in nonTestProjects]), '-output', findbugsResults, '-exitcode'] + args + outputDirs exitcode = mx.run_java(cmd, nonZeroIsFatal=False) if exitcode != 0: with open(findbugsResults) as fp: