From 75e6185d0a0467dc7d32d4b66aa5104a63230a08 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 17 Feb 2022 16:29:38 +0200 Subject: [PATCH 33/40] installer_cross: Clean translations dir after creation of langstat files This way later build won't consider git revision "modified" just because update-po has been run on it. See osdn #43890 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index b6f28044ec..deafb835c1 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -161,6 +161,7 @@ VERREV="$(../../fc_version)" if test "x$INST_CROSS_MODE" != "xrelease" ; then if test -d ../../.git || test -f ../../.git ; then VERREV="$VERREV-$(cd ../.. && git rev-parse --short HEAD)" + GITREVERT=true fi fi @@ -173,6 +174,9 @@ if test "x$GUI" = "xruledit" ; then echo "Langstat creation failed!" >&2 exit 1 fi + if test "$GITREVERT" = true ; then + git checkout ../../translations/ruledit + fi else if ! make -C build-${SETUP}-${GUI}/translations/core update-po || ! make -C build-${SETUP}-${GUI}/bootstrap langstat_core.txt @@ -180,6 +184,9 @@ else echo "Langstat creation failed!" >&2 exit 1 fi + if test "$GITREVERT" = true ; then + git checkout ../../translations/core + fi fi if ! mv $INSTDIR/bin/* $INSTDIR/ || -- 2.34.1