gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/72d6443a (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/08b2ab9e (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/d219c3e6 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/3077b9f7 (commit)



commit 72d6443ab9daf1b7b2277253cb22f15166f85c6b
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 16 12:36:38 2017 -0700

    Add some missing stuff to the bundle.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 54b171f..e3ad0e5 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -85,6 +85,8 @@ Source: "@INST_DIR@\share\guile\*"; DestDir: "{app}\share\guile"; Flags: recurse
 Source: "@INST_DIR@\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs; Components: main
 Source: "@INST_DIR@\share\libofx\*"; DestDir: "{app}\share\libofx"; Flags: recursesubdirs; Components: main
 Source: "@INST_DIR@\share\OpenSP\*"; DestDir: "{app}\share\OpenSP"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\icons\hicolor\*"; DestDir: "{app}\share\icons\hicolor"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: recursesubdirs; Components: main
 
 ;; The translations
 ;Source: "@INST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
@@ -104,7 +106,8 @@ Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{
 Source: "@INST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
 Source: "@INST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
 Source: "@INST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.chm"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
 
 ;;;; The second section retrieves the dependencies that we need from MinGW.
 ;; Required DLLs
@@ -164,6 +167,7 @@ Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libicuuc*.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libidn-11.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libidn2-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libintl-8.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main

commit 08b2ab9eb587ece2a138b90ea182a5085e8aa9cc
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 16 12:36:22 2017 -0700

    Make version_item tag match changes in Gnucash.

diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 046794c..f3f039a 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -131,7 +131,7 @@ $setup_result =  "$target_dir\gnucash-$package_version-setup.exe"
 $final_file = ""
 if ($git_build) {
   $gnc_vcsinfo_h = "$target_dir\build\gnucash-git\libgnucash\core-utils\gnc-vcs-info.h"
-  $vcs_rev = version_item -tag "GNUCASH_SCM_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
+  $vcs_rev = version_item -tag "GNC_VCS_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
   $final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
   }
 else {

commit d219c3e6c11c63bc8b922209236d2c73204019ab
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 16 12:34:51 2017 -0700

    Remove --disable-scrollkeeper from gnucash-docs, use gnucash-docs-git for all builds.

diff --git a/gnucash.modules b/gnucash.modules
index f41867e..1ecbe57 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -314,7 +314,7 @@
     </dependencies>
  </cmake>
 
-  <autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
+  <autotools id="gnucash-docs-git"
 	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
 	    makeargs="chm" makeinstallargs="install-chm" >
     <branch  repo="github" module="Gnucash/gnucash-docs.git" revision="master"
@@ -324,7 +324,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
+  <autotools id="gnucash-docs"
 	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
 	    makeargs="chm" makeinstallargs="install-chm" >
     <branch  module="gnucash/gnucash-docs/gnucash-docs-2.7.0.tar.gz"
@@ -341,7 +341,7 @@
   <metamodule id="meta-gnucash">
     <dependencies>
       <dep package="gnucash"/>
-      <dep package="gnucash-docs"/>
+      <dep package="gnucash-docs-git"/>
     </dependencies>
   </metamodule>
 



Summary of changes:
 bundle-mingw64.ps1             | 2 +-
 gnucash.modules                | 6 +++---
 inno_setup/gnucash-mingw64.iss | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)