gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/9592645d (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/d95d3d7f (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1f64de47 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/106b66a0 (commit)



commit 9592645df5c1416b4c48426a6a83e52836571128
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 31 11:53:03 2017 -0700

    Patch jhbuild to not use DESTDIR on automake or cmake.
    
    It tends not to work because of the mismatch between DOS-style and
    MinGW style drive paths, and it's anyway not useful for our purposes.

diff --git a/patches/jhbuild.patch b/patches/jhbuild.patch
new file mode 100644
index 0000000..137b879
--- /dev/null
+++ b/patches/jhbuild.patch
@@ -0,0 +1,28 @@
+--- /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py	2017-06-01 12:26:10.000000000 -0700
++++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py	2017-08-31 10:46:42.719250200 -0700
+@@ -159,11 +159,9 @@
+         if self.use_ninja:
+             self.ensure_ninja_binary()
+             extra_env = self.extra_env or {}
+-            extra_env['DESTDIR'] = destdir
+             buildscript.execute(self.ninja_binary + ' install', cwd=builddir, extra_env=extra_env)
+         else:
+-            self.make(buildscript, 'install DESTDIR={}'.format(destdir))
+-        self.process_install(buildscript, self.get_revision())
++            self.make(buildscript, 'install')
+     do_install.depends = [PHASE_BUILD]
+ 
+     def xml_tag_and_attrs(self):
+--- /usr/lib/python2.7/site-packages/jhbuild/modtypes/autotools.py	2017-06-01 12:26:10.000000000 -0700
++++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/autotools.py	2017-08-31 11:00:39.148673100 -0700
+@@ -309,9 +309,7 @@
+                 packagedb.uninstall(self.name)
+ 
+         buildscript.set_action(_('Installing'), self)
+-        destdir = self.prepare_installroot(buildscript)
+-        self.make(buildscript, self.makeinstallargs or 'install', makeargs='DESTDIR={}'.format(destdir))
+-        self.process_install(buildscript, self.get_revision())
++        self.make(buildscript, self.makeinstallargs or 'install')
+ 
+     do_install.depends = [PHASE_BUILD]
+     do_install.error_phases = [PHASE_CONFIGURE]
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 632d777..bc9ae5e 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -234,7 +234,7 @@ bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l
 
 Write-Host @"
 
-Finally we'll clone the gnucash-on-windows repository into target-dir/src and you'll be ready to build GnuCash.
+Clone the gnucash-on-windows repository into the target source directory, patch jhbuild to disable its DESTDIR dance and set up jhbuildrc with our prefixes.
 "@
 
 if (!(test-path -path "$target_dir\\src")) {
@@ -247,6 +247,9 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
    write-host "Failed to clone the gnucash-on-windows repo, exiting."
    exit
 }
+
+bash-command -command "$mingw_bin/patch < $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
+
 $target_unix = make-unixpath $target_dir
 $download_unix = make-unixpath $download_dir
 

commit d95d3d7fb663566179d24caceef5568b731448d5
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 27 18:00:01 2017 -0700

    Declare use-ninja false and use the MSYS Makefiles generator.

diff --git a/gnucash.modules b/gnucash.modules
index ee15e88..7f91c3d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,8 +275,9 @@
 	      autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure -\-prefix %(prefix)s %(autogenargs)s"
 	      autogenargs="-\-enable-ofx -\-enable-aqbanking -\-enable-binreloc -\-enable-dbi -\-with-dbi-dbd-dir=$PREFIX/lib/dbd"-->
  <cmake id="gnucash"
-        cmakeargs="-DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
-   <branch repo="github" module="Gnucash/gnucash.git" revision="master"
+        cmakeargs="-G 'MSYS Makefiles' -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+	use-ninja="False">
+   <branch repo="github" module="Gnucash/gnucash.git" revision="dodge-boost-filesystem"
 	   checkoutdir="gnucash-git"/>
     <dependencies>
       <dep package="libofx"/>

commit 1f64de470390285bedd625f549dd18d422d2c50f
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 27 17:13:30 2017 -0700

    Change the mingw_path to be the regular package directory rather than the toolchain directory.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index f2ab88b..632d777 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -60,12 +60,12 @@ Param(
 $progressPreference = 'silentlyContinue'
 if ($x86_64) {
     $mingw_prefix = "mingw64/mingw-w64-x86_64-"
-    $mingw_path = "/mingw64/x86_64-w64-mingw64"
+    $mingw_path = "/mingw64"
     $mingw_bin = "/mingw64/bin"
 }
 else {
     $mingw_prefix = "mingw32/mingw-w64-i686-"
-    $mingw_path = "/mingw32/i686-w64-mingw32"
+    $mingw_path = "/mingw32"
     $mingw_bin = "/mingw32/bin"
 }
 



Summary of changes:
 gnucash.modules       |  5 +++--
 patches/jhbuild.patch | 28 ++++++++++++++++++++++++++++
 setup-mingw64.ps1     |  9 ++++++---
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 patches/jhbuild.patch