Author: cazfi
Date: Sat Jun 18 09:16:39 2016
New Revision: 32896

URL: http://svn.gna.org/viewcvs/freeciv?rev=32896&view=rev
Log:
Windows Installer build makes 'svn revert' on translation/ between
each package to build when making 'snapshot' builds.

See bug #24449

Added:
    branches/S2_6/win32/installer/cleanup_checkout.sh   (with props)
    branches/S2_6/win32/installer_msys2/cleanup_checkout.sh   (with props)
Modified:
    branches/S2_6/win32/Makefile.am
    branches/S2_6/win32/installer/Makefile
    branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/win32/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/Makefile.am?rev=32896&r1=32895&r2=32896&view=diff
==============================================================================
--- branches/S2_6/win32/Makefile.am     (original)
+++ branches/S2_6/win32/Makefile.am     Sat Jun 18 09:16:39 2016
@@ -27,6 +27,7 @@
                installer/freeciv-ruledit.cmd           \
                installer/Freeciv.url                   \
                installer/Makefile                      \
+               installer/cleanup_checkout.sh           \
                installer_msys2/licenses/COPYING.installer      \
                installer_msys2/create-freeciv-gtk-qt-nsi.sh    \
                installer_msys2/create-freeciv-gtk2-nsi.sh      \
@@ -45,6 +46,7 @@
                installer_msys2/freeciv-ruledit.cmd             \
                installer_msys2/Freeciv.url                     \
                installer_msys2/Makefile                        \
+               installer_msys2/cleanup_checkout.sh             \
                installer_msys2/win_arch.sh
 
 if MINGW

Modified: branches/S2_6/win32/installer/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/Makefile?rev=32896&r1=32895&r2=32896&view=diff
==============================================================================
--- branches/S2_6/win32/installer/Makefile      (original)
+++ branches/S2_6/win32/installer/Makefile      Sat Jun 18 09:16:39 2016
@@ -342,9 +342,11 @@
 
 clean-install-common:
        rm -rf install-$(GUI)
+       ./cleanup_checkout.sh ../..
 
 clean-install-ruledit:
        rm -rf install-ruledit
+       ./cleanup_checkout.sh ../..
 
 clean-installer-common:
        rm -f Output/Freeciv-*-$(GUI)-setup.exe

Added: branches/S2_6/win32/installer/cleanup_checkout.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/cleanup_checkout.sh?rev=32896&view=auto
==============================================================================
--- branches/S2_6/win32/installer/cleanup_checkout.sh   (added)
+++ branches/S2_6/win32/installer/cleanup_checkout.sh   Sat Jun 18 09:16:39 2016
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if test "x$VERSION_REVTYPE" = "xsvn" ; then
+    cd $1/translations
+    svn revert -R .
+fi

Propchange: branches/S2_6/win32/installer/cleanup_checkout.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=32896&r1=32895&r2=32896&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Sat Jun 18 09:16:39 2016
@@ -392,9 +392,11 @@
 
 clean-install-common:
        rm -rf install-*-$(GUI)
+       ./cleanup_checkout.sh ../..
 
 clean-install-ruledit:
        rm -rf install-*-ruledit
+       ./cleanup_checkout.sh ../..
 
 clean-installer-common:
        rm -f Output/Freeciv-*-$(GUI)-setup.exe

Added: branches/S2_6/win32/installer_msys2/cleanup_checkout.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/cleanup_checkout.sh?rev=32896&view=auto
==============================================================================
--- branches/S2_6/win32/installer_msys2/cleanup_checkout.sh     (added)
+++ branches/S2_6/win32/installer_msys2/cleanup_checkout.sh     Sat Jun 18 
09:16:39 2016
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if test "x$VERSION_REVTYPE" = "xsvn" ; then
+    cd $1/translations
+    svn revert -R .
+fi

Propchange: branches/S2_6/win32/installer_msys2/cleanup_checkout.sh
------------------------------------------------------------------------------
    svn:executable = *


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to