diff options
author | Dirk Dougherty <ddougherty@google.com> | 2016-05-11 01:59:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-11 01:59:09 +0000 |
commit | 15bab1089dd831816738571c370d5f057fe44f41 (patch) | |
tree | 0c5bc6bf06f1c11aa87b77fed3d7bfe0500ef7da | |
parent | 403b491eca63f47fa1e0e39ddedfad9f2b838d8e (diff) | |
parent | 7e956b612fbf3070e06c14dc09f61a06a5eb2e6e (diff) | |
download | platform_external_doclava-15bab1089dd831816738571c370d5f057fe44f41.tar.gz platform_external_doclava-15bab1089dd831816738571c370d5f057fe44f41.tar.bz2 platform_external_doclava-15bab1089dd831816738571c370d5f057fe44f41.zip |
Merge "For -testSupportRef and -wearableSupportRef builds, generate yaml toc file to library root dir." into mnc-mr-docs am: c320f54916
am: 7e956b612f
* commit '7e956b612fbf3070e06c14dc09f61a06a5eb2e6e':
For -testSupportRef and -wearableSupportRef builds, generate yaml toc file to library root dir.
Change-Id: I64857550f6daa1d4835cb8f5db81194440ffd52e
-rw-r--r-- | src/com/google/doclava/Doclava.java | 34 | ||||
-rw-r--r-- | src/com/google/doclava/NavTree.java | 5 |
2 files changed, 36 insertions, 3 deletions
diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java index 6587b1c..aeebf51 100644 --- a/src/com/google/doclava/Doclava.java +++ b/src/com/google/doclava/Doclava.java @@ -108,8 +108,13 @@ public class Doclava { public static JSilver jSilver = null; + //API reference extensions private static boolean gmsRef = false; private static boolean gcmRef = false; + public static boolean testSupportRef = false; + public static String testSupportPath = "android/support/test/"; + public static boolean wearableSupportRef = false; + public static String wearableSupportPath = "android/support/wearable/"; private static boolean samplesRef = false; private static boolean sac = false; @@ -387,7 +392,9 @@ public class Doclava { } else if(gcmRef){ refPrefix = "gcm-"; } - NavTree.writeNavTree(javadocDir, refPrefix); + if (!USE_DEVSITE_LOCALE_OUTPUT_PATHS) { + NavTree.writeNavTree(javadocDir, refPrefix); + } // Write yaml tree. if (yamlNavFile != null){ @@ -697,6 +704,14 @@ public class Doclava { gcmRef = true; return 1; } + if (option.equals("-testSupportRef")) { + testSupportRef = true; + return 1; + } + if (option.equals("-wearableSupportRef")) { + wearableSupportRef = true; + return 1; + } if (option.equals("-metadataDebug")) { return 1; } @@ -810,6 +825,10 @@ public class Doclava { data.setValue("reference.gms", "true"); } else if(gcmRef){ data.setValue("reference.gcm", "true"); + } else if(testSupportRef){ + data.setValue("reference.testSupport", "true"); + } else if(wearableSupportRef){ + data.setValue("reference.wearableSupport", "true"); } data.setValue("reference", "1"); data.setValue("reference.apilevels", sinceTagger.hasVersions() ? "1" : "0"); @@ -923,6 +942,14 @@ public class Doclava { } int i = 0; + String listDir = javadocDir; + if (USE_DEVSITE_LOCALE_OUTPUT_PATHS) { + if (testSupportRef) { + listDir = listDir + testSupportPath; + } else if (wearableSupportRef) { + listDir = listDir + wearableSupportPath; + } + } for (String s : sorted.keySet()) { data.setValue("docs.pages." + i + ".id", "" + i); data.setValue("docs.pages." + i + ".label", s); @@ -941,11 +968,12 @@ public class Doclava { } i++; } - ClearPage.write(data, "lists.cs", javadocDir + "lists.js"); + ClearPage.write(data, "lists.cs", listDir + "lists.js"); // Write the lists for JD documents (if there are HTML directories to process) - if (inputPathHtmlDirs.size() > 0) { + // Skip this for devsite builds + if ((inputPathHtmlDirs.size() > 0) && (!USE_DEVSITE_LOCALE_OUTPUT_PATHS)) { Data jddata = makeHDF(); Iterator counter = new Iterator(); for (String htmlDir : inputPathHtmlDirs) { diff --git a/src/com/google/doclava/NavTree.java b/src/com/google/doclava/NavTree.java index f69502b..57d83d4 100644 --- a/src/com/google/doclava/NavTree.java +++ b/src/com/google/doclava/NavTree.java @@ -80,6 +80,11 @@ public class NavTree { } data = makeYamlHDF(sorted, "docs.pages", data); + if ((Doclava.USE_DEVSITE_LOCALE_OUTPUT_PATHS) && (Doclava.testSupportRef)) { + dir = Doclava.ensureSlash(dir) + Doclava.testSupportPath; + } else if ((Doclava.USE_DEVSITE_LOCALE_OUTPUT_PATHS) && (Doclava.wearableSupportRef)) { + dir = Doclava.ensureSlash(dir) + Doclava.wearableSupportPath; + } ClearPage.write(data, "yaml_navtree.cs", Doclava.ensureSlash(dir) + fileName); } |