From 844b402b8aa50dc9e45ca30869538f14cf59ccec Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 25 Aug 2024 02:44:59 +0300 Subject: [PATCH 18/19] Freeze datafile formats - Bump datafile capstrings to their final freeciv-3.2 form - Set version number to 3.2.0, and freeze version flag on - Set datasubdir to "3.2" See RM #397 Signed-off-by: Marko Lindqvist --- fc_version | 10 +++++----- meson.build | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fc_version b/fc_version index 029b351fa1..a4548ab052 100755 --- a/fc_version +++ b/fc_version @@ -6,9 +6,9 @@ # Version definition for Freeciv. MAJOR_VERSION="3" -MINOR_VERSION="1" -PATCH_VERSION="94" -EMERGENCY_VERSION="10" +MINOR_VERSION="2" +PATCH_VERSION="0" +EMERGENCY_VERSION="" VERSION_LABEL="-alpha3+" # Type is either "development" or "stable" @@ -56,7 +56,7 @@ fi # platforms/macos/homebrew-appbundle.sh -Dfollowtag to "macos" IS_DEVEL_VERSION=1 -IS_FREEZE_VERSION=0 +IS_FREEZE_VERSION=1 IS_BETA_VERSION=0 NEXT_STABLE_VERSION="3.2.0" @@ -65,7 +65,7 @@ NEXT_STABLE_VERSION="3.2.0" RELEASE_MONTH=0 MAIN_VERSION=3.2 -DATASUBDIR=test +DATASUBDIR=3.2 DEFAULT_FOLLOW_TAG=S3_2 # Freeciv network capstring: see documentation in common/capstr.c diff --git a/meson.build b/meson.build index b61fd5ee07..85d84c3856 100644 --- a/meson.build +++ b/meson.build @@ -124,10 +124,10 @@ priv_conf_data.set('SYSCONFDIR', # Release cycle phases # See fc_version about proper values for these. -datasubdir = 'test' +datasubdir = '3.2' priv_conf_data.set('DATASUBDIR', datasubdir) priv_conf_data.set('IS_DEVEL_VERSION', 1) -priv_conf_data.set('IS_FREEZE_VERSION', 0) +priv_conf_data.set('IS_FREEZE_VERSION', 1) priv_conf_data.set('IS_BETA_VERSION', 0) priv_conf_data.set('FREECIV_RELEASE_MONTH', 0) priv_conf_data.set('NEXT_STABLE_VERSION', '"3.2.0"') -- 2.45.2