Mercurial > hg > truffle
diff mxtool/mx.py @ 13247:e709633d87c6
Use java compilance from project in eclipse settings for compilance, source and target
Use java compilance for the target when building with javac
Use java compilance for the JRE_CONTAINER in eclipse .classpath
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 04 Dec 2013 14:58:13 +0100 |
parents | 68529068f08e |
children | 78ed696884b3 |
line wrap: on
line diff
--- a/mxtool/mx.py Wed Dec 04 16:03:21 2013 +0100 +++ b/mxtool/mx.py Wed Dec 04 14:58:13 2013 +0100 @@ -2011,7 +2011,7 @@ log('Compiling Java sources for {0} with javac...'.format(p.name)) - javacCmd = [java().javac, '-g', '-J-Xmx1g', '-source', compliance, '-classpath', cp, '-d', outputDir] + javacCmd = [java().javac, '-g', '-J-Xmx1g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir] if java().debug_port is not None: javacCmd += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(java().debug_port)] javacCmd += processorArgs @@ -2891,7 +2891,7 @@ out.element('classpathentry', {'kind' : 'src', 'path' : 'src_gen'}) # Every Java program depends on the JRE - out.element('classpathentry', {'kind' : 'con', 'path' : 'org.eclipse.jdt.launching.JRE_CONTAINER'}) + out.element('classpathentry', {'kind' : 'con', 'path' : 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-' + str(p.javaCompliance)}) if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project out.element('classpathentry', {'kind' : 'con', 'path' : 'org.eclipse.pde.core.requiredPlugins'})