diff options
author | Bill Napier <napier@google.com> | 2010-08-24 22:16:01 -0700 |
---|---|---|
committer | Bill Napier <napier@google.com> | 2010-08-24 22:16:01 -0700 |
commit | 0e143c0ed90e0c11eaa3e278b98d00622fc57184 (patch) | |
tree | a7e60d59183f2b953aea7bde162e38b2fcbee7b6 | |
parent | ad3cf5f868fc36de0a4fa501f074d35a94496b27 (diff) | |
download | build-0e143c0ed90e0c11eaa3e278b98d00622fc57184.zip build-0e143c0ed90e0c11eaa3e278b98d00622fc57184.tar.gz build-0e143c0ed90e0c11eaa3e278b98d00622fc57184.tar.bz2 |
Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.
Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
-rw-r--r-- | core/droiddoc.mk | 2 | ||||
-rw-r--r-- | tools/droiddoc/src/ClearPage.java | 13 | ||||
-rw-r--r-- | tools/droiddoc/src/DroidDoc.java | 16 |
3 files changed, 18 insertions, 13 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index ba4857b..951ae3c 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -144,7 +144,7 @@ $(full_target): PRIVATE_IN_CUSTOM_ASSET_DIR := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_ $(full_target): PRIVATE_OUT_ASSET_DIR := $(out_dir)/$(LOCAL_DROIDDOC_ASSET_DIR) $(full_target): PRIVATE_OUT_CUSTOM_ASSET_DIR := $(out_dir)/$(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR) ifneq ($(strip $(LOCAL_DROIDDOC_HTML_DIR)),) -$(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) +$(full_target): PRIVATE_DROIDDOC_HTML_DIR := $(foreach dir,$(LOCAL_DROIDDOC_HTML_DIR),-htmldir $(dir)) else $(full_target): PRIVATE_DROIDDOC_HTML_DIR := endif diff --git a/tools/droiddoc/src/ClearPage.java b/tools/droiddoc/src/ClearPage.java index 184c8b8..016ca93 100644 --- a/tools/droiddoc/src/ClearPage.java +++ b/tools/droiddoc/src/ClearPage.java @@ -23,6 +23,7 @@ import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.IOException; import java.util.ArrayList; +import java.util.List; public class ClearPage { @@ -43,7 +44,7 @@ public class ClearPage private static boolean mTemplateDirSet = false; public static String outputDir = "docs"; - public static String htmlDir = null; + public static List<String> htmlDirs = new ArrayList<String>(); public static String toroot = null; public static void addTemplateDir(String dir) @@ -76,7 +77,7 @@ public class ClearPage public static void write(HDF data, String templ, String filename, boolean fullPath) { - if (htmlDir != null) { + if (!htmlDirs.isEmpty()) { data.setValue("hasindex", "true"); } @@ -103,9 +104,11 @@ public class ClearPage } int i=0; - if (htmlDir != null) { - data.setValue("hdf.loadpaths." + i, htmlDir); - i++; + if (!htmlDirs.isEmpty()) { + for (String dir : htmlDirs) { + data.setValue("hdf.loadpaths." + i, dir); + i++; + } } if (mTemplateDirSet) { for (String dir: mTemplateDirs) { diff --git a/tools/droiddoc/src/DroidDoc.java b/tools/droiddoc/src/DroidDoc.java index 4e9d6b1..34a0c03 100644 --- a/tools/droiddoc/src/DroidDoc.java +++ b/tools/droiddoc/src/DroidDoc.java @@ -122,7 +122,7 @@ public class DroidDoc sampleCodes.add(new SampleCode(a[1], a[2], a[3])); } else if (a[0].equals("-htmldir")) { - ClearPage.htmlDir = a[1]; + ClearPage.htmlDirs.add(a[1]); } else if (a[0].equals("-title")) { DroidDoc.title = a[1]; @@ -224,7 +224,7 @@ public class DroidDoc } // HTML Pages - if (ClearPage.htmlDir != null) { + if (!ClearPage.htmlDirs.isEmpty()) { writeHTMLPages(); } @@ -233,7 +233,7 @@ public class DroidDoc // Packages Pages writePackages(javadocDir - + (ClearPage.htmlDir!=null + + (!ClearPage.htmlDirs.isEmpty() ? "packages" + htmlExtension : "index" + htmlExtension)); @@ -575,11 +575,13 @@ public class DroidDoc public static void writeHTMLPages() { - File f = new File(ClearPage.htmlDir); - if (!f.isDirectory()) { - System.err.println("htmlDir not a directory: " + ClearPage.htmlDir); + for (String htmlDir : ClearPage.htmlDirs) { + File f = new File(htmlDir); + if (!f.isDirectory()) { + System.err.println("htmlDir not a directory: " + htmlDir); + } + writeDirectory(f, ""); } - writeDirectory(f, ""); } public static void writeLists() |