From 3613d6bf6ec460312ed7afe4c780a0ec23888ce8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 29 Jun 2023 07:26:26 +0300 Subject: [PATCH 30/30] Msys2: Refresh ChangeLog before snapshot build creation See osdn #44497 Signed-off-by: Marko Lindqvist --- platforms/windows/installer_msys2/Makefile.autotools | 2 +- platforms/windows/installer_msys2/Makefile.meson | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platforms/windows/installer_msys2/Makefile.autotools b/platforms/windows/installer_msys2/Makefile.autotools index 15a5f1525e..0e74a7d1dd 100644 --- a/platforms/windows/installer_msys2/Makefile.autotools +++ b/platforms/windows/installer_msys2/Makefile.autotools @@ -139,7 +139,7 @@ ruledit-installer-qt6: make -f $(MAKEFILE_NAME) EXTRA_CONFIG="$(EXTRA_CONFIG)" MOCCMD="$(QT6_MOCCMD)" wrap-ruledit-qt6 snapshot: - cd $(SRC_ROOT) ; ./autogen.sh --no-configure-run + cd $(SRC_ROOT) ; ./scripts/refresh_changelog.sh ; ./autogen.sh --no-configure-run make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="--enable-gitrev --with-project-definition=$(SRC_ROOT)/../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" all ci: diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index dba5fd35f8..6df0af7587 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -14,6 +14,7 @@ OUT_DIR=meson/output BUILD_DIR=meson/build INST_DIR=meson/install NSI_DIR=meson/nsi +SRC_ROOT=../../.. ifeq ($(MSYSTEM),MINGW64) WINARCH=win64 @@ -89,6 +90,7 @@ all-win64+: gtk3.22-install sdl2-install gtk4-install qt6-install ruledit-instal all-win32+: gtk3.22-install sdl2-install gtk4-install qt5-install ruledit-install-qt5 snapshot: + cd $(SRC_ROOT) ; ./scripts/refresh_changelog.sh make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all ci: @@ -138,7 +140,7 @@ ruledit-install-qt6: installer-common: install-freeciv-$(GUI) install-env-$(GUI) # Extract Freeciv version - $(eval FREECIV_VERSION := $(shell ../../../fc_version)) + $(eval FREECIV_VERSION := $(shell $(SRC_ROOT)/fc_version)) # Create NSIS script mkdir -p $(NSI_DIR) ./create-freeciv-$(GUI)-nsi.sh $(INST_DIR)/$(WINARCH)-client-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi @@ -159,7 +161,7 @@ install-freeciv-common: clean-install-client-arch mv $(INST_DIR)/$(WINARCH)-client-$(GUI)/share/freeciv $(INST_DIR)/$(WINARCH)-client-$(GUI)/data mv $(INST_DIR)/$(WINARCH)-client-$(GUI)/share/doc $(INST_DIR)/$(WINARCH)-client-$(GUI)/ mkdir -p $(INST_DIR)/$(WINARCH)-client-$(GUI)/doc/freeciv/installer - cat licenses/header.txt ../../../COPYING > $(INST_DIR)/$(WINARCH)-client-$(GUI)/doc/freeciv/installer/COPYING.installer + cat licenses/header.txt $(SRC_ROOT)/COPYING > $(INST_DIR)/$(WINARCH)-client-$(GUI)/doc/freeciv/installer/COPYING.installer cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(CLIENT).cmd Freeciv.url $(INST_DIR)/$(WINARCH)-client-$(GUI)/ install-ruledit-common: clean-ruledit-install-arch @@ -175,7 +177,7 @@ install-ruledit-common: clean-ruledit-install-arch mv $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/share/freeciv $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/data mv $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/share/doc $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/ mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/doc/freeciv/installer - cat licenses/header.txt ../../../COPYING > $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/doc/freeciv/installer/COPYING.installer + cat licenses/header.txt $(SRC_ROOT)/COPYING > $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/doc/freeciv/installer/COPYING.installer cp freeciv-ruledit.cmd Freeciv.url $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/ SOUND_DLLS := \ @@ -374,7 +376,7 @@ installer-ruledit-common: install-ruledit-$(GUI) # Add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/ # Extract Freeciv version - $(eval FREECIV_VERSION := $(shell ../../../fc_version)) + $(eval FREECIV_VERSION := $(shell $(SRC_ROOT)/fc_version)) # Create NSIS script mkdir -p $(NSI_DIR) ./create-freeciv-ruledit-nsi.sh $(INST_DIR)/$(WINARCH)-ruledit-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-$(GUI).nsi -- 2.40.1