// Static Entry Point /////////////////////////////////////////////////////
public static void main(String[] args) throws IOException {
- boolean verbose = false;
+ boolean verbose = false, veryverbose = false;
List srcdir = new ArrayList();
String source = null, target = null, blddir = null, mainclass = null;
boolean buildjar = false;
case 'd':
if (i == args.length - 1) {
System.out.println("Missing parameter: "+args[i]); return; }
- if (blddir != null) { System.err.println("cannot specify both -d and -j"); return; }
+ if (blddir != null) { System.out.println("cannot specify both -d and -j"); return; }
blddir = args[++i];
break;
case 'j':
if (i == args.length - 1) {
System.out.println("Missing parameter: "+args[i]); return; }
- if (blddir != null) { System.err.println("cannot specify both -d and -j"); return; }
+ if (blddir != null) { System.out.println("cannot specify both -d and -j"); return; }
blddir = args[++i];
buildjar = true;
break;
case 'v':
verbose = true;
break;
+ case 'V':
+ veryverbose = true;
+ break;
case 'h':
printHelp(); return;
c.setSourceDirs(s);
c.setVerbose(verbose);
+ c.setVeryVerbose(veryverbose);
c.compile();
}
private static void printHelp() {
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(" -V Very Verbose output.");
System.out.println(" -h or --help Print this message.");
System.out.println("");
}
private PrintWriter warn;
private boolean hasErrors;
private boolean verbose = false;
+ private boolean veryverbose = false;
public Compiler() {
List defs = Collections.EMPTY_LIST;
public void setTarget(String v) { settings.put(CompilerOptions.OPTION_TargetPlatform, v); }
public void setVerbose(boolean v) { verbose = v; }
+ public void setVeryVerbose(boolean v) { veryverbose = v; }
public void compile() throws IOException {
List s = new ArrayList();
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]);
+ if (veryverbose) System.out.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");
+ if (veryverbose) System.out.println("working with "+s.size() +" sources");
sources = new Source[s.size()]; s.toArray(sources);
ICompilationUnit[] units = new ICompilationUnit[s.size()];
int u = 0; for (int i=0; i < sources.length; i++)
final INameEnvironment env = new INameEnvironment() {
public NameEnvironmentAnswer findType(char[][] c) { return findType(name(c), pack(c)); }
public NameEnvironmentAnswer findType(char[] n, char[][] p) {
- if (verbose) System.out.print("findType: "+ str(p, '.') + "."+new String(n));
+ if (veryverbose) System.out.print("findType: "+ str(p, '.') + "."+new String(n));
try {
Class c = Class.forName(str(p, '.') + '.' + new String(n));
- if (verbose) System.out.println(" found in classloader: "+ c);
+ if (veryverbose) System.out.println(" found in classloader: "+ c);
IBinaryType b = (IBinaryType)loaded.get(c);
if (b == null) loaded.put(c, b = new LoadedClass(c));
return new NameEnvironmentAnswer(b);
// cut out searches for java.* packages in sources list
if (p.length > 0 && eq(p[0], "java".toCharArray())) {
- if (verbose) System.out.println(" not found, unknown java.*");
+ if (veryverbose) System.out.println(" not found, unknown java.*");
return null;
}
Source s = sources[i];
if (eq(n, s.n) && eq(p, s.p)) {
if (s.reader != null) {
- if (verbose) System.out.println(" found reader");
+ if (veryverbose) System.out.println(" found reader");
return new NameEnvironmentAnswer(s.reader);
}
if (s.compiled != null) {
- if (verbose) System.out.println(" found compiled, new reader");
+ if (veryverbose) 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");
+ if (veryverbose) System.out.println(" found unit");
return new NameEnvironmentAnswer(sources[i].unit);
}
}
System.out.println("Unexpected ClassFormatException"); // FIXME
e.printStackTrace(); return null;
}
- if (verbose) System.out.println(" not found");
+ if (veryverbose) 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));
+ if (veryverbose) System.out.println("isPackage: "+ str(parent, '.') + "."+new String(name));
String parentName = str(parent, '/');
for (int i=0; i < sources.length; i++) {
if (eq(name, sources[i].n) && eq(parent, sources[i].p)) return false;
/** Used by compiler for processing compiled classes and their errors. */
private final ICompilerRequestor results = new ICompilerRequestor() {
public void acceptResult(CompilationResult result) {
- if (verbose) System.out.println("got result: "+result);
+ if (veryverbose) System.out.println("got result: "+result);
if (result.hasProblems()) {
boolean err = false;
IProblem[] p = result.getProblems();
}
ClassFile[] c = result.getClassFiles();
+ String clearing = "\r";
for (int i=0; i < c.length; i++) {
try {
char[][] name = c[i].getCompoundName();
+ if (verbose) {
+ String pct = "";
+ /*+ percent;
+ percent++;
+ while (pct.length() < 2) pct = " " + pct;
+ pct = "(" + pct + "%) ";
+ */
+ String printme = " writing: " + pct + str(pack(name),'.') + "." + new String(name(name));
+ if (clearing.length() < printme.length()) clearing = "";
+ else clearing = clearing.substring(0, clearing.length() - printme.length());
+ System.out.print(printme + clearing + "\r");
+ for(clearing = ""; clearing.length() < printme.length() + 2; clearing += " ");
+ }
if (buildzip) {
try {
jarfile.putNextEntry(new ZipEntry(str(pack(name), '/') + "/" + new String(name(name)) + ".class"));
} catch (java.util.zip.ZipException ze) {
// HACK: horrendous hack
if (ze.getMessage().indexOf("duplicate entry") != -1) {
- System.err.println("compiler emitted class twice: " + new String(name(name)));
+ //System.out.println("compiler emitted class twice: " + new String(name(name)));
} else {
throw ze;
}
}
};
+ int percent = 0;
+
/** Problem creater for compiler. */
private final IProblemFactory problems = new DefaultProblemFactory();