From 61d3064e7c4958036e241381aa4ab791582820f8 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 25 Feb 2020 17:24:23 -0800 Subject: [PATCH] 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 --- configure.ac | 4 ++++ doc/Makefile.am | 6 ++++-- doc/RELNOTES | 8 -------- doc/altusmetrum.txt | 4 ++-- doc/easymini.txt | 4 ++-- doc/micropeak.txt | 4 ++-- doc/telegps.txt | 4 ++-- doc/telelaunch.txt | 4 ++-- doc/telemetry.txt | 4 ++-- 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index 390a9347..22e19f48 100644 --- 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 2e9e6526..464cd988 100644 --- 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 5c8ecc9c..066283c3 100644 --- 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 1bf238a9..60163888 100644 --- 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 ; Bdale Garbee ; 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 eca8013f..448f8060 100644 --- a/doc/easymini.txt +++ b/doc/easymini.txt @@ -1,8 +1,8 @@ = EasyMini Owner's Manual Keith Packard ; Bdale Garbee :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 e4aecbb6..18a5afdf 100644 --- a/doc/micropeak.txt +++ b/doc/micropeak.txt @@ -1,7 +1,7 @@ = MicroPeak Owner's Manual Keith Packard ; Bdale Garbee -: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 e6483563..b8911a8a 100644 --- a/doc/telegps.txt +++ b/doc/telegps.txt @@ -1,8 +1,8 @@ = TeleGPS Owner's Manual Keith Packard ; Bdale Garbee :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 bca8cb60..4deee3a9 100644 --- a/doc/telelaunch.txt +++ b/doc/telelaunch.txt @@ -1,8 +1,8 @@ = TeleLaunch: The Altus Metrum Wireless Launch Control System Bdale Garbee :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 5bc62cd1..4152de33 100644 --- a/doc/telemetry.txt +++ b/doc/telemetry.txt @@ -1,7 +1,7 @@ = AltOS Telemetry Keith Packard ; Bdale Garbee -: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: -- 2.30.2