diff options
| author | Ben Dodson <bjdodson@google.com> | 2010-08-05 15:42:37 -0700 |
|---|---|---|
| committer | Ben Dodson <bjdodson@google.com> | 2010-08-05 15:45:10 -0700 |
| commit | 1034455a245bf4d6f0c5d8b32f754a686d46af83 (patch) | |
| tree | 1445e402ed3192315378f3a026faa3d42464d3ee | |
| parent | cecf0bee67f39349d00be3d55098faf94dc18343 (diff) | |
| download | build-1034455a245bf4d6f0c5d8b32f754a686d46af83.zip build-1034455a245bf4d6f0c5d8b32f754a686d46af83.tar.gz build-1034455a245bf4d6f0c5d8b32f754a686d46af83.tar.bz2 | |
Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava
Change-Id: If317bd108043b152d28babc88a7c949db5127a93
| -rw-r--r-- | core/droiddoc.mk | 10 | ||||
| -rw-r--r-- | tools/droiddoc/Android.mk | 3 | ||||
| -rw-r--r-- | tools/droiddoc/templates/macros.cs | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 8495e6e..3703d6b 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -130,11 +130,9 @@ droiddoc_templates := \ droiddoc := \ $(HOST_JDK_TOOLS_JAR) \ - $(HOST_OUT_JAVA_LIBRARIES)/droiddoc$(COMMON_JAVA_PACKAGE_SUFFIX) \ - $(HOST_OUT_JAVA_LIBRARIES)/clearsilver$(COMMON_JAVA_PACKAGE_SUFFIX) \ - $(HOST_OUT_SHARED_LIBRARIES)/libclearsilver-jni$(HOST_JNILIB_SUFFIX) + $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) -$(full_target): PRIVATE_DOCLETPATH := $(HOST_OUT_JAVA_LIBRARIES)/clearsilver$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/droiddoc$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/apicheck$(COMMON_JAVA_PACKAGE_SUFFIX) +$(full_target): PRIVATE_DOCLETPATH := $(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) $(full_target): PRIVATE_CURRENT_BUILD := -hdf page.build $(BUILD_ID)-$(BUILD_NUMBER) $(full_target): PRIVATE_CURRENT_TIME := -hdf page.now "$(shell date "+%d %b %Y %k:%M")" $(full_target): PRIVATE_TEMPLATE_DIR := $(LOCAL_DROIDDOC_TEMPLATE_DIR) @@ -160,14 +158,12 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) $(hide) ( \ - LD_LIBRARY_PATH=$(HOST_OUT_SHARED_LIBRARIES) \ javadoc \ \@$(PRIVATE_SRC_LIST_FILE) \ -J-Xmx1024m \ - -J-Djava.library.path=$(HOST_OUT_SHARED_LIBRARIES) \ $(PRIVATE_PROFILING_OPTIONS) \ -quiet \ - -doclet DroidDoc \ + -doclet com.google.doclava.Doclava \ -docletpath $(PRIVATE_DOCLETPATH) \ -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ -templatedir $(PRIVATE_TEMPLATE_DIR) \ diff --git a/tools/droiddoc/Android.mk b/tools/droiddoc/Android.mk index d2d7a95..ff08edc 100644 --- a/tools/droiddoc/Android.mk +++ b/tools/droiddoc/Android.mk @@ -14,5 +14,4 @@ LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/src/Android.mk - +# Droiddoc is now Doclava -- See external/doclava. diff --git a/tools/droiddoc/templates/macros.cs b/tools/droiddoc/templates/macros.cs index b5fd3f2..97f5c66 100644 --- a/tools/droiddoc/templates/macros.cs +++ b/tools/droiddoc/templates/macros.cs @@ -1,5 +1,5 @@ <?cs # A link to a package ?><?cs -def:package_link(pkg)) ?> +def:package_link(pkg) ?> <a href="<?cs var:toroot ?><?cs var:pkg.link ?>"><?cs var:pkg.name ?></a><?cs /def ?> |