From 5cf77306257517a3d1ec8cea85fca34f576a8f22 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 11 Dec 2017 22:36:00 -0800 Subject: doc: Don't 'publish' release notes, don't build pdf release notes All we use the release notes for is to include into the main AltOS page. Also remove the docinfo for these files so that information isn't duplicated for each set of release notes. Signed-off-by: Keith Packard --- doc/Makefile | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'doc/Makefile') diff --git a/doc/Makefile b/doc/Makefile index feb1de8f..aa266e75 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -186,7 +186,6 @@ SVG=\ telemini-v3.svg \ easymega.svg -RELNOTES_PDF=$(RELNOTES_INC:.inc=.pdf) RELNOTES_HTML=$(RELNOTES_INC:.inc=.html) ONEFILE_TXT_FILES=\ @@ -196,10 +195,13 @@ ONEFILE_TXT_FILES=\ ONEFILE_RAW_FILES=$(ONEFILE_TXT_FILES:.txt=.raw) ONEFILE_PDF_FILES=$(ONEFILE_TXT_FILES:.txt=.pdf) +ONEFILE_HTML_FILES=$(ONEFILE_TXT_FILES:.txt=.html) AM_HTML=am.html -HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES) +PUBLISH_HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(ONEFILE_HTML_FILES) + +HTML=$(PUBLISH_HTML) $(RELNOTES_HTML) HTML_REVHISTORY=\ altusmetrum-revhistory.html \ @@ -207,7 +209,7 @@ HTML_REVHISTORY=\ telegps-revhistory.html \ easymini-revhistory.html -PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \ +PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(ONEFILE_PDF_FILES) \ $(OUTLINE_PDF_FILES) FOP_STYLE=am-fo.xsl @@ -235,6 +237,8 @@ TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl) PDF_CONFIG_FILES=$(FOP_STYLE) $(COMMON_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL) HTML_CONFIG_FILES=$(HTML_STYLE) $(COMMON_STYLE) $(TEMPLATES_XSL) +PUBLISH_DOC=$(PUBLISH_HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET) + DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET) .SUFFIXES: .tmpl .xsl .inc .txt .raw .pdf .html @@ -245,12 +249,12 @@ DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET) .inc.raw: sed -e 's/^[ ]*//' -e 's/^\\//' $*.inc > $@ -.raw.pdf: +.raw.html: a2x --verbose -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw a2x --verbose -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw case $* in release-notes*) ./fix-html $*.html ;; esac -.pdf.html: +.html.pdf: @touch $@ .tmpl.xsl: @@ -278,19 +282,21 @@ telemini-v3-outline.pdf: telemini-v3-outline.txt telemini-v3.svg install: all -publish: $(DOC) $(FONTS) - cp $(DOC) /home/bdale/web/altusmetrum/AltOS/doc/ - mkdir -p /home/bdale/web/altusmetrum/AltOS/doc/fonts/ - cp $(FONTS) /home/bdale/web/altusmetrum/AltOS/doc/fonts/ - (cd /home/bdale/web/altusmetrum ; \ - git add /home/bdale/web/altusmetrum/AltOS/doc/* ; \ - git add /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \ +WEB_ROOT=/home/bdale/web/ + +publish: $(PUBLISH_DOC) $(FONTS) + cp $(PUBLISH_DOC) $(WEB_ROOT)/altusmetrum/AltOS/doc/ + mkdir -p $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/ + cp $(FONTS) $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/ + (cd $(WEB_ROOT)/altusmetrum ; \ + git add $(WEB_ROOT)/altusmetrum/AltOS/doc/* ; \ + git add $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/* ; \ echo "update docs" | \ - git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \ + git commit -F - $(WEB_ROOT)/altusmetrum/AltOS/doc/* $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/* ; \ git push) -publish-keithp: am.html $(DOC) $(FONTS) - scp -p am.html $(DOC) keithp.com:~keithp/public_html/altos +publish-keithp: am.html $(PUBLISH_DOC) $(FONTS) + scp -p am.html $(PUBLISH_DOC) keithp.com:~keithp/public_html/altos scp -p $(FONTS) keithp.com:~keithp/public_html/altos/fonts clean: -- cgit v1.2.3