Mercurial > hg > truffle
changeset 21277:2b8fb2b8b586
Fix JAVA_HOME and EXTRA_JAVA_HOMES was not passed to eclipse builders anymore causing them to fail silently.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 11 May 2015 10:48:14 +0200 |
parents | 9f6733155647 |
children | f026cf83c2bb |
files | mxtool/mx.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Sat May 09 12:35:54 2015 +0200 +++ b/mxtool/mx.py Mon May 11 10:48:14 2015 +0200 @@ -4157,8 +4157,8 @@ launchOut.open('launchConfiguration', {'type' : 'org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'}) launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.capture_output', 'value': consoleOn}) launchOut.open('mapAttribute', {'key' : 'org.eclipse.debug.core.environmentVariables'}) - launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : _opts.java_home}) - launchOut.element('mapEntry', {'key' : 'EXTRA_JAVA_HOMES', 'value' : _opts.extra_java_homes}) + launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : _default_java_home.jdk}) + launchOut.element('mapEntry', {'key' : 'EXTRA_JAVA_HOMES', 'value' : os.pathsep.join([extraJavaHome.jdk for extraJavaHome in _extra_java_homes])}) launchOut.close('mapAttribute') if refresh: