X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=doc%2FMakefile;h=7d33149dc8642af5c9ec9dc53a90a1a218e98a66;hp=29d3c428ed895322c6ffa961b48823ef29b00a95;hb=4bcdc106df2c5e8572570e57b4d97121df94799a;hpb=5b782c8f45ed6c34ed0e7f1aff6ac298c9a879ff

diff --git a/doc/Makefile b/doc/Makefile
index 29d3c428..7d33149d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,24 +3,35 @@
 #
 
 RELNOTES_INC=\
-	release-notes-0.7.1.inc \
-	release-notes-0.8.inc \
-	release-notes-0.9.inc \
-	release-notes-0.9.2.inc \
-	release-notes-1.0.1.inc \
-	release-notes-1.1.inc \
-	release-notes-1.1.1.inc \
-	release-notes-1.2.inc \
-	release-notes-1.2.1.inc \
-	release-notes-1.3.inc \
-	release-notes-1.3.1.inc \
-	release-notes-1.3.2.inc \
-	release-notes-1.4.inc \
-	release-notes-1.4.1.inc \
-	release-notes-1.4.2.inc \
-	release-notes-1.5.inc \
+	release-notes-1.8.4.inc \
+	release-notes-1.8.3.inc \
+	release-notes-1.8.2.inc \
+	release-notes-1.8.1.inc \
+	release-notes-1.8.inc \
+	release-notes-1.7.inc \
+	release-notes-1.6.8.inc \
+	release-notes-1.6.5.inc \
+	release-notes-1.6.4.inc \
+	release-notes-1.6.3.inc \
+	release-notes-1.6.2.inc \
+	release-notes-1.6.1.inc \
 	release-notes-1.6.inc \
-	release-notes-1.6.1.inc
+	release-notes-1.5.inc \
+	release-notes-1.4.2.inc \
+	release-notes-1.4.1.inc \
+	release-notes-1.4.inc \
+	release-notes-1.3.2.inc \
+	release-notes-1.3.1.inc \
+	release-notes-1.3.inc \
+	release-notes-1.2.1.inc \
+	release-notes-1.2.inc \
+	release-notes-1.1.1.inc \
+	release-notes-1.1.inc \
+	release-notes-1.0.1.inc \
+	release-notes-0.9.2.inc \
+	release-notes-0.9.inc \
+	release-notes-0.8.inc \
+	release-notes-0.7.1.inc
 
 IMAGES=\
 	altosui.png \
@@ -81,21 +92,32 @@ IMAGES=\
 	telemetrum.svg \
 	telemetrum-v1.1-thside.jpg \
 	telemetrum-v2.0-th.jpg \
-	telemini.svg \
+	telemini-v1.svg \
 	telemini-v1-top.jpg \
-	telemini-v2-top.jpg
+	telemini-v3.svg \
+	telemini-v3.0-top.jpg \
+	telemini-v3.0-bottom.jpg \
+	altusmetrum-oneline.svg \
+	telegps-oneline.svg \
+	micropeak-oneline.svg
 
 TXT_FILES=altusmetrum.txt
 
+COMMON_INC_FILES=\
+	config-device.inc \
+	config-ui.inc \
+	load-maps.inc \
+	aprs-operation.inc \
+	handling.inc
+
 INC_FILES=\
 	dedication.inc \
 	intro.inc \
 	getting-started.inc \
 	usage.inc \
 	telemetrum.inc \
-	telemini-v1.0.inc \
-	telemini-v2.0.inc \
-	easymini.inc \
+	telemini.inc \
+	easymini-device.inc \
 	telemega.inc \
 	easymega.inc \
 	installation.inc \
@@ -106,23 +128,23 @@ INC_FILES=\
 	system-operation.inc \
 	pyro-channels.inc \
 	flight-data-recording.inc \
-	handling.inc \
 	specs.inc \
+	$(COMMON_INC_FILES) \
 	release-notes.inc \
 	$(RELNOTES_INC)
 
 RAW_FILES=$(TXT_FILES:.txt=.raw) $(INC_FILES:.inc=.raw)
 
 TELEGPS_INC_FILES=\
-	dedication.inc \
+	telegps-dedication.inc \
 	telegps-quick-start.inc \
 	telegps-using.inc \
 	telegps-system-operation.inc \
 	telegps-application.inc \
-	handling.inc \
 	telegps-specs.inc \
 	telegps-updating-firmware.inc \
-	telegps-release-notes.inc
+	telegps-release-notes.inc \
+	$(COMMON_INC_FILES)
 
 TELEGPS_TXT_FILES=\
 	telegps.txt
@@ -136,12 +158,22 @@ MICROPEAK_INC_FILES=
 
 MICROPEAK_RAW_FILES=$(MICROPEAK_TXT_FILES:.txt=.raw) $(MICROPEAK_INC_FILES:.inc=.raw)
 
+EASYMINI_TXT_FILES=\
+	easymini.txt
+
+EASYMINI_INC_FILES=$(INC_FILES) easymini-release-notes.inc
+
+
+EASYMINI_RAW_FILES=$(EASYMINI_TXT_FILES:.txt=.raw) $(EASYMINI_INC_FILES:.inc=.raw)
+
 OUTLINE_TXT_FILES=\
 	easymega-outline.txt \
 	easymini-outline.txt \
 	telemega-outline.txt \
 	telemetrum-outline.txt \
