Mercurial > hg > truffle
changeset 13952:b076b5c13c3f
mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments.
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Fri, 14 Feb 2014 15:09:57 +0100 |
| parents | 392b6ac8da36 |
| children | d587baa55dd7 |
| files | mx/mx_graal.py mxtool/mx.py |
| diffstat | 2 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/mx_graal.py Thu Feb 13 17:59:27 2014 +0100 +++ b/mx/mx_graal.py Fri Feb 14 15:09:57 2014 +0100 @@ -729,10 +729,6 @@ mx.expand_project_in_args(args) if _make_eclipse_launch: mx.make_eclipse_launch(args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True)) - if len([a for a in args if 'PrintAssembly' in a]) != 0: - hsdis([], copyToDir=_vmLibDirInJdk(jdk)) - if mx.java().debug_port is not None: - args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(mx.java().debug_port)] + args if _jacoco == 'on' or _jacoco == 'append': jacocoagent = mx.library("JACOCOAGENT", True) # Exclude all compiler tests and snippets @@ -750,9 +746,6 @@ 'destfile' : 'jacoco.exec' } args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args - if '-d64' not in args: - args = ['-d64'] + args - exe = join(jdk, 'bin', mx.exe_suffix('java')) pfx = _vm_prefix.split() if _vm_prefix is not None else [] @@ -761,6 +754,7 @@ if len(ignoredArgs) > 0: mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs)) + args = mx.java().processArgs(args) return (pfx, exe, vm, args, cwd) def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):
--- a/mxtool/mx.py Thu Feb 13 17:59:27 2014 +0100 +++ b/mxtool/mx.py Fri Feb 14 15:09:57 2014 +0100 @@ -990,7 +990,7 @@ self.add_argument('-d', action='store_const', const=8000, dest='java_dbg_port', help='alias for "-dbg 8000"') self.add_argument('--cp-pfx', dest='cp_prefix', help='class path prefix', metavar='<arg>') self.add_argument('--cp-sfx', dest='cp_suffix', help='class path suffix', metavar='<arg>') - self.add_argument('--J', dest='java_args', help='Java VM arguments (e.g. --J @-dsa)', metavar='@<args>', default='-ea -Xss2m -Xmx1g') + self.add_argument('--J', dest='java_args', help='Java VM arguments (e.g. --J @-dsa)', metavar='@<args>') self.add_argument('--Jp', action='append', dest='java_args_pfx', help='prefix Java VM arguments (e.g. --Jp @-dsa)', metavar='@<args>', default=[]) self.add_argument('--Ja', action='append', dest='java_args_sfx', help='suffix Java VM arguments (e.g. --Ja @-dsa)', metavar='@<args>', default=[]) self.add_argument('--user-home', help='users home directory', metavar='<path>', default=os.path.expanduser('~')) @@ -1310,7 +1310,7 @@ def delAtAndSplit(s): return shlex.split(s.lstrip('@')) - self.java_args = delAtAndSplit(_opts.java_args) + self.java_args = delAtAndSplit(_opts.java_args) if _opts.java_args else [] self.java_args_pfx = sum(map(delAtAndSplit, _opts.java_args_pfx), []) self.java_args_sfx = sum(map(delAtAndSplit, _opts.java_args_sfx), []) @@ -1335,10 +1335,13 @@ def format_cmd(self, args, addDefaultArgs): if addDefaultArgs: - return [self.java] + self.java_args_pfx + self.java_args + self.java_args_sfx + args + return [self.java] + self.processArgs(args) else: return [self.java] + args + def processArgs(self, args): + return self.java_args_pfx + self.java_args + self.java_args_sfx + args + def bootclasspath(self): if self._bootclasspath is None: tmpDir = tempfile.mkdtemp()