From a5ec4699499560b9959288ed1d5592e7c75628df Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 20 Feb 2022 01:24:38 +0200 Subject: [PATCH 40/40] Msys2: Move langstat creation after the repo modification check As langstat creation does modify files, the --enable-gitrev build was always flagged as "modified" in the version string. See osdn #43891 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index ea888ab557..7af560a80c 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -110,11 +110,11 @@ configure-freeciv-ruledit-qt6: # install Freeciv install-freeciv-common: configure-freeciv-common - # make langstat files - make -C build-$(WINARCH)-$(GUI)/translations/core update-po - make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt # 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 -C build-$(WINARCH)-$(GUI)/translations/core update-po + make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt # reorder directory layout mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/bin/* install-$(WINARCH)-$(GUI)/ mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/etc install-$(WINARCH)-$(GUI)/ @@ -154,11 +154,11 @@ install-ruledit-dir-qt6: mkdir -p install-$(WINARCH)-ruledit-qt6/share install-ruledit-qt5: configure-freeciv-ruledit-qt5 install-ruledit-dir-qt5 - # make langstat files - make -C build-$(WINARCH)-ruledit-qt5/translations/ruledit update-po - make -C build-$(WINARCH)-ruledit-qt5/bootstrap langstat_ruledit.txt # 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 -C build-$(WINARCH)-ruledit-qt5/translations/ruledit update-po + make -C build-$(WINARCH)-ruledit-qt5/bootstrap langstat_ruledit.txt # 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 @@ -176,11 +176,11 @@ 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 langstat files - make -C build-$(WINARCH)-ruledit-qt6/translations/ruledit update-po - make -C build-$(WINARCH)-ruledit-qt6/bootstrap langstat_ruledit.txt # 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 -C build-$(WINARCH)-ruledit-qt6/translations/ruledit update-po + make -C build-$(WINARCH)-ruledit-qt6/bootstrap langstat_ruledit.txt # 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.34.1