Skip to content
Browse files

Added script to sync from svn

Change-Id: I23f41841e853764523dc414996128d65b16eefb6
  • Loading branch information...
1 parent 920dbbb commit 9ccd9e3a9df835dc134e7edd2e4236220aed401e Ben Dodson committed Aug 6, 2010
View
17 NOTICE
@@ -1,3 +1,20 @@
+
+ Copyright (C) 2010 Google Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+======================================================================
jQuery 1.2.6 - New Wave Javascript
View
2 build.xml
@@ -33,7 +33,7 @@
<mkdir dir="${jar.dir}"/>
<copy todir="build/classes/assets">
- <fileset dir="assets"/>
+ <fileset dir="res/assets"/>
</copy>
<jar jarfile="${jar.file}" manifest="src/MANIFEST.mf">
View
23 moe.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# A simple script to import the latest code for Doclava and repackage it
+# for the Android build system. Repackaging involves:
+# * Removing the lib/ directory- jsilver is built from source, and
+# ant is not used.
+# * Removing the ant DoclavaTask task (so we don't require ant to build)
+
+rm -fr res/ src/ && svn export --force https://doclava.googlecode.com/svn/trunk/ . && rm -fr lib/ samples/ src/com/google/doclava/DoclavaTask.java
View
2 src/com/google/doclava/Comment.java
@@ -296,7 +296,7 @@ private void initImpl() {
isDeprecated();
// Don't bother parsing text if we aren't generating documentation.
- if (Doclava.generatingDocs()) {
+ if (Doclava.parseComments()) {
parseRegex(mText);
parseBriefTags();
} else {
View
19 src/com/google/doclava/Doclava.java
@@ -73,7 +73,8 @@
public static String title = "";
public static SinceTagger sinceTagger = new SinceTagger();
public static FederationTagger federationTagger = new FederationTagger();
- private static boolean generatingDocs = true;
+ private static boolean generateDocs = true;
+ private static boolean parseComments = false;
public static JSilver jSilver = null;
@@ -82,10 +83,11 @@ public static boolean checkLevel(int level) {
}
/**
- * Returns true if we are generating html reference documentation.
+ * Returns true if we should parse javadoc comments,
+ * reporting errors in the process.
*/
- public static boolean generatingDocs() {
- return generatingDocs;
+ public static boolean parseComments() {
+ return generateDocs || parseComments;
}
public static boolean checkLevel(boolean pub, boolean prot, boolean pkgp, boolean priv,
@@ -189,7 +191,9 @@ public static boolean start(RootDoc r) {
} else if (a[0].equals("-apixml")) {
apiFile = a[1];
} else if (a[0].equals("-nodocs")) {
- generatingDocs = false;
+ generateDocs = false;
+ } else if (a[0].equals("-parsecomments")) {
+ parseComments = true;
} else if (a[0].equals("-since")) {
sinceTagger.addVersion(a[1], a[2]);
} else if (a[0].equals("-offlinemode")) {
@@ -210,7 +214,7 @@ public static boolean start(RootDoc r) {
// Set up the data structures
Converter.makeInfo(r);
- if (generatingDocs) {
+ if (generateDocs) {
ClearPage.addBundledTemplateDir("assets/customizations");
ClearPage.addBundledTemplateDir("assets/templates");
@@ -448,6 +452,9 @@ public static int optionLength(String option) {
if (option.equals("-nodocs")) {
return 1;
}
+ if (option.equals("-parsecomments")) {
+ return 1;
+ }
if (option.equals("-since")) {
return 3;
}
View
90 src/com/google/doclava/Errors.java
@@ -121,50 +121,52 @@ public String toString() {
}
}
- public static final Error UNRESOLVED_LINK = new Error(1, WARNING);
- public static final Error BAD_INCLUDE_TAG = new Error(2, WARNING);
- public static final Error UNKNOWN_TAG = new Error(3, WARNING);
- public static final Error UNKNOWN_PARAM_TAG_NAME = new Error(4, WARNING);
- public static final Error UNDOCUMENTED_PARAMETER = new Error(5, HIDDEN);
- public static final Error BAD_ATTR_TAG = new Error(6, ERROR);
- public static final Error BAD_INHERITDOC = new Error(7, HIDDEN);
- public static final Error HIDDEN_LINK = new Error(8, WARNING);
- public static final Error HIDDEN_CONSTRUCTOR = new Error(9, WARNING);
- public static final Error UNAVAILABLE_SYMBOL = new Error(10, ERROR);
- public static final Error HIDDEN_SUPERCLASS = new Error(11, WARNING);
- public static final Error DEPRECATED = new Error(12, HIDDEN);
- public static final Error DEPRECATION_MISMATCH = new Error(13, WARNING);
- public static final Error MISSING_COMMENT = new Error(14, WARNING);
- public static final Error IO_ERROR = new Error(15, HIDDEN);
- public static final Error NO_SINCE_DATA = new Error(16, HIDDEN);
- public static final Error NO_FEDERATION_DATA = new Error(17, WARNING);
-
- public static final Error PARSE_ERROR = new Error(18, ERROR); // Apicheck error code 1
- public static final Error ADDED_PACKAGE = new Error(19, WARNING); // Apicheck error code 2
- public static final Error ADDED_CLASS = new Error(20, WARNING); // Apicheck error code 3
- public static final Error ADDED_METHOD = new Error(21, WARNING); // Apicheck error code 4
- public static final Error ADDED_FIELD = new Error(22, WARNING); // Apicheck error code 5
- public static final Error ADDED_INTERFACE = new Error(23, WARNING); // Apicheck error code 6
- public static final Error REMOVED_PACKAGE = new Error(24, WARNING); // Apicheck error code 7
- public static final Error REMOVED_CLASS = new Error(25, WARNING); // Apicheck error code 8
- public static final Error REMOVED_METHOD = new Error(26, WARNING); // Apicheck error code 9
- public static final Error REMOVED_FIELD = new Error(27, WARNING); // Apicheck error code 10
- public static final Error REMOVED_INTERFACE = new Error(28, WARNING); // Apicheck error code 11
- public static final Error CHANGED_STATIC = new Error(29, WARNING); // Apicheck error code 12
- public static final Error CHANGED_FINAL = new Error(30, WARNING); // Apicheck error code 13
- public static final Error CHANGED_TRANSIENT = new Error(31, WARNING); // Apicheck error code 14
- public static final Error CHANGED_VOLATILE = new Error(32, WARNING); // Apicheck error code 15
- public static final Error CHANGED_TYPE = new Error(33, WARNING); // Apicheck error code 16
- public static final Error CHANGED_VALUE = new Error(34, WARNING); // Apicheck error code 17
- public static final Error CHANGED_SUPERCLASS = new Error(35, WARNING); // Apicheck error code 18
- public static final Error CHANGED_SCOPE = new Error(36, WARNING); // Apicheck error code 19
- public static final Error CHANGED_ABSTRACT = new Error(37, WARNING); // Apicheck error code 20
- public static final Error CHANGED_THROWS = new Error(38, WARNING); // Apicheck error code 21
- public static final Error CHANGED_NATIVE = new Error(39, HIDDEN); // Apicheck error code 22
- public static final Error CHANGED_CLASS = new Error(40, WARNING); // Apicheck error code 23
- public static final Error CHANGED_DEPRECATED = new Error(41, WARNING); // Apicheck error code 24
- public static final Error CHANGED_SYNCHRONIZED = new Error(42, ERROR); // Apicheck error code 25
-
+ // Errors for API verification
+ public static Error PARSE_ERROR = new Error(1, ERROR);
+ public static Error ADDED_PACKAGE = new Error(2, WARNING);
+ public static Error ADDED_CLASS = new Error(3, WARNING);
+ public static Error ADDED_METHOD = new Error(4, WARNING);
+ public static Error ADDED_FIELD = new Error(5, WARNING);
+ public static Error ADDED_INTERFACE = new Error(6, WARNING);
+ public static Error REMOVED_PACKAGE = new Error(7, WARNING);
+ public static Error REMOVED_CLASS = new Error(8, WARNING);
+ public static Error REMOVED_METHOD = new Error(9, WARNING);
+ public static Error REMOVED_FIELD = new Error(10, WARNING);
+ public static Error REMOVED_INTERFACE = new Error(11, WARNING);
+ public static Error CHANGED_STATIC = new Error(12, WARNING);
+ public static Error CHANGED_FINAL = new Error(13, WARNING);
+ public static Error CHANGED_TRANSIENT = new Error(14, WARNING);
+ public static Error CHANGED_VOLATILE = new Error(15, WARNING);
+ public static Error CHANGED_TYPE = new Error(16, WARNING);
+ public static Error CHANGED_VALUE = new Error(17, WARNING);
+ public static Error CHANGED_SUPERCLASS = new Error(18, WARNING);
+ public static Error CHANGED_SCOPE = new Error(19, WARNING);
+ public static Error CHANGED_ABSTRACT = new Error(20, WARNING);
+ public static Error CHANGED_THROWS = new Error(21, WARNING);
+ public static Error CHANGED_NATIVE = new Error(22, HIDDEN);
+ public static Error CHANGED_CLASS = new Error(23, WARNING);
+ public static Error CHANGED_DEPRECATED = new Error(24, WARNING);
+ public static Error CHANGED_SYNCHRONIZED = new Error(25, ERROR);
+
+ // Errors in javadoc generation
+ public static final Error UNRESOLVED_LINK = new Error(101, WARNING);
+ public static final Error BAD_INCLUDE_TAG = new Error(102, WARNING);
+ public static final Error UNKNOWN_TAG = new Error(103, WARNING);
+ public static final Error UNKNOWN_PARAM_TAG_NAME = new Error(104, WARNING);
+ public static final Error UNDOCUMENTED_PARAMETER = new Error(105, HIDDEN);
+ public static final Error BAD_ATTR_TAG = new Error(106, ERROR);
+ public static final Error BAD_INHERITDOC = new Error(107, HIDDEN);
+ public static final Error HIDDEN_LINK = new Error(108, WARNING);
+ public static final Error HIDDEN_CONSTRUCTOR = new Error(109, WARNING);
+ public static final Error UNAVAILABLE_SYMBOL = new Error(110, ERROR);
+ public static final Error HIDDEN_SUPERCLASS = new Error(111, WARNING);
+ public static final Error DEPRECATED = new Error(112, HIDDEN);
+ public static final Error DEPRECATION_MISMATCH = new Error(113, WARNING);
+ public static final Error MISSING_COMMENT = new Error(114, WARNING);
+ public static final Error IO_ERROR = new Error(115, HIDDEN);
+ public static final Error NO_SINCE_DATA = new Error(116, HIDDEN);
+ public static final Error NO_FEDERATION_DATA = new Error(117, WARNING);
+
public static final Error[] ERRORS =
{UNRESOLVED_LINK, BAD_INCLUDE_TAG, UNKNOWN_TAG, UNKNOWN_PARAM_TAG_NAME,
UNDOCUMENTED_PARAMETER, BAD_ATTR_TAG, BAD_INHERITDOC, HIDDEN_LINK, HIDDEN_CONSTRUCTOR,
View
2 src/com/google/doclava/TypeInfo.java
@@ -265,7 +265,7 @@ void setIsWildcard(boolean b) {
}
static HashSet<String> typeVariables(TypeInfo[] params) {
- return typeVariables(params, new HashSet());
+ return typeVariables(params, new HashSet<String>());
}
static HashSet<String> typeVariables(TypeInfo[] params, HashSet<String> result) {

0 comments on commit 9ccd9e3

Please sign in to comment.
Something went wrong with that request. Please try again.