diff options
| author | Jesse Wilson <jessewilson@google.com> | 2009-07-21 14:02:14 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2009-07-21 18:09:39 -0700 |
| commit | 289d80eee416dca7585783a584cbfcf4061a662c (patch) | |
| tree | 9c6dd21eab34f06c912e2604bc69621299fae378 /tools/droiddoc/test | |
| parent | 70a76816e5268e345a2a52d12c7c0140e9645015 (diff) | |
| download | build-289d80eee416dca7585783a584cbfcf4061a662c.zip build-289d80eee416dca7585783a584cbfcf4061a662c.tar.gz build-289d80eee416dca7585783a584cbfcf4061a662c.tar.bz2 | |
Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.
The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.
The clearsilver templates will be changed to be pretty in a follow up change.
Conflicts:
tools/droiddoc/src/DroidDoc.java
Diffstat (limited to 'tools/droiddoc/test')
| -rw-r--r-- | tools/droiddoc/test/stubs/func.sh | 7 | ||||
| -rwxr-xr-x | tools/droiddoc/test/stubs/run.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/droiddoc/test/stubs/func.sh b/tools/droiddoc/test/stubs/func.sh index 1ad4bd5..ea4fe75 100644 --- a/tools/droiddoc/test/stubs/func.sh +++ b/tools/droiddoc/test/stubs/func.sh @@ -26,21 +26,22 @@ function build_stubs() STUBS_DIR=$3 OBJ_DIR=out/stubs/$ID + PLATFORM=${HOST_OS}-${HOST_ARCH} rm -rf $OBJ_DIR &> /dev/null mkdir -p $OBJ_DIR find $SRC_DIR -name '*.java' > $OBJ_DIR/javadoc-src-list ( \ - LD_LIBRARY_PATH=out/host/darwin-x86/lib \ + LD_LIBRARY_PATH=out/host/$PLATFORM/lib \ javadoc \ \@$OBJ_DIR/javadoc-src-list \ -J-Xmx512m \ - -J-Djava.library.path=out/host/darwin-x86/lib \ + -J-Djava.library.path=out/host/$PLATFORM/lib \ \ -quiet \ -doclet DroidDoc \ - -docletpath out/host/darwin-x86/framework/clearsilver.jar:out/host/darwin-x86/framework/droiddoc.jar \ + -docletpath out/host/$PLATFORM/framework/clearsilver.jar:out/host/$PLATFORM/framework/droiddoc.jar:out/host/$PLATFORM/framework/apicheck.jar \ -templatedir tools/droiddoc/templates \ -classpath out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar \ -sourcepath $SRC_DIR:out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar \ diff --git a/tools/droiddoc/test/stubs/run.sh b/tools/droiddoc/test/stubs/run.sh index f237a7d..2ea15a6 100755 --- a/tools/droiddoc/test/stubs/run.sh +++ b/tools/droiddoc/test/stubs/run.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -DIR=tools/droiddoc/test/stubs +DIR=build/tools/droiddoc/test/stubs pushd $TOP |