gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/9f6a00e7 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/7b3107b6 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/bb023335 (commit)



commit 9f6a00e7321b6aaaa09c455f9da88e0ee299dae8
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 5 16:12:53 2017 -0700

    Use target_unix for paths to patch files so that bash can use them.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 7d25aa7..265e633 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -218,6 +218,9 @@ bash-command -command "pacman -S $msys_devel --noconfirm --needed"
 bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
 bash-command -command "pacman -S  $mingw_deps --noconfirm --needed"
 
+$target_unix = make-unixpath $target_dir
+$download_unix = make-unixpath $download_dir
+
 Write-Host @"
 
 Next we'll install the HTML Help Workshop includes and libraries into our MinGW directory.
@@ -227,7 +230,6 @@ if (!(test-path -path "$target_dir/msys2/$mingw_path/include/htmlhelp.h")) {
     if (!$installed_hh) {
 	$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
     }
-    $target_unix = make-unixpath -path $target_dir
     $installed_hh = make-unixpath -path $installed_hh
     bash-command -command "cp $installed_hh/include/htmlhelp.h $mingw_path/include"
 
@@ -254,11 +256,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
    exit
 }
 
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/FindSWIG.patch"
-
-$target_unix = make-unixpath $target_dir
-$download_unix = make-unixpath $download_dir
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
 
 $jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
  %{$_ -replace "@-BASE_DIR-@", "$target_unix"} |

commit 7b3107b69d2617352da5173d5b4a782bb9b1e176
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 5 15:53:38 2017 -0700

    Switch xmlsec to tarball.
    
    So that it doesn't need to re-clone every build.

diff --git a/gnucash.modules b/gnucash.modules
index 130e1bd..2708be2 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -19,6 +19,8 @@
 	      href="http://devel.aqbanking.de/svn/"/>
   <repository type="git" name="github"
 	      href="git://github.com/"/>
+  <repository type="tarball" name="github-tar"
+	      href="https://github.com/"/>
   <repository type="system" name="system"/>
 
   <systemmodule id="webkitgtk-3.0">
@@ -165,7 +167,9 @@
   </autotools>
 
   <autotools id="xmlsec">
-    <branch module="lsh123/xmlsec" repo="github" tag="xmlsec-1_2_20"/>
+    <branch module="lsh123/xmlsec/archive/xmlsec-1_2_20.tar.gz"
+	    repo="github-tar" version="1.2.20"
+	    checkoutdir="xmlsec-xmlsec-1_2_20"/>
     <dependencies>
       <dep package="openssl"/>
     </dependencies>



Summary of changes:
 gnucash.modules   |  6 +++++-
 setup-mingw64.ps1 | 11 +++++------
 2 files changed, 10 insertions(+), 7 deletions(-)