AUDIT: r20711 - gnucash/trunk/packaging/win32 - Windows build: be sure to restore msys environment even when the build

[Geert Janssens]

Author: gjanssens
Date: 2011-05-28 05:27:57 -0400 (Sat, 28 May 2011)
New Revision: 20711
Trac: http://svn.gnucash.org/trac/changeset/20711

Modified:
   gnucash/trunk/packaging/win32/dist-impl.sh
   gnucash/trunk/packaging/win32/dist.sh
   gnucash/trunk/packaging/win32/install-impl.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Windows build: be sure to restore msys environment even when the build
fails
BP

Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh	2011-05-28 09:27:47 UTC (rev 20710)
+++ gnucash/trunk/packaging/win32/dist-impl.sh	2011-05-28 09:27:57 UTC (rev 20711)
@@ -56,8 +56,8 @@
     add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
     add_to_env $_EXETYPE_UDIR/bin PATH # exetype
 
-    PID=$$
-    configure_msys "$PID" "$_MINGW_WFSDIR"
+    _PID=$$
+    configure_msys "$_PID" "$_MINGW_WFSDIR"
 }
 
 function dist_aqbanking() {

Modified: gnucash/trunk/packaging/win32/dist.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist.sh	2011-05-28 09:27:47 UTC (rev 20710)
+++ gnucash/trunk/packaging/win32/dist.sh	2011-05-28 09:27:57 UTC (rev 20711)
@@ -2,6 +2,12 @@
 
 set -e
 
+function on_error() {
+  setup "An error occurred, exiting."
+  restore_msys "$_PID"
+}
+trap on_error ERR
+
 function qpushd() { pushd "$@" >/dev/null; }
 function qpopd() { popd >/dev/null; }
 function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
@@ -44,7 +50,7 @@
 done
 
 setup Restore MSYS
-restore_msys "$PID"
+restore_msys "$_PID"
 
 qpopd
 


Property changes on: gnucash/trunk/packaging/win32/install-impl.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2011-05-28 09:27:47 UTC (rev 20710)
+++ gnucash/trunk/packaging/win32/install.sh	2011-05-28 09:27:57 UTC (rev 20711)
@@ -10,6 +10,12 @@
 
 set -e
 
+function on_error() {
+  setup "An error occurred, exiting."
+  restore_msys "$_PID"
+}
+trap on_error ERR
+
 echo -n "Build Starting at "
 date