From 793c751066e00acdfa48340c6616e269bc617037 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 6 Jul 2022 04:25:36 +0300 Subject: [PATCH 39/39] Meson: Add release cycle information See osdn #45030 Signed-off-by: Marko Lindqvist --- fc_version | 4 ++++ gen_headers/meson_fc_config.h.in | 4 ++++ meson.build | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fc_version b/fc_version index ee0b52c299..096293e517 100755 --- a/fc_version +++ b/fc_version @@ -11,6 +11,10 @@ PATCH_VERSION="0" EMERGENCY_VERSION="" VERSION_LABEL="-alpha4" +# +# At the time being these same updates need to be made to the meson.build, +# it does not get them automatically from here. +# # 1) Development until MAJOR and MINOR version numbers are # set to new release series: # - IS_DEVEL_VERSION=1 diff --git a/gen_headers/meson_fc_config.h.in b/gen_headers/meson_fc_config.h.in index 57bc74df8b..8e4d80f9d4 100644 --- a/gen_headers/meson_fc_config.h.in +++ b/gen_headers/meson_fc_config.h.in @@ -53,6 +53,10 @@ /* Release cycle information */ #mesondefine IS_DEVEL_VERSION +#mesondefine IS_FREEZE_VERSION +#mesondefine IS_BETA_VERSION +#mesondefine FREECIV_RELEASE_MONTH +#mesondefine NEXT_STABLE_VERSION /* Produce debug version */ #mesondefine FREECIV_DEBUG diff --git a/meson.build b/meson.build index eb5083b0f6..80686132ad 100644 --- a/meson.build +++ b/meson.build @@ -23,11 +23,17 @@ priv_conf_data.set('BINDIR', priv_conf_data.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))) -priv_conf_data.set('DATASUBDIR', 'test') priv_conf_data.set('SYSCONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir'))) +# Release cycle phases +# See fc_version about proper values for these. +priv_conf_data.set('DATASUBDIR', 'test') priv_conf_data.set('IS_DEVEL_VERSION', 1) +priv_conf_data.set('IS_FREEZE_VERSION', 0) +priv_conf_data.set('IS_BETA_VERSION', 0) +priv_conf_data.set('FREECIV_RELEASE_MONTH', 0) +priv_conf_data.set('NEXT_STABLE_VERSION', '"3.1.0"') if host_machine.endian() == 'big' priv_conf_data.set('WORDS_BIGENDIAN', 1) -- 2.35.1