am c9690e66: am ae9d88fb: am 855db6db: Fix build
* commit 'c9690e66c63f5270e3bce6e58fda20661d35c4b6':
Fix build
diff --git a/build.gradle b/build.gradle
index 79d856e..382e10d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@
String findToolsJar() {
new ByteArrayOutputStream().withStream { os ->
project.exec {
- executable "$rootDir/build/core/find-jdk-tools-jar.sh"
+ executable "../../build/core/find-jdk-tools-jar.sh"
standardOutput = os
}
@@ -22,9 +22,27 @@
}
}
-dependencies {
- compile files(findToolsJar())
- compile project(path: ':antlr', configuration: 'antlrRuntime')
- compile project(':jsilver')
- compile project(':tagsoup')
-}
\ No newline at end of file
+
+if (project.hasProperty("usePrebuilts") && project.usePrebuilts == "true") {
+ repositories {
+ maven { url '../../prebuilts/tools/common/m2/repository' }
+ }
+
+ dependencies {
+ compile files(findToolsJar())
+ compile files('../../prebuilts/misc/common/antlr/antlr-3.4-complete.jar')
+ compile 'com.google.jsilver:jsilver:1.0.0'
+ // TODO add tagsoup to prebuils to fully support building using prebuilts
+ compile project(':tagsoup')
+ // required by jsilver
+ compile 'com.google.guava:guava:15.0'
+ //compile project(path: ':junit', configuration: 'target')
+ }
+} else {
+ dependencies {
+ compile files(findToolsJar())
+ compile project(path: ':antlr', configuration: 'antlrRuntime')
+ compile project(':jsilver')
+ compile project(':tagsoup')
+ }
+}
diff --git a/src/com/google/doclava/Errors.java b/src/com/google/doclava/Errors.java
index 84df16b..156de66 100644
--- a/src/com/google/doclava/Errors.java
+++ b/src/com/google/doclava/Errors.java
@@ -172,6 +172,7 @@
public static final Error INVALID_CONTENT_TYPE = new Error(119, ERROR);
public static final Error INVALID_SAMPLE_INDEX = new Error(120, ERROR);
public static final Error HIDDEN_TYPE_PARAMETER = new Error(121, HIDDEN);
+ public static final Error PRIVATE_SUPERCLASS = new Error(122, ERROR);
public static final Error[] ERRORS =
{UNRESOLVED_LINK, BAD_INCLUDE_TAG, UNKNOWN_TAG, UNKNOWN_PARAM_TAG_NAME,
@@ -183,7 +184,7 @@
CHANGED_TRANSIENT, CHANGED_VOLATILE, CHANGED_TYPE, CHANGED_VALUE, CHANGED_SUPERCLASS,
CHANGED_SCOPE, CHANGED_ABSTRACT, CHANGED_THROWS, CHANGED_NATIVE, CHANGED_CLASS,
CHANGED_DEPRECATED, CHANGED_SYNCHRONIZED, ADDED_FINAL_UNINSTANTIABLE, REMOVED_FINAL,
- BROKEN_SINCE_FILE, INVALID_CONTENT_TYPE, HIDDEN_TYPE_PARAMETER};
+ BROKEN_SINCE_FILE, INVALID_CONTENT_TYPE, HIDDEN_TYPE_PARAMETER, PRIVATE_SUPERCLASS};
public static boolean setErrorLevel(int code, int level) {
for (Error e : ERRORS) {
diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index bc5e586..44f1277 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -294,6 +294,10 @@
+ " stripped of unavailable superclass " + supr.qualifiedName());
} else {
cantStripThis(supr, notStrippable, "6:" + cl.realSuperclass().name() + cl.qualifiedName());
+ if (supr.isPrivate()) {
+ Errors.error(Errors.PRIVATE_SUPERCLASS, cl.position(), "Public class "
+ + cl.qualifiedName() + " extends private class " + supr.qualifiedName());
+ }
}
}
}