diff --git a/packaging/win32/custom.sh b/packaging/win32/custom.sh index 5c9c992c1d..fc1460f4a7 100644 --- a/packaging/win32/custom.sh +++ b/packaging/win32/custom.sh @@ -185,6 +185,9 @@ LIBOFX_PATCH=`pwd`/libofx-0.8.3-patch.diff GWENHYWFAR_URL="$SF_MIRROR/gwenhywfar/gwenhywfar-2.5.3.tar.gz" GWENHYWFAR_DIR=$GLOBAL_DIR\\gwenhywfar +KTOBLZCHECK="$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.12.tar.gz" +# ktoblzcheck is being installed into GWENHYWFAR_DIR + AQBANKING_URL="$SF_MIRROR/aqbanking/aqbanking-2.2.7.tar.gz" AQBANKING_DIR=$GLOBAL_DIR\\aqbanking ## @@ -219,6 +222,7 @@ add_step inst_opensp add_step inst_libofx ## Online banking: add_step inst_gwenhywfar +#add_step inst_ktoblzcheck add_step inst_aqbanking ## if test x$cross_compile != xyes ; then diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index dfbfb41313..4abd32517b 100644 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -151,6 +151,12 @@ function dist_gwenhywfar() { cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib } +function dist_ktoblzcheck() { + setup ktoblzcheck + # dll is already copied in dist_gwenhywfar + cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share +} + function dist_aqbanking() { setup aqbanking cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in index f43f1fb9e1..4a8c5e842c 100644 --- a/packaging/win32/gnucash.iss.in +++ b/packaging/win32/gnucash.iss.in @@ -107,6 +107,12 @@ Root: HKCU; Subkey: "Software\AqHbci"; ValueType: none; Flags: uninsdeletekeyife Root: HKCU; Subkey: "Software\AqHbci\Paths"; ValueType: none; Flags: uninsdeletekeyifempty Root: HKCU; Subkey: "Software\AqHbci\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue +; And also a key for ktoblzcheck +Root: HKCU; Subkey: "Software\Ktoblzcheck"; ValueType: none; Flags: uninsdeletekeyifempty +Root: HKCU; Subkey: "Software\Ktoblzcheck\Paths"; ValueType: none; Flags: uninsdeletekeyifempty +Root: HKCU; Subkey: "Software\Ktoblzcheck\Paths"; ValueType: string; ValueName: "datadir"; ValueData: "{app}\share\ktoblzcheck" + + ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Delete the created config script on uninstall ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 9557d96c55..537c0d824f 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -707,6 +707,27 @@ function inst_gwenhywfar() { ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly" } +function inst_ktoblzcheck() { + setup Ktoblzcheck + # Out of convenience ktoblzcheck is being installed into + # GWENHYWFAR_DIR + if quiet ${PKG_CONFIG} --exists ktoblzcheck + then + echo "Ktoblzcheck already installed. Skipping." + else + wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR + assert_one_dir $TMP_UDIR/ktoblzcheck-* + qpushd $TMP_UDIR/ktoblzcheck-* + ./configure \ + --prefix=$_GWENHYWFAR_UDIR + make + make check + make install + qpopd + fi + ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck 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