From 6418c8515769262701b4de986144887fddcf5ebf Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 18 Jan 2023 00:17:19 +0200 Subject: [PATCH 35/35] Msys2 autotools: Move install directories under autotools/ "install-..." -> "autotools/install/..." See osdn #46538 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.autotools | 273 +++++++++++---------- 1 file changed, 137 insertions(+), 136 deletions(-) diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index c112443f81..c635d86353 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -10,6 +10,7 @@ MAKEFILE_NAME=Makefile.autotools OUT_DIR=autotools/Output +INST_DIR=autotools/install ifeq ($(MSYSTEM),MINGW64) WINARCH=win64 @@ -150,31 +151,31 @@ configure-freeciv-ruledit-qt6: # install Freeciv install-freeciv-common: clean-install-common configure-freeciv-common - # make .gmo and langstat files. For the former, this needs to be before 'make install' + # Make .gmo and langstat files. For the former, this needs to be before 'make install' make -C build-$(WINARCH)-$(GUI)/translations/core update-po make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt # Restore .po files modified by the above update-po, so that repository does not # appear modified, in case of --enable-gitrev ./cleanup_checkout.sh ../.. - # make install - make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(GUI) $(MAKE_PARAMS) install - # reorder directory layout - mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/bin/* install-$(WINARCH)-$(GUI)/ - mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/etc install-$(WINARCH)-$(GUI)/ - mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/share/freeciv install-$(WINARCH)-$(GUI)/data - mkdir -p install-$(WINARCH)-$(GUI)/share - mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/share/locale install-$(WINARCH)-$(GUI)/share/ - mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/share/doc install-$(WINARCH)-$(GUI)/doc - mkdir -p install-$(WINARCH)-$(GUI)/debuginfo - cp build-$(WINARCH)-$(GUI)/gen_headers/fc_config.h install-$(WINARCH)-$(GUI)/debuginfo - mkdir -p install-$(WINARCH)-$(GUI)/doc/freeciv/installer - cat licenses/header.txt ../../COPYING > install-$(WINARCH)-$(GUI)/doc/freeciv/installer/COPYING.installer - # delete unneeded files - rm -r install-$(WINARCH)-$(GUI)/$(INSTSUB) - # strip 'freeciv-manual' and 'freeciv-mp-' executables - strip install-$(WINARCH)-$(GUI)/freeciv-m* - # add start menu files - cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(CLIENT).cmd Freeciv.url install-$(WINARCH)-$(GUI)/ + # Make install + make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/$(INST_DIR)/$(WINARCH)-$(GUI) $(MAKE_PARAMS) install + # Reorder directory layout + mv $(INST_DIR)/$(WINARCH)-$(GUI)/$(INSTSUB)/bin/* $(INST_DIR)/$(WINARCH)-$(GUI)/ + mv $(INST_DIR)/$(WINARCH)-$(GUI)/$(INSTSUB)/etc $(INST_DIR)/$(WINARCH)-$(GUI)/ + mv $(INST_DIR)/$(WINARCH)-$(GUI)/$(INSTSUB)/share/freeciv $(INST_DIR)/$(WINARCH)-$(GUI)/data + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/share + mv $(INST_DIR)/$(WINARCH)-$(GUI)/$(INSTSUB)/share/locale $(INST_DIR)/$(WINARCH)-$(GUI)/share/ + mv $(INST_DIR)/$(WINARCH)-$(GUI)/$(INSTSUB)/share/doc $(INST_DIR)/$(WINARCH)-$(GUI)/doc + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/debuginfo + cp build-$(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 + # Delete unneeded files + rm -r $(INST_DIR)/$(WINARCH)-$(GUI)/$(INSTSUB) + # Strip 'freeciv-manual' and 'freeciv-mp-' executables + strip $(INST_DIR)/$(WINARCH)-$(GUI)/freeciv-m* + # Add start menu files + cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(CLIENT).cmd Freeciv.url $(INST_DIR)/$(WINARCH)-$(GUI)/ install-freeciv-gtk3.22: install-freeciv-common @@ -183,72 +184,72 @@ install-freeciv-gtk4: install-freeciv-common install-freeciv-sdl2: install-freeciv-common install-freeciv-qt5: install-freeciv-common - # strip 'freeciv-ruledit' executable - strip install-$(WINARCH)-$(GUI)/freeciv-ruledit.exe - cp freeciv-ruledit.cmd install-$(WINARCH)-$(GUI)/ + # Strip 'freeciv-ruledit' executable + strip $(INST_DIR)/$(WINARCH)-$(GUI)/freeciv-ruledit.exe + cp freeciv-ruledit.cmd $(INST_DIR)/$(WINARCH)-$(GUI)/ install-freeciv-qt6: install-freeciv-common - # strip 'freeciv-ruledit' executable - strip install-$(WINARCH)-$(GUI)/freeciv-ruledit.exe - cp freeciv-ruledit.cmd install-$(WINARCH)-$(GUI)/ + # Strip 'freeciv-ruledit' executable + strip $(INST_DIR)/$(WINARCH)-$(GUI)/freeciv-ruledit.exe + cp freeciv-ruledit.cmd $(INST_DIR)/$(WINARCH)-$(GUI)/ install-ruledit-dir-qt5: - mkdir -p install-$(WINARCH)-ruledit-qt5/share + mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt5/share install-ruledit-dir-qt6: - mkdir -p install-$(WINARCH)-ruledit-qt6/share + mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt6/share install-ruledit-qt5: configure-freeciv-ruledit-qt5 install-ruledit-dir-qt5 - # make .gmo and langstat files. For the former, this needs to be before 'make install' + # Make .gmo and langstat files. For the former, this needs to be before 'make install' make -C build-$(WINARCH)-ruledit-qt5/translations/ruledit update-po make -C build-$(WINARCH)-ruledit-qt5/bootstrap langstat_ruledit.txt # Restore .po files modified by the above update-po, so that repository does not # appear modified, in case of --enable-gitrev ./cleanup_checkout.sh ../.. - # make install - make -C build-$(WINARCH)-ruledit-qt5 DESTDIR=`pwd`/install-$(WINARCH)-ruledit-qt5/ $(MAKE_PARAMS) install - # reorder directory layout - mv install-$(WINARCH)-ruledit-qt5/$(INSTSUB)/bin/* install-$(WINARCH)-ruledit-qt5/ - mv install-$(WINARCH)-ruledit-qt5/$(INSTSUB)/share/freeciv install-$(WINARCH)-ruledit-qt5/data - mv install-$(WINARCH)-ruledit-qt5/$(INSTSUB)/share/locale install-$(WINARCH)-ruledit-qt5/share/ - mv install-$(WINARCH)-ruledit-qt5/$(INSTSUB)/share/doc install-$(WINARCH)-ruledit-qt5/doc - mkdir -p install-$(WINARCH)-ruledit-qt5/debuginfo - cp build-$(WINARCH)-ruledit-qt5/gen_headers/fc_config.h install-$(WINARCH)-ruledit-qt5/debuginfo - mkdir -p install-$(WINARCH)-ruledit-qt5/doc/freeciv/installer - cat licenses/header.txt ../../COPYING > install-$(WINARCH)-ruledit-qt5/doc/freeciv/installer/COPYING.installer - # delete unneeded files - rm -r install-$(WINARCH)-ruledit-qt5/$(INSTSUB) - # strip 'freeciv-ruledit' executable - strip install-$(WINARCH)-ruledit-qt5/freeciv-ruledit.exe - # add start menu files - cp freeciv-ruledit.cmd Freeciv.url install-$(WINARCH)-ruledit-qt5/ + # Make install + make -C build-$(WINARCH)-ruledit-qt5 DESTDIR=`pwd`/$(INST_DIR)/$(WINARCH)-ruledit-qt5/ $(MAKE_PARAMS) install + # Reorder directory layout + mv $(INST_DIR)/$(WINARCH)-ruledit-qt5/$(INSTSUB)/bin/* $(INST_DIR)/$(WINARCH)-ruledit-qt5/ + mv $(INST_DIR)/$(WINARCH)-ruledit-qt5/$(INSTSUB)/share/freeciv $(INST_DIR)/$(WINARCH)-ruledit-qt5/data + mv $(INST_DIR)/$(WINARCH)-ruledit-qt5/$(INSTSUB)/share/locale $(INST_DIR)/$(WINARCH)-ruledit-qt5/share/ + mv $(INST_DIR)/$(WINARCH)-ruledit-qt5/$(INSTSUB)/share/doc $(INST_DIR)/$(WINARCH)-ruledit-qt5/doc + mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt5/debuginfo + cp build-$(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 + # Delete unneeded files + rm -r $(INST_DIR)/$(WINARCH)-ruledit-qt5/$(INSTSUB) + # Strip 'freeciv-ruledit' executable + strip $(INST_DIR)/$(WINARCH)-ruledit-qt5/freeciv-ruledit.exe + # Add start menu files + cp freeciv-ruledit.cmd Freeciv.url $(INST_DIR)/$(WINARCH)-ruledit-qt5/ install-ruledit-qt6: configure-freeciv-ruledit-qt6 install-ruledit-dir-qt6 - # make .gmo and langstat files. For the former, this needs to be before 'make install' + # Make .gmo and langstat files. For the former, this needs to be before 'make install' make -C build-$(WINARCH)-ruledit-qt6/translations/ruledit update-po make -C build-$(WINARCH)-ruledit-qt6/bootstrap langstat_ruledit.txt # Restore .po files modified by the above update-po, so that repository does not # appear modified, in case of --enable-gitrev ./cleanup_checkout.sh ../.. - # make install - make -C build-$(WINARCH)-ruledit-qt6 DESTDIR=`pwd`/install-$(WINARCH)-ruledit-qt6/ $(MAKE_PARAMS) install - # reorder directory layout - mv install-$(WINARCH)-ruledit-qt6/$(INSTSUB)/bin/* install-$(WINARCH)-ruledit-qt6/ - mv install-$(WINARCH)-ruledit-qt6/$(INSTSUB)/share/freeciv install-$(WINARCH)-ruledit-qt6/data - mv install-$(WINARCH)-ruledit-qt6/$(INSTSUB)/share/locale install-$(WINARCH)-ruledit-qt6/share/ - mv install-$(WINARCH)-ruledit-qt6/$(INSTSUB)/share/doc install-$(WINARCH)-ruledit-qt6/doc - mkdir -p install-$(WINARCH)-ruledit-qt6/debuginfo - cp build-$(WINARCH)-ruledit-qt6/gen_headers/fc_config.h install-$(WINARCH)-ruledit-qt6/debuginfo - mkdir -p install-$(WINARCH)-ruledit-qt6/doc/freeciv/installer - cat licenses/header.txt ../../COPYING > install-$(WINARCH)-ruledit-qt6/doc/freeciv/installer/COPYING.installer - # delete unneeded files - rm -r install-$(WINARCH)-ruledit-qt6/$(INSTSUB) - # strip 'freeciv-ruledit' executable - strip install-$(WINARCH)-ruledit-qt6/freeciv-ruledit.exe - # add start menu files - cp freeciv-ruledit.cmd Freeciv.url install-$(WINARCH)-ruledit-qt6/ - -# install Freeciv environment + # Make install + make -C build-$(WINARCH)-ruledit-qt6 DESTDIR=`pwd`/$(INST_DIR)/$(WINARCH)-ruledit-qt6/ $(MAKE_PARAMS) install + # Reorder directory layout + mv $(INST_DIR)/$(WINARCH)-ruledit-qt6/$(INSTSUB)/bin/* $(INST_DIR)/$(WINARCH)-ruledit-qt6/ + mv $(INST_DIR)/$(WINARCH)-ruledit-qt6/$(INSTSUB)/share/freeciv $(INST_DIR)/$(WINARCH)-ruledit-qt6/data + mv $(INST_DIR)/$(WINARCH)-ruledit-qt6/$(INSTSUB)/share/locale $(INST_DIR)/$(WINARCH)-ruledit-qt6/share/ + mv $(INST_DIR)/$(WINARCH)-ruledit-qt6/$(INSTSUB)/share/doc $(INST_DIR)/$(WINARCH)-ruledit-qt6/doc + mkdir -p $(INST_DIR)/$(WINARCH)-ruledit-qt6/debuginfo + cp build-$(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 + # Delete unneeded files + rm -r $(INST_DIR)/$(WINARCH)-ruledit-qt6/$(INSTSUB) + # Strip 'freeciv-ruledit' executable + strip $(INST_DIR)/$(WINARCH)-ruledit-qt6/freeciv-ruledit.exe + # Add start menu files + cp freeciv-ruledit.cmd Freeciv.url $(INST_DIR)/$(WINARCH)-ruledit-qt6/ + +# Install Freeciv environment SOUND_DLLS := \ SDL2.dll \ @@ -328,10 +329,10 @@ COMMON_DLLS := \ $(SOUND_DLLS) install-env-common: - # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(WINARCH)-$(GUI)/ - mkdir -p install-$(WINARCH)-$(GUI)/ssl/certs - cp -R /$(ARCHDIR)/ssl/certs/ca-bundle.crt install-$(WINARCH)-$(GUI)/ssl/certs/ + # Add DLLs + cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs + cp -R /$(ARCHDIR)/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/ DEFAULT_FCMP_DLLS := \ libgdk-3-0.dll \ @@ -346,20 +347,20 @@ DEFAULT_FCMP_DLLS := \ librsvg-2-2.dll install-env-default-fcmp: install-env-common - cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) install-$(WINARCH)-$(GUI)/ - # add additional GTK+3 files - mkdir -p install-$(WINARCH)-$(GUI)/etc - cp -R /$(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/ - mkdir -p install-$(WINARCH)-$(GUI)/share/icons - cp -R /$(ARCHDIR)/share/icons/Adwaita install-$(WINARCH)-$(GUI)/share/icons/ - mkdir -p install-$(WINARCH)-$(GUI)/share/glib-2.0/schemas - cp /$(ARCHDIR)/share/glib-2.0/schemas/gschemas.compiled install-$(WINARCH)-$(GUI)/share/glib-2.0/schemas/ - mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/ - cp -R /$(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/ - mkdir -p install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ - cp -R /$(ARCHDIR)/lib/gdk-pixbuf-2.0/* install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ - cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/ - find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -and -not -name gtk30.mo -delete + cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ + # Add additional GTK+3 files + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/etc + cp -R /$(ARCHDIR)/etc/gtk-3.0 $(INST_DIR)/$(WINARCH)-$(GUI)/etc/ + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/share/icons + cp -R /$(ARCHDIR)/share/icons/Adwaita $(INST_DIR)/$(WINARCH)-$(GUI)/share/icons/ + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/share/glib-2.0/schemas + cp /$(ARCHDIR)/share/glib-2.0/schemas/gschemas.compiled $(INST_DIR)/$(WINARCH)-$(GUI)/share/glib-2.0/schemas/ + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/lib/gtk-3.0/ + cp -R /$(ARCHDIR)/lib/gtk-3.0/* $(INST_DIR)/$(WINARCH)-$(GUI)/lib/gtk-3.0/ + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ + cp -R /$(ARCHDIR)/lib/gdk-pixbuf-2.0/* $(INST_DIR)/$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ + cp -R /$(ARCHDIR)/share/locale $(INST_DIR)/$(WINARCH)-$(GUI)/share/ + find $(INST_DIR)/$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -and -not -name gtk30.mo -delete install-env-gtk3.22: install-env-default-fcmp @@ -383,13 +384,13 @@ GTK4_FCMP_DLLS := \ libjbig-0.dll install-env-gtk4-fcmp: install-env-common - cp -R $(addprefix $(DLLPATH_PREFIX), $(GTK4_FCMP_DLLS)) install-$(WINARCH)-$(GUI)/ - # add additional GTK4 files - cp /$(ARCHDIR)/bin/gdbus.exe install-$(WINARCH)-$(GUI)/ - mkdir -p install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ - cp -R /$(ARCHDIR)/lib/gdk-pixbuf-2.0/* install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ - cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/ - find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -and -not -name gtk40.mo -delete + cp -R $(addprefix $(DLLPATH_PREFIX), $(GTK4_FCMP_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ + # Add additional GTK4 files + cp /$(ARCHDIR)/bin/gdbus.exe $(INST_DIR)/$(WINARCH)-$(GUI)/ + mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ + cp -R /$(ARCHDIR)/lib/gdk-pixbuf-2.0/* $(INST_DIR)/$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/ + cp -R /$(ARCHDIR)/share/locale $(INST_DIR)/$(WINARCH)-$(GUI)/share/ + find $(INST_DIR)/$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -and -not -name gtk40.mo -delete install-env-gtk4: install-env-gtk4-fcmp @@ -403,8 +404,8 @@ SDL2_DLLS := \ libhwy.dll install-env-sdl2: install-env-gtk4-fcmp - # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) install-$(WINARCH)-$(GUI)/ + # Add DLLs + cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ QT5_DLLS := \ libicuin${ICUVER}.dll \ @@ -426,12 +427,12 @@ QT5_DLLS := \ libmd4c.dll install-env-qt5: install-env-common - # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(QT5_DLLS)) install-$(WINARCH)-$(GUI)/ - # add additional Qt5 files - cp -R /$(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/ - cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/ - find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -delete + # Add DLLs + cp -R $(addprefix $(DLLPATH_PREFIX), $(QT5_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ + # Add additional Qt5 files + cp -R /$(ARCHDIR)/share/qt5/plugins $(INST_DIR)/$(WINARCH)-$(GUI)/ + cp -R /$(ARCHDIR)/share/locale $(INST_DIR)/$(WINARCH)-$(GUI)/share/ + find $(INST_DIR)/$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -delete QT6_DLLS := \ libicuin${ICUVER}.dll \ @@ -449,12 +450,12 @@ QT6_DLLS := \ libb2-1.dll install-env-qt6: install-env-common - # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(QT6_DLLS)) install-$(WINARCH)-$(GUI)/ - # add additional Qt6 files - cp -R /$(ARCHDIR)/share/qt6/plugins install-$(WINARCH)-$(GUI)/ - cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/ - find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -delete + # Add DLLs + cp -R $(addprefix $(DLLPATH_PREFIX), $(QT6_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ + # Add additional Qt6 files + cp -R /$(ARCHDIR)/share/qt6/plugins $(INST_DIR)/$(WINARCH)-$(GUI)/ + cp -R /$(ARCHDIR)/share/locale $(INST_DIR)/$(WINARCH)-$(GUI)/share/ + find $(INST_DIR)/$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -delete RULEDIT_QT5_DLLS := \ libstdc++-6.dll \ @@ -506,13 +507,13 @@ RULEDIT_QT5_DLLS := \ libmd4c.dll install-env-ruledit-qt5: - # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(RULEDIT_QT5_DLLS)) install-$(WINARCH)-ruledit-qt5/ - cp -R $(addprefix $(DLLPATH_PREFIX), $(QT5_DLLS)) install-$(WINARCH)-ruledit-qt5/ - # add additional Qt files - cp -R /$(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-ruledit-qt5/ - cp -R /usr/share/locale install-$(WINARCH)-ruledit-qt5/share/ - find install-$(WINARCH)-ruledit-qt5/share/locale -type f -not -name "freeciv-*.mo" -delete + # Add DLLs + cp -R $(addprefix $(DLLPATH_PREFIX), $(RULEDIT_QT5_DLLS)) $(INST_DIR)/$(WINARCH)-ruledit-qt5/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(QT5_DLLS)) $(INST_DIR)/$(WINARCH)-ruledit-qt5/ + # Add additional Qt files + cp -R /$(ARCHDIR)/share/qt5/plugins $(INST_DIR)/$(WINARCH)-ruledit-qt5/ + cp -R /usr/share/locale $(INST_DIR)/$(WINARCH)-ruledit-qt5/share/ + find $(INST_DIR)/$(WINARCH)-ruledit-qt5/share/locale -type f -not -name "freeciv-*.mo" -delete RULEDIT_QT6_DLLS := \ libstdc++-6.dll \ @@ -567,40 +568,40 @@ RULEDIT_QT6_DLLS := \ libbrotlicommon.dll install-env-ruledit-qt6: - # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(RULEDIT_QT6_DLLS)) install-$(WINARCH)-ruledit-qt6/ - cp -R $(addprefix $(DLLPATH_PREFIX), $(QT6_DLLS)) install-$(WINARCH)-ruledit-qt6/ - # add additional Qt files - cp -R /$(ARCHDIR)/share/qt6/plugins install-$(WINARCH)-ruledit-qt6/ - cp -R /usr/share/locale install-$(WINARCH)-ruledit-qt6/share/ - find install-$(WINARCH)-ruledit-qt6/share/locale -type f -not -name "freeciv-*.mo" -delete + # Add DLLs + cp -R $(addprefix $(DLLPATH_PREFIX), $(RULEDIT_QT6_DLLS)) $(INST_DIR)/$(WINARCH)-ruledit-qt6/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(QT6_DLLS)) $(INST_DIR)/$(WINARCH)-ruledit-qt6/ + # Add additional Qt files + cp -R /$(ARCHDIR)/share/qt6/plugins $(INST_DIR)/$(WINARCH)-ruledit-qt6/ + cp -R /usr/share/locale $(INST_DIR)/$(WINARCH)-ruledit-qt6/share/ + find $(INST_DIR)/$(WINARCH)-ruledit-qt6/share/locale -type f -not -name "freeciv-*.mo" -delete -# build installer +# Build installer installer-common: install-freeciv-$(GUI) install-env-$(GUI) - # extract Freeciv version + # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) - # create NSIS script - ./create-freeciv-$(GUI)-nsi.sh install-$(WINARCH)-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi - # create installer executable + # Create NSIS script + ./create-freeciv-$(GUI)-nsi.sh $(INST_DIR)/$(WINARCH)-$(GUI) $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi + # Create installer executable mkdir -p $(OUT_DIR) makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi installer-ruledit-qt5: clean-install-ruledit-qt5 install-ruledit-qt5 install-env-ruledit-qt5 - # extract Freeciv version + # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) - # create NSIS script - ./create-freeciv-ruledit-nsi.sh install-$(WINARCH)-ruledit-qt5 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt5.nsi - # create installer executable + # 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 + # Create installer executable mkdir -p $(OUT_DIR) makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt5.nsi installer-ruledit-qt6: clean-install-ruledit-qt6 install-ruledit-qt6 install-env-ruledit-qt6 - # extract Freeciv version + # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) - # create NSIS script - ./create-freeciv-ruledit-nsi.sh install-$(WINARCH)-ruledit-qt6 $(OUT_DIR) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt6.nsi - # create installer executable + # 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 + # Create installer executable mkdir -p $(OUT_DIR) makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit-qt6.nsi @@ -618,7 +619,7 @@ wrap-ruledit-qt5: installer-ruledit-qt5 wrap-ruledit-qt6: installer-ruledit-qt6 -# cleanup +# Cleanup clean-build-common: rm -rf build-*-$(GUI) @@ -630,15 +631,15 @@ clean-build-ruledit-qt6: rm -rf build-*-ruledit-qt6 clean-install-common: - rm -rf install-*-$(GUI) + rm -rf $(INST_DIR)/*-$(GUI) ./cleanup_checkout.sh ../.. clean-install-ruledit-qt5: - rm -rf install-*-ruledit-qt5 + rm -rf $(INST_DIR)/ruledit-qt5 ./cleanup_checkout.sh ../.. clean-install-ruledit-qt6: - rm -rf install-*-ruledit-qt6 + rm -rf $(INST_DIR)/ruledit-qt6 ./cleanup_checkout.sh ../.. clean-installer-common: -- 2.39.0