r20713 - gnucash/branches/2.4/packaging/win32 - [20711] Windows build: be sure to restore msys environment even when the build

Geert Janssens gjanssens at code.gnucash.org
Sat May 28 05:40:02 EDT 2011


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

Modified:
   gnucash/branches/2.4/packaging/win32/dist-impl.sh
   gnucash/branches/2.4/packaging/win32/dist.sh
   gnucash/branches/2.4/packaging/win32/install-impl.sh
   gnucash/branches/2.4/packaging/win32/install.sh
Log:
[20711] Windows build: be sure to restore msys environment even when the build
fails

Modified: gnucash/branches/2.4/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/dist-impl.sh	2011-05-28 09:39:52 UTC (rev 20712)
+++ gnucash/branches/2.4/packaging/win32/dist-impl.sh	2011-05-28 09:40:02 UTC (rev 20713)
@@ -52,8 +52,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_regex() {

Modified: gnucash/branches/2.4/packaging/win32/dist.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/dist.sh	2011-05-28 09:39:52 UTC (rev 20712)
+++ gnucash/branches/2.4/packaging/win32/dist.sh	2011-05-28 09:40:02 UTC (rev 20713)
@@ -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/branches/2.4/packaging/win32/install-impl.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: gnucash/branches/2.4/packaging/win32/install.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/install.sh	2011-05-28 09:39:52 UTC (rev 20712)
+++ gnucash/branches/2.4/packaging/win32/install.sh	2011-05-28 09:40:02 UTC (rev 20713)
@@ -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
 



More information about the gnucash-changes mailing list