From 6b4067bceee7cdeca3345d2d7c8450747c8346ff Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 16 Jun 2010 13:21:44 +0000 Subject: [PATCH] Bug #621602 - Upgrade svn on Windows building environment to 1.6.x, patch by Tao Wang. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19265 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/defaults.sh | 2 +- packaging/win32/install-impl.sh | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index 0eb22687e5..a6c38e1d47 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -304,7 +304,7 @@ set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu 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 diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index 4ed810a62f..8e8fe486fe 100755 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -388,13 +388,17 @@ function inst_svn() { 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 }