From 2de039fa030c79bd67a5ce379c17d97ae06ffba0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 24 Oct 2026 00:49:39 +0300 Subject: [PATCH 95/95] Msys2 Makefile.meson: Define followtag just once Set followtag to a variable and use that variable where ever followtag is needed. See RM #2407 Signed-off-by: Marko Lindqvist --- fc_version | 2 +- platforms/windows/installer_msys2/Makefile.meson | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fc_version b/fc_version index ee9c9f1b75..7f5b712714 100755 --- a/fc_version +++ b/fc_version @@ -51,7 +51,7 @@ fi # # 5) Final. # Update DEFAULT_FOLLOW_TAG to "stable", and also -# platforms/windows/installer_msys2/Makefile.meson -Dfollowtag to "windows" +# platforms/windows/installer_msys2/Makefile.meson FOLLOWTAG to "windows" IS_DEVEL_VERSION=1 IS_FREEZE_VERSION=0 diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 94154b2a27..6d5556ca9d 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -41,6 +41,8 @@ endif IMSYS2_DIR != pwd FREECIV_VERSION != $(SRC_ROOT)/fc_version +FOLLOWTAG='windows-S3_4' + ifeq ($(MIN_WIN_VER),) MIN_WIN_VER=$(PREF_WIN_VER) endif @@ -147,7 +149,7 @@ installer-common: install-freeciv-$(GUI) install-env-$(GUI) install-freeciv-common: clean-install-client-arch # Create build directory mkdir -p $(BUILD_DIR)/$(WINARCH)-client-$(GUI) - cd $(BUILD_DIR)/$(WINARCH)-client-$(GUI); meson setup $(IMSYS2_DIR)/../../.. -Dprefix=$(IMSYS2_DIR)/$(INST_DIR)/$(WINARCH)-client-$(GUI) -Dfollowtag='windows-S3_4' -Dwerror=true -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Dtools=manual,ruleup -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) -Dsyslua=false $(EXTRA_CONFIG) + cd $(BUILD_DIR)/$(WINARCH)-client-$(GUI); meson setup $(IMSYS2_DIR)/../../.. -Dprefix=$(IMSYS2_DIR)/$(INST_DIR)/$(WINARCH)-client-$(GUI) -Dfollowtag=$(FOLLOWTAG) -Dwerror=true -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Dtools=manual,ruleup -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) -Dsyslua=false $(EXTRA_CONFIG) cd $(BUILD_DIR)/$(WINARCH)-client-$(GUI); ninja cd $(BUILD_DIR)/$(WINARCH)-client-$(GUI); ninja install cd $(BUILD_DIR)/$(WINARCH)-client-$(GUI); ninja langstat_core.txt @@ -164,7 +166,7 @@ install-freeciv-common: clean-install-client-arch install-ruledit-common: clean-ruledit-install-arch # Create build directory mkdir -p $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI) - cd $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI); meson setup $(IMSYS2_DIR)/../../.. -Dprefix=$(IMSYS2_DIR)/$(INST_DIR)/$(WINARCH)-ruledit-$(GUI) -Dfollowtag='windows-S3_4' -Dwerror=true -Dclients=[] -Dfcmp=[] -Dserver=disabled -Dtools=ruledit -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) -Dsyslua=false $(EXTRA_CONFIG) + cd $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI); meson setup $(IMSYS2_DIR)/../../.. -Dprefix=$(IMSYS2_DIR)/$(INST_DIR)/$(WINARCH)-ruledit-$(GUI) -Dfollowtag=$(FOLLOWTAG) -Dwerror=true -Dclients=[] -Dfcmp=[] -Dserver=disabled -Dtools=ruledit -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) -Dsyslua=false $(EXTRA_CONFIG) cd $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI); ninja cd $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI); ninja install cd $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI); ninja langstat_core.txt langstat_ruledit.txt -- 2.53.0