From 2b3e5fc2f923df7b26048068f89bfe923e6b7590 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 26 Apr 2023 20:40:09 +0300 Subject: [PATCH 37/37] Msys2 Makefile.meson: Set followtag See osdn #47632 Signed-off-by: Marko Lindqvist --- fc_version | 1 + windows/installer_msys2/Makefile.meson | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fc_version b/fc_version index 9fd970985c..18161dc0f2 100755 --- a/fc_version +++ b/fc_version @@ -50,6 +50,7 @@ fi # # 5) Final. # Update DEFAULT_FOLLOW_TAG to "stable", and also +# windows/installer_msys2/Makefile.meson -Dfollowtag to "windows" # windows/installer_msys2/Makefile.autotools --with-followtag to "windows" # platforms/macos/homebrew-appbundle.sh -Dfollowtag to "macos" diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index e0a453387f..3ef7e5439d 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -143,7 +143,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) -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Druledit=false -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) $(EXTRA_CONFIG) + cd $(BUILD_DIR)/$(WINARCH)-client-$(GUI); meson setup $(IMSYS2_DIR)/../.. -Dprefix=$(IMSYS2_DIR)/$(INST_DIR)/$(WINARCH)-client-$(GUI) -Dfollowtag='windows-S3_3' -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Druledit=false -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) $(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 @@ -159,7 +159,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) -Dclients=[] -Dfcmp=[] -Druledit=true -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) $(EXTRA_CONFIG) + cd $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI); meson setup $(IMSYS2_DIR)/../.. -Dprefix=$(IMSYS2_DIR)/$(INST_DIR)/$(WINARCH)-ruledit-$(GUI) -Dfollowtag='windows-S3_3' -Dclients=[] -Dfcmp=[] -Druledit=true -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) $(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.39.2