Set doc version and date from package version and release date

This is a bit less work than manually updating them.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/configure.ac b/configure.ac
index 390a9347f926c7a3bedf4976172d1d7e5d682d56..22e19f48360a01c561344a5c9f3333cd4e59e813 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,10 @@ AM_MAINTAINER_MODE
 RELEASE_DATE=2019-12-05
 AC_SUBST(RELEASE_DATE)
 
+DOC_DATE=`LC_ALL=C date -d $RELEASE_DATE +'%d %b %Y'`
+
+AC_SUBST(DOC_DATE)
+
 VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
 AC_SUBST(VERSION_DASH)
 AC_SUBST(ANDROID_VERSION)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2e9e652666d2249dd16329f13408ef99e7ce0bec..464cd988bef3ca242e3f0034cbb68c96721a0cb2 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -279,6 +279,8 @@ DOC=$(HTML) $(PDF) $(IMAGES) $(MAP_SVG_FILES) $(STYLESHEET)
 
 SUFFIXES = .dot .svg .inc .txt .adoc .pdf .html
 
+ATTRIBUTES=--attribute="revdate=$(DOC_DATE)" --attribute="version=$(VERSION)"
+
 .dot.svg:
        dot -Tsvg -o$@ $*.dot
 
@@ -289,10 +291,10 @@ SUFFIXES = .dot .svg .inc .txt .adoc .pdf .html
        sed -e 's/^[    ]*//' -e 's/^\\//' $*.inc > $@
 
 .adoc.html:
-       asciidoctor -b html5 $*.adoc
+       asciidoctor $(ATTRIBUTES) -b html5 $*.adoc
 
 .adoc.pdf:
-       asciidoctor-pdf $*.adoc
+       asciidoctor-pdf $(ATTRIBUTES) $*.adoc
 
 all:   $(HTML) $(PDF)
 

diff --git a/doc/RELNOTES b/doc/RELNOTES
index 5c8ecc9c0e56b9ad565975cd4cd43c538215f1bf..066283c32a8380cef9beac537e641a2bb9473a17 100644 (file)
--- a/doc/RELNOTES
+++ b/doc/RELNOTES
@@ -12,14 +12,6 @@ Creating documentation for a new release of AltOS
        easymini-release-notes.inc
        telegps-release-notes.inc
 
-* Update version in main docs
-
-       altusmetrum.txt
-       easymini.txt
-       micropeak.txt
-       telegps.txt
-       telemetry.txt
-
 * Add release-notes-${version}.inc to Makefile.am and git
 
 * Make sure new hardware specs are documented in specs.inc

diff --git a/doc/altusmetrum.txt b/doc/altusmetrum.txt
index 1bf238a99d7b4d7b9d847d05a1c772412147e268..6016388871fa15edad57373825addaa82bb599ad 100644 (file)
--- a/doc/altusmetrum.txt
+++ b/doc/altusmetrum.txt
@@ -1,8 +1,8 @@
 = The Altus Metrum System: An Owner's Manual for Altus Metrum Rocketry Electronics
 Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>; Bob Finch; Anthony Towns
 :title-logo-image: image:../themes/background.png[]
-:revnumber: v1.9.2
-:revdate: 13 Feb 2020
+:revnumber: v{version}
+:revdate: 1 Jan 1970
 :icons:
 :icontype: svg
 :copyright: Bdale Garbee and Keith Packard 2020

diff --git a/doc/easymini.txt b/doc/easymini.txt
index eca8013fb3e768643784b25da6cb753b55868202..448f8060c9019c4e92fb0b8b7937499ed068749d 100644 (file)
--- a/doc/easymini.txt
+++ b/doc/easymini.txt
@@ -1,8 +1,8 @@
 = EasyMini Owner's Manual
 Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
 :title-logo-image: image:../themes/background.png[]
-:revnumber: v1.9.2
-:revdate: 13 Feb 2020
+:revnumber: v{version}
+:revdate: 01 Jan 1970
 :copyright: Bdale Garbee and Keith Packard 2020
 :doctype: book
 :numbered:

diff --git a/doc/micropeak.txt b/doc/micropeak.txt
index e4aecbb65d783cd970c52f7421dc641445d28e64..18a5afdf7b54673d756c0a51aee2ca447f472c32 100644 (file)
--- a/doc/micropeak.txt
+++ b/doc/micropeak.txt
@@ -1,7 +1,7 @@
 = MicroPeak Owner's Manual
 Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
-:revnumber: v1.9.2
-:revdate: 13 Feb 2020
+:revnumber: v{version}
+:revdate: 01 Jan 1970
 :copyright: Bdale Garbee and Keith Packard 2020
 :stylesheet: am.css
 :linkcss:

diff --git a/doc/telegps.txt b/doc/telegps.txt
index e64835639a0d27455a379477d7b210d3de53406b..b8911a8a51197d4370734f5844f4ae1aba5694f3 100644 (file)
--- a/doc/telegps.txt
+++ b/doc/telegps.txt
@@ -1,8 +1,8 @@
 = TeleGPS Owner's Manual
 Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
 :title-logo-image: image:../themes/background.png[]
-:revnumber: v1.9.2
-:revdate: 13 Feb 2020
+:revnumber: v{version}
+:revdate: 01 Jan 1970
 :copyright: Bdale Garbee and Keith Packard 2020
 :stylesheet: am.css
 :linkcss:

diff --git a/doc/telelaunch.txt b/doc/telelaunch.txt
index bca8cb60fad7b3ce97d2bd2a682b844675eca915..4deee3a956ac3cc79203eab6762ad187dce148ad 100644 (file)
--- a/doc/telelaunch.txt
+++ b/doc/telelaunch.txt
@@ -1,8 +1,8 @@
 = TeleLaunch: The Altus Metrum Wireless Launch Control System
 Bdale Garbee <bdale@gag.com>
 :title-logo-image: image:../themes/background.png[]
-:revnumber: v0.1
-:revdate: 16 Feb 2019
+:revnumber: v{version}
+:revdate: 01 Jan 1970
 :icons:
 :icontype: svg
 :revremark: initial draft

diff --git a/doc/telemetry.txt b/doc/telemetry.txt
index 5bc62cd185bbfc78691795081eabe7e77e22003d..4152de33a78f97ddcbd1fe6c38b0c59ae1426422 100644 (file)
--- a/doc/telemetry.txt
+++ b/doc/telemetry.txt
@@ -1,7 +1,7 @@
 = AltOS Telemetry
 Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
-:revnumber: v1.9.2
-:revdate: 13 Feb 2020
+:revnumber: v{version}
+:revdate: 01 Jan 1970
 :copyright: Bdale Garbee and Keith Packard 2020
 :stylesheet: am.css
 :linkcss: