diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index 4c0c85934b..b91ba4421d 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -320,10 +320,10 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff ## online banking: gwenhywfar+aqbanking -set_default AQBANKING3 yes +set_default AQBANKING5 no -if [ "$AQBANKING3" != "yes" ]; then - set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz" +if [ "$AQBANKING5" = "yes" ]; then + set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=53&file=01&dummy=gwenhywfar-4.0.0.tar.gz" else set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz" #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff @@ -333,14 +333,15 @@ set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz" # ktoblzcheck is being installed into GWENHYWFAR_DIR -if [ "$AQBANKING3" != "yes" ]; then - set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz" +if [ "$AQBANKING5" = "yes" ]; then + set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=73&file=01&dummy=aqbanking-5.0.0.tar.gz" + set_default AQBANKING_WITH_QT no else set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=49&file=01&dummy=aqbanking-4.2.3.tar.gz" #set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff + set_default AQBANKING_WITH_QT yes 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, # install it and set QTDIR in custom.sh, like "QTDIR=/c/Qt/4.2.3". set_default QT_WIN_SRC_URL "ftp://ftp.qt.nokia.com/qt/source/qt-all-opensource-src-4.5.3.zip" diff --git a/packaging/win32/dist-impl.sh b/packaging/win32/dist-impl.sh index 6602f319a9..35c58d96ba 100755 --- a/packaging/win32/dist-impl.sh +++ b/packaging/win32/dist-impl.sh @@ -12,9 +12,11 @@ function dist_prepare() { if [ -x $DIST_DIR ]; then die "Please remove ${DIST_DIR} first" fi - if [ x$AQBANKING_WITH_QT != xyes ]; then - die "The aqbanking wizard is required to create the Windows installer. + if [ "$AQBANKING5" != "yes" ] ; then + if [ x$AQBANKING_WITH_QT != xyes ]; then + die "The aqbanking wizard is required to create the Windows installer. Please set AQBANKING_WITH_QT to yes and rerun install.sh first." + fi fi _UNZIP_UDIR=`unix_path $UNZIP_DIR` _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR` @@ -190,9 +192,6 @@ function dist_gwenhywfar() { setup gwenhywfar cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin mkdir -p ${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 mkdir -p ${DIST_UDIR}/share/gwenhywfar cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar/ca-bundle.crt ${DIST_UDIR}/share/gwenhywfar @@ -210,9 +209,6 @@ function dist_aqbanking() { 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 - if [ "$AQBANKING3" != "yes" ]; then - cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share - fi cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share } diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index ca6122c86e..863677fb26 100755 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -26,12 +26,8 @@ add_step dist_libbonoboui add_step dist_libgsf add_step dist_goffice add_step dist_libofx -if [ "$AQBANKING3" != "yes" ]; then - add_step dist_openssl -else - add_step dist_gnutls - add_step dist_gmp -fi +add_step dist_gnutls +add_step dist_gmp add_step dist_gwenhywfar add_step dist_ktoblzcheck add_step dist_aqbanking diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in index 1ac0ef4db1..eac29a30aa 100644 --- a/packaging/win32/gnucash.iss.in +++ b/packaging/win32/gnucash.iss.in @@ -78,16 +78,17 @@ Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; C Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main -; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard -; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them. -Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -; The following are all needed by Qt3Support -Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +;;; Not needed with AQBANKING5 anymore! +;; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard +;; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them. +;Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +;Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +;Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +;; The following are all needed by Qt3Support +;Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +;Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +;Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +;Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion ;; The translations ;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index 5f8c3c1841..b6c1faa8a9 100755 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -972,15 +972,15 @@ function inst_gwenhywfar() { assert_one_dir $TMP_UDIR/gwenhywfar-* qpushd $TMP_UDIR/gwenhywfar-* # circumvent binreloc bug, http://trac.autopackage.org/ticket/28 - if [ "$AQBANKING3" != "yes" ]; then + if [ "$AQBANKING5" = "yes" ]; then + # Note: gwenhywfar-3.x and higher don't use openssl anymore. ./configure ${HOST_XCOMPILE} \ - --with-openssl-includes=$_OPENSSL_UDIR/include \ + --with-libgcrypt-prefix=$_GNUTLS_UDIR \ --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" + --with-guis=gtk2 \ + CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \ + LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl" else if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then patch -p1 < $GWENHYWFAR_PATCH @@ -1080,10 +1080,11 @@ function inst_aqbanking() { else XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge" fi - if test x$AQBANKING3 = xyes; then + if [ "$AQBANKING5" != "yes" ] ; then _AQ_BACKENDS="aqhbci aqofxconnect" else - _AQ_BACKENDS="aqdtaus aqhbci aqofxconnect" + # FIXME: Maybe also aqpaypal? + _AQ_BACKENDS="aqhbci aqofxconnect" fi if test x$AQBANKING_WITH_QT = xyes; then inst_qt4 @@ -1125,9 +1126,9 @@ function inst_aqbanking() { make install qpopd qpushd ${_AQBANKING_UDIR}/bin - if [ "$AQBANKING3" != "yes" ]; then - exetype aqbanking-tool.exe console - exetype aqhbci-tool.exe console + if [ "$AQBANKING5" = "yes" ]; then + exetype aqbanking-cli.exe console + exetype aqhbci-tool4.exe console else exetype aqbanking-cli.exe console exetype aqhbci-tool4.exe console diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 53afa01661..279a7e6451 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -71,22 +71,15 @@ if [ "$CROSS_COMPILE" != "yes" ]; then add_step inst_mingwutils fi add_step inst_autotools -if [ "$AQBANKING3" = "yes" ]; then - add_step inst_gmp -fi +add_step inst_gmp add_step inst_guile if [ "$CROSS_COMPILE" != "yes" ]; then add_step inst_svn - if [ "$AQBANKING3" != "yes" ]; then - add_step inst_openssl - fi fi add_step inst_exetype add_step inst_libxslt add_step inst_gnome -if [ "$AQBANKING3" = "yes" ]; then - add_step inst_gnutls -fi +add_step inst_gnutls add_step inst_isocodes add_step inst_swig add_step inst_pcre