From bd73603cab3cbddaea817173568d755f35f39e3e Mon Sep 17 00:00:00 2001 From: Josh Davies Date: Wed, 24 Jun 2026 23:40:54 +0200 Subject: [PATCH] release: stop manually updating version fallback info. Rely on version info from git-version-gen.sh, to make pushing releases easier. The date and version in the man page is also now prepared automatically. --- doc/Makefile.am | 29 +++++++++++++++++++++++++++++ doc/{form.1 => form.1.in} | 1 - scripts/git-version-gen.sh | 8 ++++++++ sources/form3.h | 9 +++++---- 4 files changed, 42 insertions(+), 5 deletions(-) rename doc/{form.1 => form.1.in} (99%) diff --git a/doc/Makefile.am b/doc/Makefile.am index 6c19509c5..bc1585064 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,2 +1,31 @@ SUBDIRS = doxygen manual devref dist_man1_MANS = form.1 + +.PHONY: clean-local update_version_man + +clean-local: + rm form.1 + +form.1: update_version_man + $(UPDATE_VERSION_MAN) + +dist-hook: + $(DISTHOOK_VERSION_MAN) + +if FIXED_VERSION + +UPDATE_VERSION_MAN = \ + [ -f form.1 ] || $(LN_S) "$(srcdir)/form.1.in" form.1 + +DISTHOOK_VERSION_MAN = \ + cp "$(srcdir)/form.1" "$(distdir)/form.1" + +else + +UPDATE_VERSION_MAN = \ + $(SHELL) "$(top_srcdir)/scripts/git-version-gen.sh" -C "$(srcdir)" --man --date-format '%Y-%m-%d' -o form.1 && cat "$(srcdir)/form.1.in" >> form.1 + +DISTHOOK_VERSION_MAN = \ + $(SHELL) "$(top_srcdir)/scripts/git-version-gen.sh" -C "$(srcdir)" --man --date-format '%Y-%m-%d' -o "$(distdir)/form.1" && cat "$(srcdir)/form.1.in" >> "$(distdir)/form.1" + +endif diff --git a/doc/form.1 b/doc/form.1.in similarity index 99% rename from doc/form.1 rename to doc/form.1.in index 12ec1b2ec..0db102317 100644 --- a/doc/form.1 +++ b/doc/form.1.in @@ -1,4 +1,3 @@ -.TH FORM 1 "2026-01-27" .SH NAME FORM \- Symbolic manipulation system .SH SYNOPSIS diff --git a/scripts/git-version-gen.sh b/scripts/git-version-gen.sh index 132d937ad..e6515a081 100755 --- a/scripts/git-version-gen.sh +++ b/scripts/git-version-gen.sh @@ -85,6 +85,9 @@ for a in "$@"; do -t|--tex) mode=tex ;; + -m|--man) + mode=man + ;; -s|--shell) mode=shell ;; @@ -211,6 +214,11 @@ END \def\repominorversion{$minor_version} \def\repopatchversion{$patch_version} \def\repoversionsuffix{$version_suffix} +END + ;; + man) + cat <