Additional win32 packaging changes for installation (including libdbi).

Provided by Nathan Buchanan



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17474 57a11ea4-9604-0410-9ed3-97b8803252fd

packaging/win32/dist.sh

@@ -34,6 +34,9 @@ function prepare() {
     _LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
     _GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
     _AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
+    _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+    _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
+    _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
     _LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
     _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
     _REPOS_UDIR=`unix_path $REPOS_DIR`
@@ -172,6 +175,16 @@ function dist_aqbanking() {
     cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/lib
 }
 
+function dist_libdbi() {
+    setup LibDBI
+    cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
+    cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
+    cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
+    cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
+    mkdir ${DIST_UDIR}/lib/dbd
+    cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/* ${DIST_UDIR}/lib/dbd
+}
+
 function dist_libgda() {
     setup Libgda
     cp -a ${_LIBGDA_UDIR}/bin/* ${DIST_UDIR}/bin
@@ -254,7 +267,7 @@ dist_goffice
 dist_libofx
 dist_gwenhywfar
 dist_aqbanking
-dist_libgda
+dist_libdbi
 dist_gnucash
 finish
 qpopd

packaging/win32/gnucash.iss.in

@@ -193,6 +193,7 @@ begin
   FileString := FileString + 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
   FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
   FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
+  FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
   FileString := FileString + 'start gnucash-bin %*'#13#10 ;
 
   { Save the final file }

packaging/win32/install.sh

@@ -1068,6 +1068,7 @@ function inst_gnucash() {
             --enable-debug \
             --enable-schemas-install=no \
 	    --enable-dbi \
+	    --with-dbi-dbd-dir=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
             ${LIBOFX_OPTIONS} \
             ${AQBANKING_OPTIONS} \
             --enable-binreloc \
@@ -1085,7 +1086,7 @@ function inst_gnucash() {
         qpushd src/bin
             rm gnucash
             make PATH_SEPARATOR=";" \
-                bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${LIBGDA_DIR}/bin" \
+                bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin;${_SQLITE3_UDIR}/bin" \
                 gnucash
         qpopd
 

packaging/win32/reset.sh

@@ -78,6 +78,10 @@ function eval_all() {
     eval_path $LIBOFX_DIR
     eval_path $GWENHYWFAR_DIR
     eval_path $AQBANKING_DIR
+    eval_path $LIBGDA_DIR
+    eval_path $SQLITE3_DIR
+    eval_path $LIBDBI_DIR
+    eval_path $LIBDBI_DRIVERS_DIR
     eval_path $BUILD_DIR
     eval_path $INSTALL_DIR
     eval_path $GNUCASH_DIR\\dist