r19012 - gnucash/trunk/packaging/win32 - Win32: Add mingw cutecash build to the install.sh script, enabled by WITH_CUTECASH=yes.

[Christian Stimming]

Author: cstim
Date: 2010-04-10 15:33:25 -0400 (Sat, 10 Apr 2010)
New Revision: 19012
Trac: http://svn.gnucash.org/trac/changeset/19012

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Add mingw cutecash build to the install.sh script, enabled by WITH_CUTECASH=yes.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-04-10 12:22:56 UTC (rev 19011)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-04-10 19:33:25 UTC (rev 19012)
@@ -71,6 +71,7 @@
 fi
 
 set_default WITH_CUTECASH no
+set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
 
 
 ####
@@ -373,6 +374,7 @@
 fi
 if [ "$WITH_CUTECASH" = "yes" ]; then
  add_step inst_cmake
+ add_step inst_cutecash
 fi
 add_step inst_gnucash
 add_step inst_docs

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2010-04-10 12:22:56 UTC (rev 19011)
+++ gnucash/trunk/packaging/win32/install.sh	2010-04-10 19:33:25 UTC (rev 19012)
@@ -1170,7 +1170,7 @@
         cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
         mv $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
 		cd $_MYSQL_LIB_UDIR/lib
-		dlltool --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
+		${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
         test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
         test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
         rm -rf ${TMP_UDIR}/mysql*
@@ -1205,7 +1205,7 @@
         qpopd
         qpushd ${_LIBDBI_UDIR}
             pexports bin/libdbi-0.dll > lib/libdbi.def
-            dlltool -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
+            ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
         qpopd
         test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
         rm -rf ${TMP_UDIR}/libdbi-0*
@@ -1266,6 +1266,36 @@
     fi
 }
 
+function inst_cutecash() {
+    setup Cutecash
+    _BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
+    _REPOS_UDIR=`unix_path $REPOS_DIR`
+    mkdir -p $_BUILD_UDIR
+
+    qpushd $_BUILD_UDIR
+        cmake ${_REPOS_UDIR} \
+            -G"MSYS Makefiles" \
+            -DREGEX_INCLUDE_PATH=${_REGEX_UDIR}/include \
+            -DREGEX_LIBRARY=${_REGEX_UDIR}/lib/libregex.a \
+            -DGUILE_INCLUDE_DIR=${_GUILE_UDIR}/include \
+            -DGUILE_LIBRARY=${_GUILE_UDIR}/bin/libguile.dll \
+            -DLIBINTL_INCLUDE_PATH=${_GNOME_UDIR}/include \
+            -DLIBINTL_LIBRARY=${_GNOME_UDIR}/bin/intl.dll \
+            -DLIBXML2_INCLUDE_DIR=${_GNOME_UDIR}/include/libxml2 \
+            -DLIBXML2_LIBRARIES=${_GNOME_UDIR}/bin/libxml2-2.dll \
+            -DPKG_CONFIG_EXECUTABLE=${_GNOME_UDIR}/bin/pkg-config \
+            -DZLIB_INCLUDE_DIR=${_GNOME_UDIR}/include \
+            -DZLIB_LIBRARY=${_GNOME_UDIR}/bin/zlib1.dll \
+            -DSWIG_EXECUTABLE=${_SWIG_UDIR}/swig.exe \
+            -DHTMLHELP_INCLUDE_PATH=${_HH_UDIR}/include \
+            -DWITH_SQL=ON \
+            -DLIBDBI_INCLUDE_PATH=${_LIBDBI_UDIR}/include \
+            -DLIBDBI_LIBRARY=${_LIBDBI_UDIR}/lib/libdbi.dll.a \
+            -DCMAKE_BUILD_TYPE=Debug
+        make
+    qpopd
+}
+
 function inst_webkit() {
     setup WebKit
     _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`