Mercurial > hg > truffle
diff mxtool/mx.py @ 8447:b6b9ab1fde62
removed support for using the Eclipse batch compiler bundled with Eclipse - depending on the version, it has bugs with respect to annotation processing
To use the Eclipse batch compiler, a stand alone ecj-<version>.jar should be downloaded and copied to mx/ecj.jar.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 22 Mar 2013 15:20:16 +0100 |
| parents | 39c7142e7aef |
| children | b27261747964 |
line wrap: on
line diff
--- a/mxtool/mx.py Fri Mar 22 15:08:29 2013 +0100 +++ b/mxtool/mx.py Fri Mar 22 15:20:16 2013 +0100 @@ -133,7 +133,7 @@ """ import sys, os, errno, time, subprocess, shlex, types, urllib2, contextlib, StringIO, zipfile, signal, xml.sax.saxutils, tempfile -import shutil, fnmatch, re, xml.dom.minidom +import shutil, re, xml.dom.minidom from collections import Callable from threading import Thread from argparse import ArgumentParser, REMAINDER @@ -1345,7 +1345,7 @@ parser.add_argument('--only', action='store', help='comma separated projects to build, without checking their dependencies (omit to build all projects)') parser.add_argument('--no-java', action='store_false', dest='java', help='do not build Java projects') parser.add_argument('--no-native', action='store_false', dest='native', help='do not build native projects') - parser.add_argument('--jdt', help='Eclipse installation or path to ecj.jar for using the Eclipse batch compiler (default: ' + defaultEcjPath + ')', default=defaultEcjPath, metavar='<path>') + parser.add_argument('--jdt', help='path to ecj.jar, the Eclipse batch compiler (default: ' + defaultEcjPath + ')', default=defaultEcjPath, metavar='<path>') parser.add_argument('--jdt-warning-as-error', action='store_true', help='convert all Eclipse batch compiler warnings to errors') if suppliedParser: @@ -1360,11 +1360,6 @@ if not exists(jdtJar) and os.path.abspath(jdtJar) == os.path.abspath(defaultEcjPath): # Silently ignore JDT if default location is used but not ecj.jar exists there jdtJar = None - elif isdir(args.jdt): - plugins = join(args.jdt, 'plugins') - choices = [f for f in os.listdir(plugins) if fnmatch.fnmatch(f, 'org.eclipse.jdt.core_*.jar')] - if len(choices) != 0: - jdtJar = join(plugins, sorted(choices, reverse=True)[0]) built = set()