Mercurial > hg > truffle
changeset 3736:d3ec27ea1b20
Work with GRAAL environment variable instead of MAXINE environment variable.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sat, 17 Dec 2011 20:48:46 +0100 |
| parents | 61369a06f03c |
| children | 9dc19b7d89a3 |
| files | .hgignore mx/commands.py src/share/vm/runtime/arguments.cpp |
| diffstat | 3 files changed, 17 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Sat Dec 17 20:36:28 2011 +0100 +++ b/.hgignore Sat Dec 17 20:48:46 2011 +0100 @@ -3,6 +3,7 @@ ^build/ ^dist/ ^java/ +^lib/ ^jdk1.7.0/` ^java64/ ^work/
--- a/mx/commands.py Sat Dec 17 20:36:28 2011 +0100 +++ b/mx/commands.py Sat Dec 17 20:48:46 2011 +0100 @@ -244,7 +244,7 @@ build = env.vmbuild if env.java_dbg: args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args - os.environ['MAXINE'] = env.check_get_env('GRAAL_HOME') + os.environ['GRAAL'] = join(env.check_get_env('GRAAL_HOME'), 'graal') exe = join(_jdk7(env, build), 'bin', env.exe_suffix('java')) return env.run([exe, vm] + args)
--- a/src/share/vm/runtime/arguments.cpp Sat Dec 17 20:36:28 2011 +0100 +++ b/src/share/vm/runtime/arguments.cpp Sat Dec 17 20:48:46 2011 +0100 @@ -2021,39 +2021,35 @@ tty->print_cr("Running Graal VM... "); } const int BUFFER_SIZE = 1024; - char maxine_dir[BUFFER_SIZE]; + char graal_dir[BUFFER_SIZE]; char temp[BUFFER_SIZE]; - if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) { - jio_fprintf(defaultStream::output_stream(), "Error while starting Graal VM: The MAXINE environment variable needs to point to a Maxine repository.\n"); + if (!os::getenv("GRAAL", graal_dir, sizeof(graal_dir))) { + jio_fprintf(defaultStream::output_stream(), "Error while starting Graal VM: The GRAAL environment variable needs to point to the directory containing the Graal projects.\n"); vm_exit(0); } - if (PrintVMOptions) tty->print_cr("MAXINE=%s", maxine_dir); + if (PrintVMOptions) tty->print_cr("GRAAL=%s", graal_dir); SysClassPath scp_compiler(Arguments::get_sysclasspath()); - sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.cri/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.criutils/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.criutils/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir); - scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.base/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.asmdis/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.graph/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.asm/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.compiler/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.graal.graph/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.nodes/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.graal.compiler/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.snippets/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.graal.nodes/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.criutils/bin", maxine_dir); - scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.extensions/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.graal.snippets/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.hotspot/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.graal.criutils/bin", graal_dir); scp_compiler.add_prefix(temp); - sprintf(temp, "%s/com.oracle.max.graal.graphviz/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.graal.hotspot/bin", graal_dir); scp_compiler.add_prefix(temp); scp_compiler.expand_endorsed(); Arguments::set_compilerclasspath(scp_compiler.combined_path());