r23685 - gnucash/trunk/packaging/win32 - Win32 build: Remove support for aqbanking < 5.x because 5.x has been released since 2010 by now.
Christian Stimming
cstim at code.gnucash.org
Sun Jan 12 14:48:50 EST 2014
Author: cstim
Date: 2014-01-12 14:48:49 -0500 (Sun, 12 Jan 2014)
New Revision: 23685
Trac: http://svn.gnucash.org/trac/changeset/23685
Modified:
gnucash/trunk/packaging/win32/README
gnucash/trunk/packaging/win32/custom.sh.sample
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/dist-impl.sh
gnucash/trunk/packaging/win32/gnucash.iss.in
gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Remove support for aqbanking < 5.x because 5.x has been released since 2010 by now.
Modified: gnucash/trunk/packaging/win32/README
===================================================================
--- gnucash/trunk/packaging/win32/README 2014-01-12 01:05:26 UTC (rev 23684)
+++ gnucash/trunk/packaging/win32/README 2014-01-12 19:48:49 UTC (rev 23685)
@@ -71,9 +71,9 @@
you can specify the path to git's installation location via GIT_DIR
- If you want verbose output of any script step, add "set -x" to that file.
-* Either, 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"; or skip building
- the AqBanking Setup Wizard by specifying "AQBANKING_WITH_QT=no".
+* (No Qt is needed. In earlier versions of libaqbanking, qt was needed
+ for the aqbanking setup wizard, but in aqbanking-5.x this is no
+ longer the case.)
Start/Enter any MSYS shell window. Let the automated build begin by:
Modified: gnucash/trunk/packaging/win32/custom.sh.sample
===================================================================
--- gnucash/trunk/packaging/win32/custom.sh.sample 2014-01-12 01:05:26 UTC (rev 23684)
+++ gnucash/trunk/packaging/win32/custom.sh.sample 2014-01-12 19:48:49 UTC (rev 23685)
@@ -7,7 +7,6 @@
# REPOS_URL="svn+ssh://<dev>@svn.gnucash.org/repo/gnucash/trunk"
# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
# DISABLE_OPTIMIZATIONS=yes
-# AQBANKING_WITH_QT=no
# GLOBAL_DIR=Z:\\mydir # all directories will use this
# WGET_RATE=50k #limit download bandwith to 50KB/s
# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
@@ -18,4 +17,4 @@
# QTDIR=c:\\Qt\\4.2.3
# CROSS_COMPILE=yes
#Uncomment this for building on Win7 (and maybe Vista):
-#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
\ No newline at end of file
+#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2014-01-12 01:05:26 UTC (rev 23684)
+++ gnucash/trunk/packaging/win32/defaults.sh 2014-01-12 19:48:49 UTC (rev 23685)
@@ -343,39 +343,17 @@
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-set_default AQBANKING5 yes
-# If sticking to aqbanking4, make sure to enable the QtCore4.dll et al
-# in gnucash.iss.in again because in aqbanking4 those DLLs are still
-# needed.
-
-if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.9.0beta"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
-else
- GWENHYWFAR_VERSION="3.11.3"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
- #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-x.x.x.patch
-fi
+GWENHYWFAR_VERSION="4.9.0beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.2.0beta"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=104&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
- set_default AQBANKING_WITH_QT no
-else
- AQBANKING_VERSION="4.2.4"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
- set_default AQBANKING_PATCH `pwd`/aqbanking-4.2.4-r2132.patch
- set_default AQBANKING_WITH_QT yes
-fi
+AQBANKING_VERSION="5.2.0beta"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=104&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
-# 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"
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh 2014-01-12 01:05:26 UTC (rev 23684)
+++ gnucash/trunk/packaging/win32/dist-impl.sh 2014-01-12 19:48:49 UTC (rev 23685)
@@ -12,12 +12,6 @@
if [ -x $DIST_DIR ]; then
die "Please remove ${DIST_DIR} first"
fi
- 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`
_GUILE_UDIR=`unix_path $GUILE_DIR`
@@ -237,15 +231,9 @@
cp -a $_REPOS_UDIR/packaging/win32/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
- if [ "$AQBANKING5" != "yes" ] ; then
- # aqbanking < 5
- AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking/version.h
- GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/version.h
- else
- # aqbanking >= 5.0.0
- AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
- GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
- fi
+ # aqbanking >= 5.0.0
+ AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
+ GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
_AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
_GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
@@ -257,13 +245,6 @@
}
function dist_finish() {
- if [ "$AQBANKING_WITH_QT" = "yes" ]; then
- assert_one_dir ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards
- _qt3_wizard_path=`ls ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe`
- mv ${_qt3_wizard_path} $DIST_UDIR/bin
- cp $_INSTALL_UDIR/bin/redirect.exe ${_qt3_wizard_path}
- fi
-
# Strip redirections in distributed libtool .la files
for file in $DIST_UDIR/bin/*.la; do
cat $file | sed 's,^libdir=,#libdir=,' > $file.new
Modified: gnucash/trunk/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/trunk/packaging/win32/gnucash.iss.in 2014-01-12 01:05:26 UTC (rev 23684)
+++ gnucash/trunk/packaging/win32/gnucash.iss.in 2014-01-12 19:48:49 UTC (rev 23685)
@@ -71,18 +71,6 @@
;Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
-;;; Not needed with AQBANKING5!
-;; 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
;
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2014-01-12 01:05:26 UTC (rev 23684)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2014-01-12 19:48:49 UTC (rev 23685)
@@ -317,60 +317,28 @@
else
XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
fi
- if [ "$AQBANKING5" != "yes" ] ; then
- _AQ_BACKENDS="aqhbci aqofxconnect"
- else
- # FIXME: Maybe also aqpaypal?
- _AQ_BACKENDS="aqhbci aqofxconnect"
+ _AQ_BACKENDS="aqhbci aqofxconnect"
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
+ patch -p1 < $AQBANKING_PATCH
+ #automake
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #autoconf
fi
- if test x$AQBANKING_WITH_QT = xyes; then
- inst_qt4
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- #automake
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking qbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- 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}
- make qt4-port
- make clean
- else
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- #automake
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
- --prefix=${_AQBANKING_UDIR}
- fi
+ ./configure ${HOST_XCOMPILE} \
+ --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-xmlmerge=${XMLMERGE} \
+ --with-frontends="cbanking" \
+ --with-backends="${_AQ_BACKENDS}" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
+ --prefix=${_AQBANKING_UDIR}
make
rm -rf ${_AQBANKING_UDIR}
make install
qpopd
qpushd ${_AQBANKING_UDIR}/bin
- 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
- fi
+ exetype aqbanking-cli.exe console
+ exetype aqhbci-tool4.exe console
qpopd
${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
rm -rf ${TMP_UDIR}/aqbanking-*
@@ -765,32 +733,15 @@
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
# circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- if [ "$AQBANKING5" = "yes" ]; then
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --disable-ssl \
- --prefix=$_GWENHYWFAR_UDIR \
- --with-guis=gtk2 \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- else
- if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
- patch -p1 < $GWENHYWFAR_PATCH
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #automake
- #autoconf
- fi
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --disable-ssl \
- --prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- fi
+ # Note: gwenhywfar-3.x and higher don't use openssl anymore.
+ ./configure ${HOST_XCOMPILE} \
+ --with-libgcrypt-prefix=$_GNUTLS_UDIR \
+ --disable-binreloc \
+ --disable-ssl \
+ --prefix=$_GWENHYWFAR_UDIR \
+ --with-guis=gtk2 \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
make
# [ "$CROSS_COMPILE" != "yes" ] && make check
rm -rf ${_GWENHYWFAR_UDIR}
@@ -1205,34 +1156,6 @@
quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
}
-function inst_qt4() {
- # This section is not a full install, but the .la creation is
- # already useful in itself and that's why it has already been
- # added.
-
- [ "$QTDIR" ] || die "QTDIR is not set. Please install Qt and set that variable in custom.sh, or deactivate AQBANKING_WITH_QT"
- export QTDIR=`unix_path ${QTDIR}` # help configure of aqbanking
- _QTDIR=$QTDIR
- # This section creates .la files for the Qt-4 DLLs so that
- # libtool correctly links to the DLLs.
- if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then
- qpushd ${_QTDIR}/lib
- for A in lib*.a; do
- LIBBASENAME=`basename ${A} .a`
- OUTFILE="${LIBBASENAME}.la"
- BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" `
- DLLNAME="${BASENAME}.dll"
-
- # Create la file
- echo "# Generated by foo bar libtool" > $OUTFILE
- echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE
- echo "library_names='${DLLNAME}'" >> $OUTFILE
- echo "libdir='${_QTDIR}/bin'" >> $OUTFILE
- done
- qpopd
- fi
-}
-
function inst_readline() {
setup Readline
_READLINE_UDIR=`unix_path $READLINE_DIR`
More information about the gnucash-changes
mailing list