summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author smain@google.com <smain@google.com> 2016-07-07 17:11:35 -0700
committer Scott Main <smain@google.com> 2016-07-08 00:47:18 +0000
commit20e2095c7b442bc79c0c8833857fa337f04ecb59 (patch)
treec30c7e7ac90ff2f3df2929627985a73a425a30f7
parent8e3e92b906db431c4fa822f21242977d4ee99942 (diff)
update NDK doxygen templates to create DevSite-style HTML.
Previously, we had doxygen create .jd files with some syntax that was parsed by the DocLava build tools when creating the final HTML files for the website. But now that we're publishing these docs through Piper, we don't need to run them through DocLava anymore. So with this change, we now create .html files that then need to be copied to google3/googledata/devsite/site-android/en/ndk/ where they can be immediately published via devsite once merged. bug: 29943712 Change-Id: I8af5555f802e8c0122378bd504ad4308ff9aad56
-rw-r--r--docs/Makefile11
-rw-r--r--docs/footer.html2
-rw-r--r--docs/footer.jd0
-rw-r--r--docs/header.html10
-rw-r--r--docs/header.jd3
5 files changed, 17 insertions, 9 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 5104d81c20..c655e0c09b 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,13 +1,12 @@
HEADERS := $(wildcard ../include/android/*.h)
-all: html jd
+all: html website
html: $(HEADERS) Doxyfile
mkdir -p html
doxygen
-jd: $(HEADERS) Doxyfile header.jd
- mkdir -p jd
- HTML_HEADER=header.jd HTML_FOOTER=footer.jd HTML_OUTPUT=jd doxygen
- for file in jd/*.html; do mv "$${file}" "$${file/.html/.jd}"; done
- rm -f jd/index.jd
+website: $(HEADERS) Doxyfile header.html
+ mkdir -p website
+ HTML_HEADER=header.html HTML_FOOTER=footer.html HTML_OUTPUT=website doxygen
+ rm -f website/index.html
diff --git a/docs/footer.html b/docs/footer.html
new file mode 100644
index 0000000000..308b1d01b6
--- /dev/null
+++ b/docs/footer.html
@@ -0,0 +1,2 @@
+</body>
+</html>
diff --git a/docs/footer.jd b/docs/footer.jd
deleted file mode 100644
index e69de29bb2..0000000000
--- a/docs/footer.jd
+++ /dev/null
diff --git a/docs/header.html b/docs/header.html
new file mode 100644
index 0000000000..04727b3dab
--- /dev/null
+++ b/docs/header.html
@@ -0,0 +1,10 @@
+<html devsite>
+<head>
+ <meta name="top_category" value="ndk" />
+ <meta name="subcategory" value="reference" />
+ <meta name="book_path" value="/ndk/reference/_book.yaml" />
+ <title>$title</title>
+ <link rel="stylesheet" type="text/css" href="doxygen-dac.css">
+</head>
+<body>
+<div id="top"><!-- we must have this tag, it's closed by doxygen. ¯\_(ツ)_/¯ -->
diff --git a/docs/header.jd b/docs/header.jd
deleted file mode 100644
index e50f41b03b..0000000000
--- a/docs/header.jd
+++ /dev/null
@@ -1,3 +0,0 @@
-page.title=$title
-page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css">
-@jd:body