From 43a725d9e9c342cda2b24eb3c8e53941232ec232 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 19 Mar 2022 08:52:42 +0200 Subject: [PATCH 44/44] Msys2: Make sure that up-to-date translations are used See osdn #44143 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index ba938e09d7..c2ed32045b 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -122,11 +122,14 @@ configure-freeciv-ruledit-qt6: # install Freeciv install-freeciv-common: configure-freeciv-common - # make install - make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(GUI) $(MAKE_PARAMS) install - # make langstat files. This update-po must be after fc_gitrev_gen.h generation. + # 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)/ @@ -166,11 +169,14 @@ install-ruledit-dir-qt6: mkdir -p install-$(WINARCH)-ruledit-qt6/share install-ruledit-qt5: configure-freeciv-ruledit-qt5 install-ruledit-dir-qt5 - # make install - make -C build-$(WINARCH)-ruledit-qt5 DESTDIR=`pwd`/install-$(WINARCH)-ruledit-qt5/ $(MAKE_PARAMS) install - # make langstat files. This update-po must be after fc_gitrev_gen.h generation. + # 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 @@ -188,11 +194,14 @@ install-ruledit-qt5: configure-freeciv-ruledit-qt5 install-ruledit-dir-qt5 cp freeciv-ruledit.cmd Freeciv.url install-$(WINARCH)-ruledit-qt5/ install-ruledit-qt6: configure-freeciv-ruledit-qt6 install-ruledit-dir-qt6 - # make install - make -C build-$(WINARCH)-ruledit-qt6 DESTDIR=`pwd`/install-$(WINARCH)-ruledit-qt6/ $(MAKE_PARAMS) install - # make langstat files. This update-po must be after fc_gitrev_gen.h generation. + # 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 -- 2.35.1