From 62a16e04436921187bb7682985b01f3ff85c4972 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 5 Oct 2022 16:26:50 +0300 Subject: [PATCH 29/29] Doxygen: Add freeciv version information See osdn #45581 Signed-off-by: Marko Lindqvist --- Makefile.am | 2 +- configure.ac | 3 +++ doc/freeciv.doxygen | 2 +- fc_version | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 47d92aca76..c6ddcccc34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,6 +107,6 @@ src-check: cd tests && $(MAKE) $(AM_MAKEFLAGS) src-check doc: - doxy_srcdir="$(top_srcdir)/" doxygen $(top_srcdir)/doc/freeciv.doxygen + doxy_srcdir="$(top_srcdir)/" doxy_version="-$(MAIN_VERSION)" doxygen $(top_srcdir)/doc/freeciv.doxygen .PHONY: src-check doc diff --git a/configure.ac b/configure.ac index 8171a5c2c1..916d33928e 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,9 @@ AC_DEFINE_UNQUOTED([FREECIV_RELEASE_MONTH], [$RELEASE_MONTH], [Month next versio AC_SUBST([MAJOR_VERSION]) AC_SUBST([MINOR_VERSION]) +dnl In practice, this matches the branch +AC_SUBST([MAIN_VERSION]) + AC_DEFINE_UNQUOTED([DATASUBDIR], ["$DATASUBDIR"], [Version specific subdir for default data path]) diff --git a/doc/freeciv.doxygen b/doc/freeciv.doxygen index 7d06af4d72..a6830f828f 100644 --- a/doc/freeciv.doxygen +++ b/doc/freeciv.doxygen @@ -41,7 +41,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = Freeciv +PROJECT_NAME = Freeciv$(doxy_version) # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/fc_version b/fc_version index 385519e74e..59ac7473bb 100755 --- a/fc_version +++ b/fc_version @@ -50,6 +50,7 @@ NEXT_STABLE_VERSION="3.1.0" # 0 to disable display of release month until we can make better estimate RELEASE_MONTH=0 +MAIN_VERSION=3.1 DATASUBDIR=3.1 DEFAULT_FOLLOW_TAG=S3_1 @@ -60,7 +61,7 @@ DEFAULT_FOLLOW_TAG=S3_1 # - No new mandatory capabilities can be added to the release branch; doing # so would break network capability of supposedly "compatible" releases. # -NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2022.Sep.10" +NETWORK_CAPSTRING="+Freeciv.Devel-${MAIN_VERSION}-2022.Sep.10" FREECIV_DISTRIBUTOR="" -- 2.35.1