-	telemini-outline.txt
+	telemini-v1-outline.txt \
+	telemini-v3-outline.txt \
+	telegps-outline.txt
 
 OUTLINE_RAW_FILES=$(OUTLINE_TXT_FILES:.txt=.raw)
 
@@ -151,10 +183,10 @@ SVG=\
 	easymini.svg \
 	telemega.svg \
 	telemetrum.svg \
-	telemini.svg \
+	telemini-v1.svg \
+	telemini-v3.svg \
 	easymega.svg
 
-RELNOTES_PDF=$(RELNOTES_INC:.inc=.pdf)
 RELNOTES_HTML=$(RELNOTES_INC:.inc=.html)
 
 ONEFILE_TXT_FILES=\
@@ -164,24 +196,51 @@ 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
+
+PUBLISH_HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(ONEFILE_HTML_FILES)
 
-HTML=altusmetrum.html micropeak.html telegps.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
+HTML=$(PUBLISH_HTML) $(RELNOTES_HTML)
 
-PDF=altusmetrum.pdf micropeak.pdf telegps.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \
+HTML_REVHISTORY=\
+	altusmetrum-revhistory.html \
+	micropeak-revhistory.html \
+	telegps-revhistory.html \
+	easymini-revhistory.html
+
+PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(ONEFILE_PDF_FILES) \
 	$(OUTLINE_PDF_FILES)
 
 FOP_STYLE=am-fo.xsl
+HTML_STYLE=am-html.xsl
+COMMON_STYLE=common.xsl
 FOP_XCONF=fop.xconf
 STYLESHEET=am.css
 
+FONTS=\
+	fonts/DejaVuSansMono-BoldOblique.ttf \
+	fonts/DejaVuSansMono-Bold.ttf \
+	fonts/DejaVuSansMono-Oblique.ttf \
+	fonts/DejaVuSansMono.ttf \
+	fonts/OpenSans-Light.ttf \
+	fonts/OpenSans-LightItalic.ttf \
+	fonts/OpenSans-Regular.ttf \
+	fonts/OpenSans-Italic.ttf \
+	fonts/OpenSans-Semibold.ttf \
+	fonts/OpenSans-SemiboldItalic.ttf
+
 TEMPLATES_TMPL=titlepage.templates.tmpl
 
 TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl)
 
-PDF_CONFIG_FILES=$(FOP_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
-HTML_CONFIG_FILES=$(TEMPLATES_XSL) $(STYLESHEET)
+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) $(PDF) $(IMAGES) $(STYLESHEET)
+DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 
 .SUFFIXES: .tmpl .xsl .inc .txt .raw .pdf .html
 
@@ -191,43 +250,64 @@ DOC=$(HTML) $(PDF) $(IMAGES) $(STYLESHEET)
 .inc.raw:
 	sed -e 's/^[ 	]*//' -e 's/^\\//' $*.inc > $@
 
-.raw.pdf:
-	a2x -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw
-
 .raw.html:
-	a2x -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --stylesheet=$(STYLESHEET) $*.raw
+	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
+
+.html.pdf:
+	@touch $@
 
 .tmpl.xsl:
 	xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $*.tmpl
 
 all:	$(HTML) $(PDF)
 
-$(HTML): $(PDF)
+altusmetrum-revhistory.html: altusmetrum.html
+
+micropeak-revhistory.html: micropeak.html
 
-altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(RAW_INC) $(IMAGES)
+telegps-revhistory.html: telegps.html
+
+altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(IMAGES)
 
 telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_RAW_FILES) $(IMAGES)
 
 micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_RAW_FILES) $(IMAGES)
 
+easymini.pdf easymini.html: easymini-docinfo.xml $(EASYMINI_RAW_FILES) $(IMAGES)
+
+telemini-v1-outline.pdf: telemini-v1-outline.txt telemini-v1.svg
+
+telemini-v3-outline.pdf: telemini-v3-outline.txt telemini-v3.svg
+
 install:	all
 
-publish:	$(DOC)
-	cp $(DOC) /home/bdale/web/altusmetrum/AltOS/doc/
-	(cd /home/bdale/web/altusmetrum ; \
-	 git add /home/bdale/web/altusmetrum/AltOS/doc/* ; \
+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/* ; \
+	 git commit -F - $(WEB_ROOT)/altusmetrum/AltOS/doc/* $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/* ; \
 	 git push)
 
-publish-keithp:	$(DOC)
-	scp -p $(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:
-	rm -f $(HTML) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
+	rm -f am.html $(HTML) $(HTML_REVHISTORY) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
 
 distclean: clean
 	rm -f $(HTML) $(PDF)
 
 $(PDF): $(PDF_CONFIG_FILES)
 $(HTML): $(HTML_CONFIG_FILES)
+
+am.html: Makefile make-am-html $(HTML)
+	sh ./make-am-html $(HTML) > $@