r19573 - gnucash/trunk/packaging/win32 - Win32 build: Set gwen/aqbanking version numbers in defaults.sh.

[Christian Stimming]

Author: cstim
Date: 2010-09-14 15:26:04 -0400 (Tue, 14 Sep 2010)
New Revision: 19573
Trac: http://svn.gnucash.org/trac/changeset/19573

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Set gwen/aqbanking version numbers in defaults.sh.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-09-13 12:14:12 UTC (rev 19572)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-09-14 19:26:04 UTC (rev 19573)
@@ -326,9 +326,11 @@
 # needed.
 
 if [ "$AQBANKING5" = "yes" ]; then
-    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-4.0.1.tar.gz"
+    GWENHYWFAR_VERSION="4.0.1"
+    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.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"
+    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-3.11.1-patch.diff
 fi
 set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -337,10 +339,12 @@
 # ktoblzcheck is being installed into GWENHYWFAR_DIR
 
 if [ "$AQBANKING5" = "yes" ]; then
-    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-5.0.1.tar.gz"
+    AQBANKING_VERSION="5.0.1"
+    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
     set_default AQBANKING_WITH_QT no
 else
-    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-4.2.4.tar.gz"
+    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.1.6-patch.diff
     set_default AQBANKING_WITH_QT yes
 fi

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-09-13 12:14:12 UTC (rev 19572)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-09-14 19:26:04 UTC (rev 19573)
@@ -964,12 +964,7 @@
     _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
     add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
     add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if [ "$AQBANKING5" = "yes" ]; then
-        _GWEN_VERSION="4.0.1"
-    else
-        _GWEN_VERSION="3.11.3"
-    fi
-    if quiet ${PKG_CONFIG} --atleast-version=${_GWEN_VERSION} gwenhywfar
+    if quiet ${PKG_CONFIG} --atleast-version=${GWENHYWFAR_VERSION} gwenhywfar
     then
         echo "Gwenhywfar already installed. skipping."
     else
@@ -1071,12 +1066,7 @@
     _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
     add_to_env ${_AQBANKING_UDIR}/bin PATH
     add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if [ "$AQBANKING5" = "yes" ]; then
-        _AQBANKING_VERSION="5.0.1"
-    else
-        _AQBANKING_VERSION="4.2.4"
-    fi
-    if quiet ${PKG_CONFIG} --atleast-version=${_AQBANKING_VERSION} aqbanking
+    if quiet ${PKG_CONFIG} --atleast-version=${AQBANKING_VERSION} aqbanking
     then
         echo "AqBanking already installed. skipping."
     else