r19265 - gnucash/trunk/packaging/win32 - Bug #621602 - Upgrade svn on Windows building environment to 1.6.x, patch by Tao Wang.

[Geert Janssens]

Author: gjanssens
Date: 2010-06-16 09:21:44 -0400 (Wed, 16 Jun 2010)
New Revision: 19265
Trac: http://svn.gnucash.org/trac/changeset/19265

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Bug #621602 - Upgrade svn on Windows building environment to 1.6.x, patch by Tao Wang.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-06-16 13:19:39 UTC (rev 19264)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-06-16 13:21:44 UTC (rev 19265)
@@ -304,7 +304,7 @@
 set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
 set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
 
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
+set_default SVN_URL "http://subversion.tigris.org/files/documents/15/46880/svn-win32-1.6.6.zip"
 set_default SVN_DIR $GLOBAL_DIR\\svn
 
 # OFX import in gnucash and ofx directconnect support for aqbanking

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-06-16 13:19:39 UTC (rev 19264)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-06-16 13:21:44 UTC (rev 19265)
@@ -388,13 +388,17 @@
     setup Subversion
     _SVN_UDIR=`unix_path $SVN_DIR`
     add_to_env $_SVN_UDIR/bin PATH
-    if quiet svn --version
+    if quiet $_SVN_UDIR/svn --version
     then
         echo "subversion already installed.  skipping."
     else
-		smart_wget $SVN_URL $DOWNLOAD_DIR
-		$LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
-        quiet svn --version || die "svn not installed correctly"
+		wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
+		assert_one_dir $TMP_UDIR/svn-win32-*
+		rm -rf $SVN_DIR
+		mkdir -p $SVN_DIR
+		cp -a $TMP_UDIR/svn-win32-*/* $SVN_DIR
+		rm -rf $TMP_UDIR/svn-win32-*
+        quiet $_SVN_UDIR/svn --version || die "svn not installed correctly"
     fi
 }