r19093 - gnucash/trunk/packaging/win32 - Windows build script improvements

[Geert Janssens]

Author: gjanssens
Date: 2010-05-02 19:18:04 -0400 (Sun, 02 May 2010)
New Revision: 19093
Trac: http://svn.gnucash.org/trac/changeset/19093

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Windows build script improvements
- make sure pexports is available before guile is built
- test for pexports availability when compiling libdbi (to fix crosscompilation)

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-05-01 22:45:00 UTC (rev 19092)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-05-02 23:18:04 UTC (rev 19093)
@@ -332,6 +332,7 @@
 add_step inst_readline
 if [ "$CROSS_COMPILE" != "yes" ]; then
  add_step inst_active_perl
+ add_step inst_mingwutils
 fi
 add_step inst_autotools
 if [ "$AQBANKING3" = "yes" ]; then
@@ -340,7 +341,6 @@
 add_step inst_guile
 if [ "$CROSS_COMPILE" != "yes" ]; then
  add_step inst_svn
- add_step inst_mingwutils
  if [ "$AQBANKING3" != "yes" ]; then
   add_step inst_openssl
  fi

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2010-05-01 22:45:00 UTC (rev 19092)
+++ gnucash/trunk/packaging/win32/install.sh	2010-05-02 23:18:04 UTC (rev 19093)
@@ -1209,8 +1209,11 @@
             make install
         qpopd
         qpushd ${_LIBDBI_UDIR}
+        if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
+        then
             pexports bin/libdbi-0.dll > lib/libdbi.def
             ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
+        fi
         qpopd
         test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
         rm -rf ${TMP_UDIR}/libdbi-0*