From 23e05e3413846cb3e906f1f761a148ef6cfff1aa Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 14 Feb 2023 17:27:22 +0200 Subject: [PATCH 43/43] Msys2: Move generated .nsi files to output directory hierarchy See osdn #47354 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.autotools | 22 +++++++++++++--------- windows/installer_msys2/Makefile.meson | 16 ++++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index c635d86353..24e5ba7426 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -11,6 +11,7 @@ MAKEFILE_NAME=Makefile.autotools OUT_DIR=autotools/Output INST_DIR=autotools/install +NSI_DIR=autotools/nsi ifeq ($(MSYSTEM),MINGW64) WINARCH=win64 @@ -582,28 +583,31 @@ installer-common: install-freeciv-$(GUI) install-env-$(GUI) # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) # Create NSIS script - ./create-freeciv-$(GUI)-nsi.sh $(INST_DIR)/$(WINARCH)-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi + mkdir -p $(NSI_DIR) + ./create-freeciv-$(GUI)-nsi.sh $(INST_DIR)/$(WINARCH)-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi # Create installer executable mkdir -p $(OUT_DIR) - makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi + makensis -NOCD $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi installer-ruledit-qt5: clean-install-ruledit-qt5 install-ruledit-qt5 install-env-ruledit-qt5 # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) # Create NSIS script - ./create-freeciv-ruledit-nsi.sh $(INST_DIR)/$(WINARCH)-ruledit-qt5 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt5.nsi + mkdir -p $(NSI_DIR) + ./create-freeciv-ruledit-nsi.sh $(INST_DIR)/$(WINARCH)-ruledit-qt5 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt5.nsi # Create installer executable mkdir -p $(OUT_DIR) - makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt5.nsi + makensis -NOCD $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt5.nsi installer-ruledit-qt6: clean-install-ruledit-qt6 install-ruledit-qt6 install-env-ruledit-qt6 # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) # Create NSIS script - ./create-freeciv-ruledit-nsi.sh $(INST_DIR)/$(WINARCH)-ruledit-qt6 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt6.nsi + mkdir -p $(NSI_DIR) + ./create-freeciv-ruledit-nsi.sh $(INST_DIR)/$(WINARCH)-ruledit-qt6 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt6.nsi # Create installer executable mkdir -p $(OUT_DIR) - makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt6.nsi + makensis -NOCD $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt6.nsi wrap-gtk3.22: installer-common @@ -644,15 +648,15 @@ clean-install-ruledit-qt6: clean-installer-common: rm -f $(OUT_DIR)/Freeciv-*-$(GUI)-setup.exe - rm -f Freeciv-*-$(GUI).nsi + rm -f $(NSI_DIR)/*-$(GUI).nsi clean-installer-ruledit-qt5: rm -f $(OUT_DIR)/Freeciv-ruledit-*-setup.exe - rm -f Freeciv-*-ruledit-qt5.nsi + rm -f $(NSI_DIR)/*-ruledit-qt5.nsi clean-installer-ruledit-qt6: rm -f $(OUT_DIR)/Freeciv-ruledit-*-setup.exe - rm -f Freeciv-*-ruledit-qt6.nsi + rm -f $(NSI_DIR)*-ruledit-qt6.nsi clean: make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 clean-build-common clean-install-common clean-installer-common diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 67a88a5d70..cf47e7229e 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -12,6 +12,7 @@ MAKEFILE_NAME=Makefile.meson OUT_DIR=meson/Output INST_DIR=meson/install +NSI_DIR=meson/nsi ifeq ($(MSYSTEM),MINGW64) WINARCH=win64 @@ -120,10 +121,12 @@ ruledit-install-qt6: installer-common: install-freeciv-$(GUI) install-env-$(GUI) # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) - ./create-freeciv-$(GUI)-nsi.sh $(INST_DIR)/$(WINARCH)-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-meson-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi + # Create NSIS script + mkdir -p $(NSI_DIR) + ./create-freeciv-$(GUI)-nsi.sh $(INST_DIR)/$(WINARCH)-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi # Create installer executable mkdir -p $(OUT_DIR) - makensis Freeciv-meson-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi + makensis -NOCD $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi install-freeciv-common: clean-install-common # Create build directory @@ -354,10 +357,11 @@ installer-ruledit-common: install-ruledit-$(GUI) # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) # Create NSIS script - ./create-freeciv-ruledit-nsi.sh $(INST_DIR)/$(WINARCH)-ruledit-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-meson-$(WINARCH)-$(FREECIV_VERSION)-ruledit-$(GUI).nsi + 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 # Create installer executable mkdir -p $(OUT_DIR) - makensis Freeciv-meson-$(WINARCH)-$(FREECIV_VERSION)-ruledit-$(GUI).nsi + makensis -NOCD $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-$(GUI).nsi RULEDIT_QT5_DLLS := \ libmd4c.dll \ @@ -404,11 +408,11 @@ clean-install-common: clean-installer-common: rm -f $(OUT_DIR)/Freeciv-*-$(GUI)-setup.exe - rm -f Freeciv-meson-*-$(GUI).nsi + rm -f $(NSI_DIR)/*-$(GUI).nsi clean-ruledit-common: rm -f $(OUT_DIR)/Freeciv-ruledit-*-setup.exe - rm -f Freeciv-meson-*-ruledit-$(GUI).nsi + rm -f $(NSI_DIR)/*-ruledit-$(GUI).nsi clean: make -f $(MAKEFILE_NAME) GUI=gtk3.22 clean-build-common clean-install-common clean-installer-common -- 2.39.1