Mercurial > hg > truffle

changeset 13481:d3bd7a3bbb2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added support for JDT environment variable which forces all Java source compilation to use the Eclipse batch compiler, including compilation as part of other commands such as eclipseinit
author Doug Simon <doug.simon@oracle.com>
date Thu, 26 Dec 2013 14:13:55 +0100
parents 6215ff792647
children 7824f0c4dfcd
files mxtool/mx.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Thu Dec 26 12:07:07 2013 +0100
+++ b/mxtool/mx.py	Thu Dec 26 14:13:55 2013 +0100
@@ -1832,7 +1832,7 @@
 
     javaCompliance = java().javaCompliance
 
-    defaultEcjPath = join(_primary_suite.mxDir, 'ecj.jar')
+    defaultEcjPath = get_env('JDT', join(_primary_suite.mxDir, 'ecj.jar'))
 
     parser = parser if parser is not None else ArgumentParser(prog='mx build')
     parser.add_argument('-f', action='store_true', dest='force', help='force build (disables timestamp checking)')
@@ -1855,7 +1855,7 @@
     if args.jdt is not None:
         if args.jdt.endswith('.jar'):
             jdtJar = args.jdt
-            if not exists(jdtJar) and os.path.abspath(jdtJar) == os.path.abspath(defaultEcjPath):
+            if not exists(jdtJar) and os.path.abspath(jdtJar) == os.path.abspath(defaultEcjPath) and get_env('JDT', None) is None:
                 # Silently ignore JDT if default location is used but not ecj.jar exists there
                 jdtJar = None