This simple patch: (i) fixes a NPE when running apiChecker using gwt-trunk jars, (ii) rightly excludes the source files from the gwt-api-checker.jar
Patch by: amitmanjhi
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4402 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/tools/api-checker/build.xml b/tools/api-checker/build.xml
index 8afcaea..52e8864 100755
--- a/tools/api-checker/build.xml
+++ b/tools/api-checker/build.xml
@@ -37,7 +37,6 @@
<mkdir dir="${gwt.build.lib}" />
<gwt.jar>
- <fileset dir="src" excludes="**/package.html" />
<fileset dir="${javac.out}" />
</gwt.jar>
</target>
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
index 8e2c6e5..2cc58eb 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
@@ -784,8 +784,8 @@
try {
return new JarFile(str);
} catch (IOException ex) {
- System.err.println("exception in getting jar from name "
- + ex.getMessage());
+ System.err.println("exception in getting jar from fileName: " + str
+ + ", message: " + ex.getMessage());
return null;
}
}
@@ -858,7 +858,7 @@
"com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang",
"com/google/gwt/lang",}));
cu = new JarFileCompilationUnits(new JarFile[] {gwtDevJar},
- gwtIncludedPaths, null, logger);
+ gwtIncludedPaths, new HashSet<String>(), logger);
units.addAll(cu.getCompilationUnits());
return units;
}
