Mercurial > hg > truffle

comparison mxtool/mx.py @ 21277:2b8fb2b8b586

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fbe449ca9707
children f9883cab4580
comparison
equal deleted inserted replaced
21276:9f6733155647 21277:2b8fb2b8b586
4155 launchOut = XMLDoc() 4155 launchOut = XMLDoc()
4156 consoleOn = 'true' if logToConsole else 'false' 4156 consoleOn = 'true' if logToConsole else 'false'
4157 launchOut.open('launchConfiguration', {'type' : 'org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'}) 4157 launchOut.open('launchConfiguration', {'type' : 'org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'})
4158 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.capture_output', 'value': consoleOn}) 4158 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.capture_output', 'value': consoleOn})
4159 launchOut.open('mapAttribute', {'key' : 'org.eclipse.debug.core.environmentVariables'}) 4159 launchOut.open('mapAttribute', {'key' : 'org.eclipse.debug.core.environmentVariables'})
4160 launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : _opts.java_home}) 4160 launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : _default_java_home.jdk})
4161 launchOut.element('mapEntry', {'key' : 'EXTRA_JAVA_HOMES', 'value' : _opts.extra_java_homes}) 4161 launchOut.element('mapEntry', {'key' : 'EXTRA_JAVA_HOMES', 'value' : os.pathsep.join([extraJavaHome.jdk for extraJavaHome in _extra_java_homes])})
4162 launchOut.close('mapAttribute') 4162 launchOut.close('mapAttribute')
4163 4163
4164 if refresh: 4164 if refresh:
4165 if refreshFile is None: 4165 if refreshFile is None:
4166 refreshScope = '${project}' 4166 refreshScope = '${project}'