r17612 - gnucash/trunk/packaging/win32 - Win32: Add initial support for compiling against AqBanking v3.
Andreas Köhler
andi5 at cvs.gnucash.org
Tue Sep 30 17:50:12 EDT 2008
Author: andi5
Date: 2008-09-30 17:50:11 -0400 (Tue, 30 Sep 2008)
New Revision: 17612
Trac: http://svn.gnucash.org/trac/changeset/17612
Added:
gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch
Modified:
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/dist.sh
gnucash/trunk/packaging/win32/install.sh
gnucash/trunk/packaging/win32/reset.sh
Log:
Win32: Add initial support for compiling against AqBanking v3.
Patch from Shawn Faucher with little modifications.
This still needs a lot of testing and improvements still.
Added: gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch
===================================================================
--- gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch (rev 0)
+++ gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch 2008-09-30 21:50:11 UTC (rev 17612)
@@ -0,0 +1,12 @@
+diff -Nur aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am
+--- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am Thu Jul 31 18:13:32 2008
++++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am Sun Sep 28 18:54:56 2008
+@@ -65,7 +65,7 @@
+
+ # This section is for a qt4 environment
+ qt4-port:
+- for A in $(libqbhelp_la_SOURCES) $(noinst_HEADERS); do \
++ for A in $(libqbhelp_la_SOURCES) $(noinst_HEADERS) qb_help.cpp qbhelpbrowser.cpp; do \
+ $(YES) | $(QT3TO4) $$A; \
+ done
+ # rm $(BUILT_SOURCES)
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2008-09-28 15:32:02 UTC (rev 17611)
+++ gnucash/trunk/packaging/win32/defaults.sh 2008-09-30 21:50:11 UTC (rev 17612)
@@ -134,6 +134,10 @@
set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
+set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.3.tar.bz2"
+set_default GMP_ABI 32
+set_default GMP_DIR $GLOBAL_DIR\\gmp
+
set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
set_default GUILE_DIR $GLOBAL_DIR\\guile
@@ -141,6 +145,9 @@
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8e.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
+set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.4.1.zip"
+set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
+
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
set_default MINGW_UTILS_DIR $TOOLS_DIR
@@ -250,13 +257,24 @@
set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
## online banking: gwenhywfar+aqbanking
-set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
+set_default AQBANKING3 yes
+
+if [ "$AQBANKING3" != "yes" ]; then
+ set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
+else
+ set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=13&file=01&dummy=gwenhywfar-3.4.1.tar.gz"
+fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.17.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
+if [ "$AQBANKING3" != "yes" ]; then
+ set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
+else
+ set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=16&file=01&dummy=aqbanking-3.7.2.tar.gz"
+ set_default AQBANKING_PATCH `pwd`/aqbanking-3.7.2.patch
+fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
# If set to yes, download Qt from http://www.trolltech.com/developer/downloads/qt/windows,
@@ -300,11 +318,18 @@
add_step inst_active_perl
fi
add_step inst_autotools
+if [ "$AQBANKING3" = "yes" ]; then
+ add_step inst_gmp
+fi
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
add_step inst_mingwutils
- add_step inst_openssl
+ if [ "$AQBANKING3" != "yes" ]; then
+ add_step inst_openssl
+ else
+ add_step inst_gnutls
+ fi
fi
add_step inst_exetype
add_step inst_libxslt
Modified: gnucash/trunk/packaging/win32/dist.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist.sh 2008-09-28 15:32:02 UTC (rev 17611)
+++ gnucash/trunk/packaging/win32/dist.sh 2008-09-30 21:50:11 UTC (rev 17612)
@@ -32,6 +32,8 @@
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
_OPENSP_UDIR=`unix_path $OPENSP_DIR`
_LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
+ _GMP_UDIR=`unix_path $GMP_DIR`
+ _GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
_GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
_AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
@@ -151,11 +153,24 @@
cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
}
+function dist_gnutls() {
+ setup gnutls
+ cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+}
+
+function dist_gmp() {
+ setup gmp
+ cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+}
+
function dist_gwenhywfar() {
setup gwenhywfar
cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
mkdir -p ${DIST_UDIR}/etc
- cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
+ if [ "$AQBANKING3" != "yes" ]; then
+ cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
+ fi
cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
}
@@ -171,7 +186,9 @@
cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
- cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
+ if [ "$AQBANKING3" != "yes" ]; then
+ cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
+ fi
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/lib
}
@@ -229,8 +246,13 @@
cp $_BUILD_UDIR/packaging/win32/.libs/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
- mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_BUILD_UDIR/packaging/win32/.libs/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
+ if [ "$AQBANKING3" != "yes" ]; then
+ mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
+ cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
+ else
+ mv ${DIST_UDIR}/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe $DIST_UDIR/bin
+ cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe
+ fi
fi
# Strip redirections in distributed libtool .la files
@@ -259,12 +281,17 @@
dist_regex
dist_autotools
dist_guile
-dist_openssl
dist_gnome
dist_pcre
dist_libgsf
dist_goffice
dist_libofx
+if [ "$AQBANKING3" != "yes" ]; then
+ dist_openssl
+else
+ dist_gnutls
+ dist_gmp
+fi
dist_gwenhywfar
dist_aqbanking
dist_libdbi
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2008-09-28 15:32:02 UTC (rev 17611)
+++ gnucash/trunk/packaging/win32/install.sh 2008-09-30 21:50:11 UTC (rev 17612)
@@ -15,8 +15,12 @@
register_env_var ACLOCAL_FLAGS " "
register_env_var AUTOTOOLS_CPPFLAGS " "
register_env_var AUTOTOOLS_LDFLAGS " "
+register_env_var GMP_CPPFLAGS " "
+register_env_var GMP_LDFLAGS " "
register_env_var GNOME_CPPFLAGS " "
register_env_var GNOME_LDFLAGS " "
+register_env_var GNUTLS_CPPFLAGS " "
+register_env_var GNUTLS_LDFLAGS " "
register_env_var GUILE_LOAD_PATH ";"
register_env_var GUILE_CPPFLAGS " "
register_env_var GUILE_LDFLAGS " "
@@ -262,6 +266,31 @@
fi
}
+function inst_gmp() {
+ setup Gmp
+ _GMP_UDIR=`unix_path ${GMP_DIR}`
+ add_to_env -I$_GMP_UDIR/include GMP_CPPFLAGS
+ add_to_env -L$_GMP_UDIR/lib GMP_LDFLAGS
+ add_to_env ${_GMP_UDIR}/bin PATH
+ if quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile
+ then
+ echo "Gmp already installed. skipping."
+ else
+ wget_unpacked $GMP_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gmp-*
+ qpushd $TMP_UDIR/gmp-*
+ ./configure ${HOST_XCOMPILE} \
+ ABI=$GMP_ABI \
+ --prefix=${_GMP_UDIR} \
+ --disable-static --enable-shared
+ make
+# [ "$CROSS_COMPILE" != "yes" ] && make check
+ make install
+ qpopd
+ quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile || die "Gmp not installed correctly"
+ fi
+}
+
function inst_guile() {
setup Guile
_GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
@@ -801,6 +830,24 @@
fi
}
+function inst_gnutls() {
+ setup GNUTLS
+ _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
+ add_to_env ${_GNUTLS_UDIR}/bin PATH
+ add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
+ add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
+ add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
+ if quiet which gnutls-cli
+ then
+ echo "GNUTLS already installed. skipping."
+ else
+ wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ rm -f $_GNUTLS_UDIR/lib/*.la
+ quiet which gnutls-cli || die "GNUTLS not installed correctly"
+ fi
+}
+
function inst_gwenhywfar() {
setup Gwenhywfar
_GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
@@ -815,16 +862,28 @@
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
# circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- ./configure ${HOST_XCOMPILE} \
- --with-openssl-includes=$_OPENSSL_UDIR/include \
- --disable-binreloc \
- ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
- ssl_lib="-leay32 -lssl32" \
- --prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
+ if [ "$AQBANKING3" != "yes" ]; then
+ ./configure ${HOST_XCOMPILE} \
+ --with-openssl-includes=$_OPENSSL_UDIR/include \
+ --disable-binreloc \
+ ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
+ ssl_lib="-leay32 -lssl32" \
+ --prefix=$_GWENHYWFAR_UDIR \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
+ else
+ ./configure ${HOST_XCOMPILE} \
+ --with-openssl-includes=$_OPENSSL_UDIR/include \
+ --with-openssl-libs=$_OPENSSL_UDIR/lib \
+ --with-libgnutls-prefix=$_GNUTLS_UDIR \
+ --with-libgcrypt-prefix=$_GNUTLS_UDIR \
+ --disable-binreloc \
+ --prefix=$_GWENHYWFAR_UDIR \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
+ fi
make
- [ "$CROSS_COMPILE" != "yes" ] && make check
+# [ "$CROSS_COMPILE" != "yes" ] && make check
make install
qpopd
${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
@@ -850,7 +909,7 @@
--disable-binreloc \
--disable-python
make
- [ "$CROSS_COMPILE" != "yes" ] && make check
+# [ "$CROSS_COMPILE" != "yes" ] && make check
make install
qpopd
${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
@@ -898,16 +957,20 @@
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
qpushd $TMP_UDIR/aqbanking-*
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS}"
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS}"
+ _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}"
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ]; then
+ patch -p1 < $AQBANKING_PATCH
+ make -f Makefile.cvs
+ fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
./configure \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-frontends="cbanking qbanking" \
- --with-backends="aqdtaus aqhbci aqofxconnect" \
- CPPFLAGS="${_AQ_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS}" \
+ --with-backends="aqhbci aqofxconnect" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
--prefix=${_AQBANKING_UDIR}
@@ -918,16 +981,20 @@
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-frontends="cbanking" \
--with-backends="aqdtaus aqhbci aqofxconnect" \
- CPPFLAGS="${_AQ_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS}" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
--prefix=${_AQBANKING_UDIR}
fi
make
make install
qpopd
qpushd ${_AQBANKING_UDIR}/bin
- exetype aqbanking-tool.exe console
- exetype aqhbci-tool.exe console
+ if [ "$AQBANKING3" != "yes" ]; then
+ exetype aqbanking-tool.exe console
+ exetype aqhbci-tool.exe console
+ else
+ exetype aqhbci-tool3.exe console
+ fi
qpopd
${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
fi
Modified: gnucash/trunk/packaging/win32/reset.sh
===================================================================
--- gnucash/trunk/packaging/win32/reset.sh 2008-09-28 15:32:02 UTC (rev 17611)
+++ gnucash/trunk/packaging/win32/reset.sh 2008-09-30 21:50:11 UTC (rev 17612)
@@ -76,6 +76,8 @@
eval_path $HH_DIR
eval_path $OPENSP_DIR
eval_path $LIBOFX_DIR
+ eval_path $GMP_DIR
+ eval_path $GNUTLS_DIR
eval_path $GWENHYWFAR_DIR
eval_path $AQBANKING_DIR
eval_path $LIBGDA_DIR
More information about the gnucash-changes
mailing list