From 35deaf410cde6bf3751239689a30de9dce89ab17 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 21 Jul 2023 22:52:46 +0300 Subject: [PATCH 16/16] Rationalize paths in Portable Windows build packages See osdn #48428 Signed-off-by: Marko Lindqvist --- platforms/windows/installer_msys2/Makefile.meson | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index b503b810c6..16615a6dda 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -16,6 +16,8 @@ INST_DIR=meson/install NSI_DIR=meson/nsi SRC_ROOT=../../.. +7ZDIR=$(OUT_DIR)/portable + ifeq ($(MSYSTEM),MINGW64) WINARCH=win64 ARCHDIR=mingw64 @@ -142,8 +144,8 @@ installer-common: install-freeciv-$(GUI) install-env-$(GUI) # Extract Freeciv version $(eval FREECIV_VERSION := $(shell $(SRC_ROOT)/fc_version)) # Create portable .7z - mkdir -p $(OUT_DIR)/portable - 7z a -r $(OUT_DIR)/portable/Freeciv-$(FREECIV_VERSION)-client-$(WINARCH)-$(GUI).7z $(INST_DIR)/$(WINARCH)-client-$(GUI) + mkdir -p $(7ZDIR) + 7z a -r $(7ZDIR)/Freeciv-$(FREECIV_VERSION)-client-$(WINARCH)-$(GUI).7z ./$(INST_DIR)/$(WINARCH)-client-$(GUI)/* # 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 @@ -381,8 +383,8 @@ installer-ruledit-common: install-ruledit-$(GUI) # Extract Freeciv version $(eval FREECIV_VERSION := $(shell $(SRC_ROOT)/fc_version)) # Create portable .7z - mkdir -p $(OUT_DIR)/portable - 7z a -r $(OUT_DIR)/portable/Freeciv-$(FREECIV_VERSION)-ruledit-$(WINARCH)-$(GUI).7z $(INST_DIR)/$(WINARCH)-ruledit-$(GUI) + mkdir -p $(7ZDIR) + 7z a -r $(7ZDIR)/Freeciv-$(FREECIV_VERSION)-ruledit-$(WINARCH)-$(GUI).7z ./$(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/* # 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