r20465 - gnucash/branches/2.4/packaging/win32 - [20456] Some additional Windows nightly build fixes:

[Geert Janssens]

Author: gjanssens
Date: 2011-03-24 15:42:22 -0400 (Thu, 24 Mar 2011)
New Revision: 20465
Trac: http://svn.gnucash.org/trac/changeset/20465

Modified:
   gnucash/branches/2.4/packaging/win32/build_package.sh
   gnucash/branches/2.4/packaging/win32/functions.sh
   gnucash/branches/2.4/packaging/win32/weekly_build.sh
Log:
[20456] Some additional Windows nightly build fixes:
- restore the original mingw/msys link, even when the build script abort (due to a die command)
- only restore the mingw/msys link if it was saved before
- weekly builds should be on Monday, not Tuesday
- upload tag rebuilds to a directory named 'releases' instead of 'tags'

Modified: gnucash/branches/2.4/packaging/win32/build_package.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/build_package.sh	2011-03-24 19:42:13 UTC (rev 20464)
+++ gnucash/branches/2.4/packaging/win32/build_package.sh	2011-03-24 19:42:22 UTC (rev 20465)
@@ -79,7 +79,7 @@
 if [ `hostname` = "gnucash-win32" ]; then
   # Determine where to upload to
   if $(echo $REPOS_URL | grep -q tags); then
-    TARGET_DIR=tags
+    TARGET_DIR=releases
   else
     TARGET_DIR=${REPOS_URL##*/}
   fi

Modified: gnucash/branches/2.4/packaging/win32/functions.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/functions.sh	2011-03-24 19:42:13 UTC (rev 20464)
+++ gnucash/branches/2.4/packaging/win32/functions.sh	2011-03-24 19:42:22 UTC (rev 20465)
@@ -121,6 +121,7 @@
     echo
     [ "$*" ] && echo "!!! $* !!!"
     echo "!!! ABORTING !!!"
+    restore_msys
     exit -1
 }
 
@@ -214,9 +215,11 @@
 
 function restore_msys() {
     SUFFIX=$1
-    echo "resetting msys to use original mingw."
-    rm /etc/fstab
-    mv /etc/fstab.$SUFFIX /etc/fstab
+    if [ -f /ect/fstab.$SUFFIX ]; then
+      echo "resetting msys to use original mingw."
+      rm /etc/fstab
+      mv /etc/fstab.$SUFFIX /etc/fstab
+    fi
 }
 
 ### Local Variables: ***

Modified: gnucash/branches/2.4/packaging/win32/weekly_build.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/weekly_build.sh	2011-03-24 19:42:13 UTC (rev 20464)
+++ gnucash/branches/2.4/packaging/win32/weekly_build.sh	2011-03-24 19:42:22 UTC (rev 20465)
@@ -11,7 +11,7 @@
 set -e
 
 # Only run this script on Monday night (first day of the week)
-if [ `date +%u` != 2 ] ; then exit ; fi
+if [ `date +%u` != 1 ] ; then exit ; fi
 
 function qpushd() { pushd "$@" >/dev/null; }
 function qpopd() { popd >/dev/null; }