import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
public class Compiler {
- private static final boolean DEBUG = false;
-
// Static Entry Point /////////////////////////////////////////////////////
public static void main(String[] args) {
- String source = null, target = null;
- String srcdir = null, blddir = null;
+ boolean verbose = false;
+ List srcdir = new ArrayList();
+ String source = null, target = null, blddir = null;
for (int i=0; i < args.length; i++) {
if (args[i].charAt(0) == '-') {
System.out.println("Missing parameter: "+args[i]); return; }
target = args[++i];
break;
+ case 'v':
+ verbose = true;
case 'h':
printHelp(); return;
}
- } else srcdir = args[i];
+ } else srcdir.add(args[i]);
}
Compiler c = new Compiler();
if (blddir != null) c.setBuildDir(blddir);
- if (srcdir != null) c.setSourceDir(srcdir);
if (source != null) c.setSource(source);
if (target != null) c.setTarget(target);
+
+ String[] s = new String[srcdir.size()];
+ srcdir.toArray(s);
+ c.setSourceDirs(s);
+
+ c.setVerbose(verbose);
c.compile();
}
private static void printHelp() {
- System.out.println("Usage java -cp ... org.ibex.tool.Compiler <options> <source directory>");
+ System.out.println("Usage java -cp ... org.ibex.tool.Compiler [options] <source dir> ...");
System.out.println("Options:");
System.out.println(" -d <directory> Location for generated class files.");
System.out.println(" -s <release> Compile with specified source compatibility.");
System.out.println(" -t <release> Compile with specified class file compatibility.");
+ System.out.println(" -v Verbose output.");
System.out.println(" -h or --help Print this message.");
System.out.println("");
}
private Source[] sources;
private File builddir = new File(".");
- private String sourcedir = null;
+ private String[] sourcedirs = new String[0];
+
+ private PrintWriter warn;
+ private boolean hasErrors;
+ private boolean verbose = false;
public Compiler() {
List defs = Collections.EMPTY_LIST;
public void setBuildDir(String dir) { builddir = new File(dir == null ? "." : dir); }
- public void setSourceDir(String dir) { sourcedir = dir; }
+ public void setSourceDirs(String[] dir) { sourcedirs = dir; }
/** Pass CompilerOptions.VERSION_1_*. A String of form "1.1", ".2", etc. */
public void setSource(String v) { settings.put(CompilerOptions.OPTION_Source, v); }
public void setBuilddir(File f) { builddir = f; }
+ public void setVerbose(boolean v) { verbose = v; }
+
public void compile() {
List s = new ArrayList();
- filterSources(s, new File(sourcedir), new char[0][]);
- if (DEBUG) System.out.println("working with "+s.size() +" sources");
+ for (int i=0; i < sourcedirs.length; i++) {
+ File src = new File(sourcedirs[i]);
+ if (!src.exists()) {
+ if (verbose) System.err.println("source directory not found: "+sourcedirs[i]);
+ continue;
+ }
+ filterSources(s, src, new char[0][], sourcedirs[i]);
+ }
+
+ if (verbose) System.out.println("working with "+s.size() +" sources");
sources = new Source[s.size()]; s.toArray(sources);
ICompilationUnit[] units = new ICompilationUnit[s.size()];
- for (int i=0; i < sources.length; i++) units[i] = sources[i].unit;
+ int u = 0; for (int i=0; i < sources.length; i++)
+ if (sources[i].compiled == null) units[u++] = sources[i].unit;
+ if (u != units.length) {
+ ICompilationUnit[] newu = new ICompilationUnit[u];
+ System.arraycopy(units, 0, newu, 0, u);
+ units = newu;
+ }
+
+ hasErrors = false;
+
+ StringWriter sw = new StringWriter();
+ StringBuffer w = sw.getBuffer();
+ warn = new PrintWriter(sw);
org.eclipse.jdt.internal.compiler.Compiler jdt =
new org.eclipse.jdt.internal.compiler.Compiler(
env, policy, settings, results, problems);
jdt.compile(units);
+
+ if (!hasErrors) { out.write(w.toString()); out.flush(); }
+ warn = null;
}
private final FilenameFilter filterSrcs = new FilenameFilter() {
private final FileFilter filterDirs = new FileFilter() {
public boolean accept(File path) { return path.isDirectory(); }
};
- private void filterSources(List s, File dir, char[][] pack) {
+ private byte[] bytes(File bfile) {
+ byte[] bytes = new byte[2 * 1024];
+ int pos = 0, in = 0;
+ try {
+ InputStream bin = new FileInputStream(bfile);
+ while ((in = bin.read(bytes, pos, bytes.length - pos)) != -1) {
+ pos += in;
+ if (pos == bytes.length) {
+ byte[] newbytes= new byte[pos * 2];
+ System.arraycopy(bytes, 0, newbytes, 0, pos);
+ bytes = newbytes;
+ }
+ }
+ bin.close();
+ } catch (IOException e) {
+ System.out.println("Error reading class file"); // FIXME
+ e.printStackTrace(); return null;
+ }
+
+ if (pos != bytes.length) {
+ byte[] newbytes= new byte[pos * 2];
+ System.arraycopy(bytes, 0, newbytes, 0, pos);
+ bytes = newbytes;
+ }
+
+ return bytes;
+ }
+ private void filterSources(List s, File dir, char[][] pack, String srcdir) {
+ List bclasses = new ArrayList();
+ File bdir = new File(builddir, str(pack, File.separatorChar));
+
+ // add the java files in this directory
File[] ja = dir.listFiles(filterSrcs);
- for (int i=0; i < ja.length; i++)
- s.add(new Source(ja[i], name(classname(ja[i].getName())), pack));
+ for (int i=0; i < ja.length; i++) {
+ char[] n = name(classname(ja[i].getName()));
+ Source src = new Source(ja[i], n, pack, srcdir);
+
+ // skip the file if the build version is newer than the source
+ String bclass = new String(n);
+ File bfile = new File(bdir, bclass + ".class");
+ if (bfile.lastModified() > ja[i].lastModified()) {
+ src.compiled = bytes(bfile);
+ bclasses.add(bclass);
+ }
+
+ s.add(src);
+ }
+ // process the inner classes of any binary files
+ for (int i=0; i < bclasses.size(); i++) {
+ final String bc = (String)bclasses.get(i);
+ final FilenameFilter f = new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.length() > bc.length() && name.startsWith(bc) &&
+ name.charAt(bc.length()) == '$' && name.endsWith(".class");
+ }
+ };
+ File[] bfile = bdir.listFiles(f);
+ for (int j=0; j < bfile.length; j++) {
+ Source src = new Source(bfile[j],
+ name(classname(bfile[j].getName())), pack, srcdir);
+ src.compiled = bytes(bfile[j]);
+ s.add(src);
+ }
+ }
+
+ // add the subdirectories as packages
File[] d = dir.listFiles(filterDirs);
for (int i=0; i < d.length; i++) {
char[][] newpack = new char[pack.length + 1][];
for (int j=0; j < pack.length; j++) newpack[j] = pack[j];
newpack[pack.length] = d[i].getName().toCharArray();
- filterSources(s, d[i], newpack);
+ filterSources(s, d[i], newpack, srcdir);
}
}
File orig;
char[] processed = null;
byte[] compiled = null;
+ ClassFileReader reader = null;
final ICompilationUnit unit = new ICompilationUnit() {
public char[] getMainTypeName() { return n; }
}
};
- private Source(File o, char[] n, char[][] p) {
+ private Source(File o, char[] n, char[][] p, String srcdir) {
orig = o; this.n = n; this.p = p;
- String file = sourcedir;
+ String file = srcdir;
file += File.separatorChar + str(p, File.separatorChar);
file += File.separatorChar + new String(n) + ".java";
fileName = file.toCharArray();
final INameEnvironment env = new INameEnvironment() {
public NameEnvironmentAnswer findType(char[][] c) { return findType(name(c), pack(c)); }
public NameEnvironmentAnswer findType(char[] n, char[][] p) {
- if (DEBUG) System.out.println("requesting: "+ str(p, '.') + "."+new String(n));
+ if (verbose) System.out.print("findType: "+ str(p, '.') + "."+new String(n));
try {
Class c = Class.forName(str(p, '.') + '.' + new String(n));
- if (DEBUG) System.out.println("found class: "+ c);
+ if (verbose) System.out.println(" found in classloader: "+ c);
IBinaryType b = (IBinaryType)loaded.get(c);
if (b == null) loaded.put(c, b = new LoadedClass(c));
- if (DEBUG) System.out.println("returning "+b+", name="+new String(b.getName()));
return new NameEnvironmentAnswer(b);
} catch (ClassNotFoundException e) {}
// cut out searches for java.* packages in sources list
- if (p.length > 0 && eq(p[0], "java".toCharArray())) return null;
+ if (p.length > 0 && eq(p[0], "java".toCharArray())) {
+ if (verbose) System.out.println(" not found, unknown java.*");
+ return null;
+ }
try {
- for (int i=0; i < sources.length; i++)
- if (eq(n, sources[i].n) && eq(p, sources[i].p))
- return sources[i].compiled == null ?
- new NameEnvironmentAnswer(sources[i].unit) :
- new NameEnvironmentAnswer(new ClassFileReader(sources[i].compiled,
- sources[i].orig.getName().toCharArray(), true));
+ for (int i=0; i < sources.length; i++) {
+ Source s = sources[i];
+ if (eq(n, s.n) && eq(p, s.p)) {
+ if (s.reader != null) {
+ if (verbose) System.out.println(" found reader");
+ return new NameEnvironmentAnswer(s.reader);
+ }
+ if (s.compiled != null) {
+ if (verbose) System.out.println(" found compiled, new reader");
+ s.reader = new ClassFileReader(s.compiled,
+ s.orig.getName().toCharArray(), true);
+ return new NameEnvironmentAnswer(s.reader);
+ }
+ if (verbose) System.out.println(" found unit");
+ return new NameEnvironmentAnswer(sources[i].unit);
+ }
+ }
} catch (ClassFormatException e) {
System.out.println("Unexpected ClassFormatException"); // FIXME
- e.printStackTrace();
+ e.printStackTrace(); return null;
}
+ if (verbose) System.out.println(" not found");
return null;
}
public boolean isPackage(char[][] parent, char[] name) {
+ if (verbose) System.out.println("isPackage: "+ str(parent, '.') + "."+new String(name));
String parentName = str(parent, '/');
- for (int i=0; i < sources.length; i++)
+ for (int i=0; i < sources.length; i++) {
if (eq(name, sources[i].n) && eq(parent, sources[i].p)) return false;
+ if (eq(pack(sources[i].p), parent) && eq(name(sources[i].p), name)) return true;
+ }
return
loader.getResource(parentName + ".class") == null &&
loader.getResource(parentName + '/' + new String(name) + ".class") == null;
/** Used by compiler for processing compiled classes and their errors. */
private final ICompilerRequestor results = new ICompilerRequestor() {
public void acceptResult(CompilationResult result) {
- if (DEBUG) System.out.println("got result: "+result);
+ if (verbose) System.out.println("got result: "+result);
if (result.hasProblems()) {
- boolean hasErrors = false;
+ boolean err = false;
IProblem[] p = result.getProblems();
+ PrintWriter o;
for (int i=0; i < p.length; i++) {
- out.print(p[i].getOriginatingFileName());
- out.print(':');
- out.print(p[i].getSourceLineNumber());
- out.print(':');
- if (p[i].isError()) { out.print(" error: "); hasErrors = true; }
- else out.print(" warning: ");
- out.println(p[i].getMessage());
+ if (p[i].isError()) { o = out; err = true; }
+ else o = warn;
+
+ o.print(p[i].getOriginatingFileName());
+ o.print(':');
+ o.print(p[i].getSourceLineNumber());
+ o.print(':');
+ o.print(p[i].isError() ? " error: " : " warning: ");
+ o.println(p[i].getMessage());
}
out.flush();
- if (hasErrors) return;
+ if (err) { hasErrors = true; return; }
}
ClassFile[] c = result.getClassFiles();
File path = builddir;
char[][] name = c[i].getCompoundName();
path = new File(builddir, str(pack(name), '/'));
- if (DEBUG) System.out.println("DEBUG: creating path "+path+", out of builddir="+builddir);
if (!path.exists()) path.mkdirs();
// write new class file
path = new File(path, new String(name(name)) + ".class");
- if (DEBUG) System.out.println("DEBUG: writing file "+path);
OutputStream o = new BufferedOutputStream(
new FileOutputStream(path));
o.write(c[i].getBytes());
String delim = name.indexOf('/') == -1 ? "." : "/";
name = name.trim();
if (name.endsWith(".java")) name = name.substring(0, name.length() - 5);
+ if (name.endsWith(".class")) name = name.substring(0, name.length() - 6);
if (name.startsWith(delim)) name = name.substring(1);
StringTokenizer st = new StringTokenizer(name, delim);
/** Returns true of contents of both char arrays are equal. */
private static boolean eq(char[][] c1, char[][] c2) {
+ if (c1 == null || c2 == null) return c1 == c2;
if (c1.length != c2.length) return false;
for (int i=0; i < c1.length; i++) if (!eq(c1[i], c2[i])) return false;
return true;
/** Returns true of contents of both char arrays are equal. */
private static boolean eq(char[] c1, char[] c2) {
+ if (c1 == null || c2 == null) return c1 == c2;
if (c1.length != c2.length) return false;
for (int i=0; i < c1.length; i++) if (c1[i] != c2[i]) return false;
return true;
projects / org.ibex.tool.git / blobdiff