AUDIT: r20710 - gnucash/trunk/packaging/win32 - Windows build: properly configure msys before checking mingw

Geert Janssens gjanssens at code.gnucash.org
Sat May 28 05:27:47 EDT 2011


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

Modified:
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Windows build: properly configure msys before checking mingw
availability
BP

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2011-05-28 07:48:23 UTC (rev 20709)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2011-05-28 09:27:47 UTC (rev 20710)
@@ -146,6 +146,8 @@
     setup MinGW
     _MINGW_UDIR=`unix_path $MINGW_DIR`
     _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
+    # Configure msys to use mingw on the above path before running any tests !
+    configure_msys "$_PID" "$_MINGW_WFSDIR"
     [ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH
     add_to_env $_MINGW_UDIR/bin PATH
 
@@ -181,8 +183,6 @@
     if [ "$CROSS_COMPILE" != "yes" ]; then
         # Some preparation steps, only for native (non-cross-compile)
         cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
-
-        configure_msys "$_PID" "$_MINGW_WFSDIR"
     fi
 }
 


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



More information about the gnucash-changes mailing list