Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e143c0e authored by Bill Napier's avatar Bill Napier
Browse files

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
parent ad3cf5f8

core/droiddoc.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/droiddoc/src/ClearPage.java

+8 −5
Original line number Diff line number Diff line
@@ -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,10 +104,12 @@ public class ClearPage 
        }



        int i=0;

        if (htmlDir != null) {

            data.setValue("hdf.loadpaths." + i, htmlDir);

        if (!htmlDirs.isEmpty()) {

            for (String dir : htmlDirs) {

                data.setValue("hdf.loadpaths." + i, dir);

                i++;

            }

        }

        if (mTemplateDirSet) {

            for (String dir: mTemplateDirs) {

                data.setValue("hdf.loadpaths." + i, dir);

tools/droiddoc/src/DroidDoc.java

+9 −7
Original line number Diff line number Diff line
@@ -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,12 +575,14 @@ public class DroidDoc 


    public static void writeHTMLPages()

    {

        File f = new File(ClearPage.htmlDir);

        for (String htmlDir : ClearPage.htmlDirs) {

            File f = new File(htmlDir);

            if (!f.isDirectory()) {

            System.err.println("htmlDir not a directory: " + ClearPage.htmlDir);

                System.err.println("htmlDir not a directory: " + htmlDir);

            }

            writeDirectory(f, "");

        }

    }



    public static void writeLists()

    {