From e0e4994ed11ac86bd3658d16748eded7c9e1ff4b Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Mon, 2 Jan 2012 12:51:24 +0000
Subject: [PATCH] [Win32 build] Let git.exe be downloaded and unpacked as well.
 We might start using it sooner or later.

BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21818 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/defaults.sh     |  3 +++
 packaging/win32/install-impl.sh | 14 ++++++++++++++
 packaging/win32/install.sh      |  1 +
 3 files changed, 18 insertions(+)

diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index fe02a17848..f872dbb33e 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -353,6 +353,9 @@ set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
 set_default SVN_URL "http://subversion.tigris.org/files/documents/15/47914/svn-win32-1.6.6.zip"
 set_default SVN_DIR $GLOBAL_DIR\\svn
 
+set_default GIT_URL "http://msysgit.googlecode.com/files/Git-1.7.8-preview20111206.exe"
+set_default GIT_DIR $GLOBAL_DIR\\git-1.7.8
+
 # OFX import in gnucash and ofx directconnect support for aqbanking
 set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
 set_default OPENSP_DIR $GLOBAL_DIR\\opensp
diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index 2c435c4a29..9f790b4555 100644
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -251,6 +251,20 @@ function inst_unzip() {
     fi
 }
 
+function inst_git() {
+    setup Git
+    _GIT_UDIR=`unix_path $GIT_DIR`
+    add_to_env $_GIT_UDIR/bin PATH
+    if quiet $_GIT_UDIR/bin/git --help || quiet git --help
+    then
+        echo "git already installed in $_GIT_UDIR.  skipping."
+    else
+        smart_wget $GIT_URL $DOWNLOAD_DIR
+        $LAST_FILE //SP- //SILENT //DIR="$GIT_DIR"
+        quiet git --help || die "git unavailable"
+    fi
+}
+
 # Functions before this point are basic build infrastructure functions or else they get pieces needed to build
 # gnucash but which are not part of the final product.  Functions after this point are for components of the
 # final build.  Please leave in alphabetical order so they are easier to find.
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index a40195106d..a3fd7a1ca3 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -83,6 +83,7 @@ add_step inst_gnome
 add_step inst_guile
 if [ "$CROSS_COMPILE" != "yes" ]; then
  add_step inst_svn
+ add_step inst_git
 fi
 add_step inst_gnutls
 add_step inst_libxslt