From 247018a8c3273e8e513a1f693b5c76eab1a7d100 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 1 Jun 2023 02:01:43 +0300 Subject: [PATCH 40/40] Move installer_msys2 under platforms/windows/ See osdn #47459 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- doc/README.msys2 | 2 +- fc_version | 4 +- platforms/windows/Makefile.am | 23 +++++++++++ .../windows}/installer_msys2/.gitignore | 0 .../windows}/installer_msys2/Freeciv.url | 0 .../installer_msys2/Makefile.autotools | 39 ++++++++++--------- .../windows}/installer_msys2/Makefile.meson | 12 +++--- .../installer_msys2/cleanup_checkout.sh | 0 .../create-freeciv-gtk-qt-nsi.sh | 10 ++--- .../create-freeciv-gtk3.22-nsi.sh | 0 .../create-freeciv-gtk4-nsi.sh | 0 .../installer_msys2/create-freeciv-qt5-nsi.sh | 0 .../installer_msys2/create-freeciv-qt6-nsi.sh | 0 .../create-freeciv-ruledit-nsi.sh | 10 ++--- .../create-freeciv-sdl2-nsi.sh | 10 ++--- .../installer_msys2/freeciv-gtk3.22.cmd | 0 .../windows}/installer_msys2/freeciv-gtk4.cmd | 0 .../installer_msys2/freeciv-mp-gtk3.cmd | 0 .../installer_msys2/freeciv-mp-gtk4.cmd | 0 .../installer_msys2/freeciv-mp-qt.cmd | 0 .../windows}/installer_msys2/freeciv-qt.cmd | 0 .../installer_msys2/freeciv-ruledit.cmd | 0 .../windows}/installer_msys2/freeciv-sdl2.cmd | 0 .../installer_msys2/freeciv-server.cmd | 0 .../installer_msys2/licenses/header.txt | 0 windows/Makefile.am | 23 ----------- 27 files changed, 68 insertions(+), 67 deletions(-) rename {windows => platforms/windows}/installer_msys2/.gitignore (100%) rename {windows => platforms/windows}/installer_msys2/Freeciv.url (100%) rename {windows => platforms/windows}/installer_msys2/Makefile.autotools (90%) rename {windows => platforms/windows}/installer_msys2/Makefile.meson (94%) rename {windows => platforms/windows}/installer_msys2/cleanup_checkout.sh (100%) rename {windows => platforms/windows}/installer_msys2/create-freeciv-gtk-qt-nsi.sh (98%) rename {windows => platforms/windows}/installer_msys2/create-freeciv-gtk3.22-nsi.sh (100%) rename {windows => platforms/windows}/installer_msys2/create-freeciv-gtk4-nsi.sh (100%) rename {windows => platforms/windows}/installer_msys2/create-freeciv-qt5-nsi.sh (100%) rename {windows => platforms/windows}/installer_msys2/create-freeciv-qt6-nsi.sh (100%) rename {windows => platforms/windows}/installer_msys2/create-freeciv-ruledit-nsi.sh (97%) rename {windows => platforms/windows}/installer_msys2/create-freeciv-sdl2-nsi.sh (98%) rename {windows => platforms/windows}/installer_msys2/freeciv-gtk3.22.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-gtk4.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-mp-gtk3.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-mp-gtk4.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-mp-qt.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-qt.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-ruledit.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-sdl2.cmd (100%) rename {windows => platforms/windows}/installer_msys2/freeciv-server.cmd (100%) rename {windows => platforms/windows}/installer_msys2/licenses/header.txt (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d552c163dc..ae8740f666 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: build shell: msys2 {0} run: | - cd windows/installer_msys2 + cd platforms/windows/installer_msys2 make -f Makefile.meson ci os_x: runs-on: macos-13 diff --git a/doc/README.msys2 b/doc/README.msys2 index 39424ffd58..aa14c67047 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -193,7 +193,7 @@ Get the freeciv sources there somehow. Some options are: 3) Copy them from Windows folder where they are to a directory that is within msys2 -> cd windows/installer_msys2 +> cd platforms/windows/installer_msys2 > make -f Makefile.autotools Target can be: diff --git a/fc_version b/fc_version index 5df3ba3387..0019b3843b 100755 --- a/fc_version +++ b/fc_version @@ -50,8 +50,8 @@ 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/windows/installer_msys2/Makefile.meson -Dfollowtag to "windows" +# platforms/windows/installer_msys2/Makefile.autotools --with-followtag to "windows" # platforms/macos/homebrew-appbundle.sh -Dfollowtag to "macos" IS_DEVEL_VERSION=1 diff --git a/platforms/windows/Makefile.am b/platforms/windows/Makefile.am index 99d43e0a1a..fb440a81a1 100644 --- a/platforms/windows/Makefile.am +++ b/platforms/windows/Makefile.am @@ -1,3 +1,26 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = icons + +dist_noinst_DATA = \ + installer_msys2/licenses/header.txt \ + installer_msys2/create-freeciv-gtk-qt-nsi.sh \ + installer_msys2/create-freeciv-gtk3.22-nsi.sh \ + installer_msys2/create-freeciv-gtk4-nsi.sh \ + installer_msys2/create-freeciv-qt5-nsi.sh \ + installer_msys2/create-freeciv-qt6-nsi.sh \ + installer_msys2/create-freeciv-sdl2-nsi.sh \ + installer_msys2/create-freeciv-ruledit-nsi.sh \ + installer_msys2/freeciv-gtk3.22.cmd \ + installer_msys2/freeciv-gtk4.cmd \ + installer_msys2/freeciv-mp-gtk3.cmd \ + installer_msys2/freeciv-mp-gtk4.cmd \ + installer_msys2/freeciv-mp-qt.cmd \ + installer_msys2/freeciv-qt.cmd \ + installer_msys2/freeciv-sdl2.cmd \ + installer_msys2/freeciv-server.cmd \ + installer_msys2/freeciv-ruledit.cmd \ + installer_msys2/Freeciv.url \ + installer_msys2/Makefile.autotools \ + installer_msys2/Makefile.meson \ + installer_msys2/cleanup_checkout.sh diff --git a/windows/installer_msys2/.gitignore b/platforms/windows/installer_msys2/.gitignore similarity index 100% rename from windows/installer_msys2/.gitignore rename to platforms/windows/installer_msys2/.gitignore diff --git a/windows/installer_msys2/Freeciv.url b/platforms/windows/installer_msys2/Freeciv.url similarity index 100% rename from windows/installer_msys2/Freeciv.url rename to platforms/windows/installer_msys2/Freeciv.url diff --git a/windows/installer_msys2/Makefile.autotools b/platforms/windows/installer_msys2/Makefile.autotools similarity index 90% rename from windows/installer_msys2/Makefile.autotools rename to platforms/windows/installer_msys2/Makefile.autotools index 197cd1f08a..b2432d8251 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/platforms/windows/installer_msys2/Makefile.autotools @@ -13,6 +13,7 @@ OUT_DIR=autotools/output BUILD_DIR=autotools/build INST_DIR=autotools/install NSI_DIR=autotools/nsi +SRC_ROOT=../../.. ifeq ($(MSYSTEM),MINGW64) WINARCH=win64 @@ -138,12 +139,12 @@ ruledit-installer-qt6: make -f $(MAKEFILE_NAME) EXTRA_CONFIG="$(EXTRA_CONFIG)" MOCCMD="$(QT6_MOCCMD)" wrap-ruledit-qt6 snapshot: - cd ../.. ; ./autogen.sh --no-configure-run - make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" all + cd $(SRC_ROOT) ; ./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: - cd ../.. ; ./autogen.sh --no-configure-run - make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" ruledit-installer-qt6 + cd $(SRC_ROOT) ; ./autogen.sh --no-configure-run + make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=$(SRC_ROOT)/../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" ruledit-installer-qt6 # Configure Freeciv @@ -151,19 +152,19 @@ configure-freeciv-common: # Create build directory mkdir -p $(BUILD_DIR)/$(WINARCH)-$(GUI) # Configure - cd $(BUILD_DIR)/$(WINARCH)-$(GUI); ../../../../../configure FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(CLIENT) --with-followtag="windows-S3_3" --with-tinycthread --without-readline --disable-sys-lua --enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR) --enable-fcmp=$(FCMP) --with-cacert-path="./ssl/certs/ca-bundle.crt" $(EXTRA_CONFIG) + cd $(BUILD_DIR)/$(WINARCH)-$(GUI); $(SRC_ROOT)/../../../configure FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(CLIENT) --with-followtag="windows-S3_3" --with-tinycthread --without-readline --disable-sys-lua --enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR) --enable-fcmp=$(FCMP) --with-cacert-path="./ssl/certs/ca-bundle.crt" $(EXTRA_CONFIG) configure-freeciv-ruledit-qt5: # Create build directory mkdir -p $(BUILD_DIR)/$(WINARCH)-ruledit-qt5 # Configure - cd $(BUILD_DIR)/$(WINARCH)-ruledit-qt5; ../../../../../configure FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-qtver=qt5 --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --disable-sys-lua --enable-ruledit --enable-ai-static=stub --with-cacert-path="./ssl/certs/ca-bundle.crt" --with-qt5-includes=/$(ARCHDIR)/include --with-qt5-libs=/$(ARCHDIR)/lib $(EXTRA_CONFIG) + cd $(BUILD_DIR)/$(WINARCH)-ruledit-qt5; $(SRC_ROOT)/../../../configure FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-qtver=qt5 --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --disable-sys-lua --enable-ruledit --enable-ai-static=stub --with-cacert-path="./ssl/certs/ca-bundle.crt" --with-qt5-includes=/$(ARCHDIR)/include --with-qt5-libs=/$(ARCHDIR)/lib $(EXTRA_CONFIG) configure-freeciv-ruledit-qt6: # Create build directory mkdir -p $(BUILD_DIR)/$(WINARCH)-ruledit-qt6 # Configure - cd $(BUILD_DIR)/$(WINARCH)-ruledit-qt6; ../../../../../configure FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-qtver=qt6 --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --disable-sys-lua --enable-ruledit --enable-ai-static=stub --with-cacert-path="./ssl/certs/ca-bundle.crt" --with-qt6-includes=/$(ARCHDIR)/include/qt6 --with-qt6-libs=/$(ARCHDIR)/lib $(EXTRA_CONFIG) + cd $(BUILD_DIR)/$(WINARCH)-ruledit-qt6; $(SRC_ROOT)/../../../configure FREECIV_LABEL_FORCE="-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-qtver=qt6 --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --disable-sys-lua --enable-ruledit --enable-ai-static=stub --with-cacert-path="./ssl/certs/ca-bundle.crt" --with-qt6-includes=/$(ARCHDIR)/include/qt6 --with-qt6-libs=/$(ARCHDIR)/lib $(EXTRA_CONFIG) # Install Freeciv @@ -173,7 +174,7 @@ install-freeciv-common: clean-install-common configure-freeciv-common make -C $(BUILD_DIR)/$(WINARCH)-$(GUI)/bootstrap langstat_core.txt # Restore .po files modified by the above update-po, so that repository does not # Without this, sources would appear modified, in case of --enable-gitrev - ./cleanup_checkout.sh ../.. + ./cleanup_checkout.sh $(SRC_ROOT) # Make install make -C $(BUILD_DIR)/$(WINARCH)-$(GUI) DESTDIR=`pwd`/$(INST_DIR)/$(WINARCH)-$(GUI) $(MAKE_PARAMS) install # Reorder directory layout @@ -186,7 +187,7 @@ install-freeciv-common: clean-install-common configure-freeciv-common mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/debuginfo cp $(BUILD_DIR)/$(WINARCH)-$(GUI)/gen_headers/fc_config.h $(INST_DIR)/$(WINARCH)-$(GUI)/debuginfo mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/doc/freeciv/installer - cat licenses/header.txt ../../COPYING > $(INST_DIR)/$(WINARCH)-$(GUI)/doc/freeciv/installer/COPYING.installer + cat licenses/header.txt $(SRC_ROOT)/COPYING > $(INST_DIR)/$(WINARCH)-$(GUI)/doc/freeciv/installer/COPYING.installer # Delete unneeded files rm -r $(INST_DIR)/$(WINARCH)-$(GUI)/$(INSTSUB) # Strip 'freeciv-manual' and 'freeciv-mp-' executables @@ -222,7 +223,7 @@ install-ruledit-qt5: configure-freeciv-ruledit-qt5 install-ruledit-dir-qt5 make -C $(BUILD_DIR)/$(WINARCH)-ruledit-qt5/bootstrap langstat_ruledit.txt # Restore .po files modified by the above update-po, so that repository does not # Without this, sources would appear modified, in case of --enable-gitrev - ./cleanup_checkout.sh ../.. + ./cleanup_checkout.sh $(SRC_ROOT) # Make install make -C $(BUILD_DIR)/$(WINARCH)-ruledit-qt5 DESTDIR=`pwd`/$(INST_DIR)/$(WINARCH)-ruledit-qt5/ $(MAKE_PARAMS) install # Reorder directory layout @@ -233,7 +234,7 @@ install-ruledit-qt5: configure-freeciv-ruledit-qt5 install-ruledit-dir-qt5 mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt5/debuginfo cp $(BUILD_DIR)/$(WINARCH)-ruledit-qt5/gen_headers/fc_config.h $(INST_DIR)/$(WINARCH)-ruledit-qt5/debuginfo mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt5/doc/freeciv/installer - cat licenses/header.txt ../../COPYING > $(INST_DIR)/$(WINARCH)-ruledit-qt5/doc/freeciv/installer/COPYING.installer + cat licenses/header.txt $(SRC_ROOT)/COPYING > $(INST_DIR)/$(WINARCH)-ruledit-qt5/doc/freeciv/installer/COPYING.installer # Delete unneeded files rm -r $(INST_DIR)/$(WINARCH)-ruledit-qt5/$(INSTSUB) # Strip 'freeciv-ruledit' executable @@ -247,7 +248,7 @@ install-ruledit-qt6: configure-freeciv-ruledit-qt6 install-ruledit-dir-qt6 make -C $(BUILD_DIR)/$(WINARCH)-ruledit-qt6/bootstrap langstat_ruledit.txt # Restore .po files modified by the above update-po, so that repository does not # Without this, sources would appear modified, in case of --enable-gitrev - ./cleanup_checkout.sh ../.. + ./cleanup_checkout.sh $(SRC_ROOT) # Make install make -C $(BUILD_DIR)/$(WINARCH)-ruledit-qt6 DESTDIR=`pwd`/$(INST_DIR)/$(WINARCH)-ruledit-qt6/ $(MAKE_PARAMS) install # Reorder directory layout @@ -258,7 +259,7 @@ install-ruledit-qt6: configure-freeciv-ruledit-qt6 install-ruledit-dir-qt6 mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt6/debuginfo cp $(BUILD_DIR)/$(WINARCH)-ruledit-qt6/gen_headers/fc_config.h $(INST_DIR)/$(WINARCH)-ruledit-qt6/debuginfo mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt6/doc/freeciv/installer - cat licenses/header.txt ../../COPYING > $(INST_DIR)/$(WINARCH)-ruledit-qt6/doc/freeciv/installer/COPYING.installer + cat licenses/header.txt $(SRC_ROOT)/COPYING > $(INST_DIR)/$(WINARCH)-ruledit-qt6/doc/freeciv/installer/COPYING.installer # Delete unneeded files rm -r $(INST_DIR)/$(WINARCH)-ruledit-qt6/$(INSTSUB) # Strip 'freeciv-ruledit' executable @@ -597,7 +598,7 @@ install-env-ruledit-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)-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi @@ -607,7 +608,7 @@ installer-common: install-freeciv-$(GUI) install-env-$(GUI) installer-ruledit-qt5: clean-install-ruledit-qt5 install-ruledit-qt5 install-env-ruledit-qt5 # 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-qt5 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt5.nsi @@ -617,7 +618,7 @@ installer-ruledit-qt5: clean-install-ruledit-qt5 install-ruledit-qt5 install-env installer-ruledit-qt6: clean-install-ruledit-qt6 install-ruledit-qt6 install-env-ruledit-qt6 # 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-qt6 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > $(NSI_DIR)/$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt6.nsi @@ -652,15 +653,15 @@ clean-build-ruledit-qt6: clean-install-common: rm -rf $(INST_DIR)/*-$(GUI) - ./cleanup_checkout.sh ../.. + ./cleanup_checkout.sh $(SRC_ROOT) clean-install-ruledit-qt5: rm -rf $(INST_DIR)/ruledit-qt5 - ./cleanup_checkout.sh ../.. + ./cleanup_checkout.sh $(SRC_ROOT) clean-install-ruledit-qt6: rm -rf $(INST_DIR)/ruledit-qt6 - ./cleanup_checkout.sh ../.. + ./cleanup_checkout.sh $(SRC_ROOT) clean-installer-common: rm -f $(OUT_DIR)/Freeciv-*-$(GUI)-setup.exe diff --git a/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson similarity index 94% rename from windows/installer_msys2/Makefile.meson rename to platforms/windows/installer_msys2/Makefile.meson index 02f2a4aa42..bc4c875e83 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -132,7 +132,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 ../../../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 @@ -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) -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); 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 @@ -153,13 +153,13 @@ 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 ../../../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 # 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_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); 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 @@ -169,7 +169,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 ../../../COPYING > $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/doc/freeciv/installer/COPYING.installer cp freeciv-ruledit.cmd Freeciv.url $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/ SOUND_DLLS := \ @@ -368,7 +368,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 ../../../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 diff --git a/windows/installer_msys2/cleanup_checkout.sh b/platforms/windows/installer_msys2/cleanup_checkout.sh similarity index 100% rename from windows/installer_msys2/cleanup_checkout.sh rename to platforms/windows/installer_msys2/cleanup_checkout.sh diff --git a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh b/platforms/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh similarity index 98% rename from windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh rename to platforms/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh index 034a485c2e..f049800f57 100644 --- a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh +++ b/platforms/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh @@ -189,14 +189,14 @@ SectionGroupEnd EOF -### additional languages ### +### Additional languages ### cat <