gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/61047be1 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/3a46e1e6 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/37841584 (commit)



commit 61047be10c05608de032055c0ff052b33b80b08b
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Sep 17 22:01:10 2017 -0700

    Add libboost_filesystem-mt to Inno Setup file.
    
    Required by recent gnc-filesystem changes.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 194bbae..f49ffaf 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -117,6 +117,7 @@ Source: "@MINGW_DIR@\bin\libatk-1.0-0.dll"; DestDir: "{app}\bin"; Components: ma
 Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_filesystem-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libcairo-2.dll"; DestDir: "{app}\bin"; Components: main

commit 3a46e1e6edc51e2a5d7c597b18f545e63105178e
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Sep 17 17:57:54 2017 -0700

    Fix up bundling to handle non-git builds.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 710c0ed..d74ecd1 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -49,7 +49,7 @@ Optional. A ssh compatible server specification (which means [user@]hostname:bas
 [CmdletBinding()]
 Param(
     [Parameter(Mandatory=$true)]
-    [validatePattern("(master|unstable|release)")][string]$branch,
+    [validatePattern("(master|unstable|releases)")][string]$branch,
     [Parameter()] [string]$target_dir,
     [Parameter()] [string]$hostname
 )
@@ -108,14 +108,13 @@ bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build > >
 $new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
 if ($new_file) {
 #Build the installer
-    $is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
+    $is_git = ($branch.CompareTo("master") -eq 0) -or ($branch.CompareTo("unstable") -eq 0)
     bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
     $setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
     $setup_file = make-unixpath -path $setup_file
+    write-host "Created GnuCash Setup File $setup_file"
 }
 
-write-host "Created GnuCash Setup File $setup_file"
-
 $time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
 bash-command -command "echo Build Ended $time_stamp >> $log_unix"
 
@@ -123,6 +122,6 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
 if ($hostname) {
 	bash-command -command "scp -p $log_unix $hostname/$log_dir/"
     if ($new_file) {
-	bash-command -command "scp -p $setup_file $hostname/master"
+	bash-command -command "scp -p $setup_file $hostname/$branch"
     }
 }
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 27f280b..046794c 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -84,8 +84,14 @@ function make-unixpath([string]$path) {
     $path -replace  "^([A-Z]):", '/$1' -replace "\\", '/'
 }
 
-$gnc_config_h = "$target_dir\build\gnucash-git\common\config.h"
-$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\libgnucash\core-utils\gnc-vcs-info.h"
+if ($git_build) {
+  $gnucash = "gnucash-git"
+}
+else {
+  $gnucash = get-childitem -path $target_dir\build | where-object {$_.Name -match "gnucash-[0-9.]+"} | select-object -last 1
+}
+
+$gnc_config_h = "$target_dir\build\$gnucash\common\config.h"
 
 $major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
 $minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h
@@ -119,12 +125,13 @@ $proc = bash-command("sed  < $issue_in > $issue_out \
   -e ""s#@GNUCASH_MICRO_VERSION@#$micro_version#g"" \
   -e ""s#@GC_WIN_REPOS_DIR@#$script#g"" ")
 
-$vcs_rev = version_item -tag "GNUCASH_SCM_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
 
 $date = get-date -format "yyyy-MM-dd"
 $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 """", ""}
   $final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
   }
 else {
@@ -138,8 +145,10 @@ if (test-path -path $setup_result) {
 }
 & ${env:ProgramFiles(x86)}\inno\iscc /Q $target_dir\gnucash.iss
 
-if ((test-path -path $setup_result) -and (test-path -path $final_file)) {
+if ($git_build) {
+  if ((test-path -path $setup_result) -and (test-path -path $final_file)) {
     remove-item $final_file
+  }
+  rename-item -path $setup_result $final_file
 }
-rename-item -path $setup_result $final_file
 return $final_file
\ No newline at end of file
diff --git a/gnucash.modules b/gnucash.modules
index f41867e..aa5e7c3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -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:
 buildserver/build_package.ps1  |  9 ++++-----
 bundle-mingw64.ps1             | 19 ++++++++++++++-----
 gnucash.modules                |  2 +-
 inno_setup/gnucash-mingw64.iss |  1 +
 4 files changed, 20 insertions(+), 11 deletions(-)