gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/024b1e6c (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/fe96d140 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/316b07cd (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b40cb32f (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/490f5be0 (commit)



commit 024b1e6c944c0a89222a34822db31a3d9b7b2171
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 6 22:15:11 2017 -0700

    Redirect build command output to tee instead of directly to file.
    
    So that the build can be monitored from the terminal.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 4c0790d..0052351 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -84,12 +84,12 @@ bash-command -command "echo $time_stamp > $log_unix"
 #bash-command -command "scp $target_unix/$log_file $hostname/$log_dir/"
 
 # Update MinGW-w64
-bash-command -command "pacman -Su --noconfirm >> $log_unix 2>&1"
+bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
 
 # Update the gnucash-on-windows repository
 #bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
 # Build the latest GnuCash and all dependencies not installed via mingw64
-bash-command -command "jhbuild -f $script_unix/jhbuildrc build gnucash >> $log_unix 2>&1"
+bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build gnucash > >(tee -a $log_unix) 2>&1"
 #Build the installer
 & $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
 $time_stamp = get-date -format "Build Ended yyyy-MM-dd HH:mm:ss"

commit fe96d14096bd67cd96bce0d630fa42f255234e25
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 6 22:14:05 2017 -0700

    Use 24-hour time in build_package logfile timestamps.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index f21482a..4c0790d 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -75,8 +75,8 @@ $hostname = "upload at code.gnucash.org:public_html/win32"
 $log_dir = "build-logs"
 
 #Make sure that there's no running transcript, then start one:
-$start_time = get-date -format "yyyy-MM-dd-hh-mm-ss"
-$time_stamp = get-date -format "Build Begun yyyy-MM-dd hh:mm:ss"
+$start_time = get-date -format "yyyy-MM-dd-HH-mm-ss"
+$time_stamp = get-date -format "Build Begun yyyy-MM-dd HH:mm:ss"
 $log_file = "$target_dir\gnucash-build-log-$start_time.log"
 $log_unix = make-unixpath -path $log_file
 bash-command -command "echo $time_stamp > $log_unix"
@@ -92,7 +92,7 @@ bash-command -command "pacman -Su --noconfirm >> $log_unix 2>&1"
 bash-command -command "jhbuild -f $script_unix/jhbuildrc build gnucash >> $log_unix 2>&1"
 #Build the installer
 & $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
-$time_stamp = get-date -format "Build Ended yyyy-MM-dd hh:mm:ss"
+$time_stamp = get-date -format "Build Ended yyyy-MM-dd HH:mm:ss"
 bash-command -command "echo $time_stamp >> $log_unix"
 # Copy the transcript and installer to the download server and delete them.
 #bash-command "scp $log_unix $hostname/$log_dir/"

commit 316b07cd9074f3d61ae04e96f02c4a385f78b586
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 6 22:10:21 2017 -0700

    Set MSYSTEM=MINGW32 so that Mingw64 bash sets its environment correctly.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index c7363ab..f21482a 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -53,6 +53,7 @@ if (!$target_dir) {
 }
 
 $progressPreference = 'silentlyContinue'
+$env:MSYSTEM = 'MINGW32'
 
 function bash-command() {
     param ([string]$command = "")
@@ -61,7 +62,7 @@ function bash-command() {
 	return
     }
     #write-host "Running bash command ""$command"""
-    Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
+    Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-lc ""$command""" -NoNewWindow -Wait
 }
 
 function make-unixpath([string]$path) {
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 265e633..ce0ab10 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -62,11 +62,13 @@ if ($x86_64) {
     $mingw_prefix = "mingw64/mingw-w64-x86_64-"
     $mingw_path = "/mingw64"
     $mingw_bin = "/mingw64/bin"
+    $env:MSYSTEM = "MINGW64"
 }
 else {
     $mingw_prefix = "mingw32/mingw-w64-i686-"
     $mingw_path = "/mingw32"
     $mingw_bin = "/mingw32/bin"
+    $env:MSYSTEM = "MINGW32"
 }
 
 if (!(test-path -path $target_dir)) {

commit b40cb32f90797be2fb0f8a8a814df85b8be9df1c
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 6 11:47:07 2017 -0700

    Adjust paths to config.h and gnc-vcs-info.h after rearrangement in gnucash.git.

diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index d2bd9e5..2cb3830 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -84,8 +84,8 @@ function make-unixpath([string]$path) {
     $path -replace  "^([A-Z]):", '/$1' -replace "\\", '/'
 }
 
-$gnc_config_h = "$target_dir\build\gnucash-git\src\config.h"
-$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\src\core-utils\gnc-vcs-info.h"
+$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"
 
 $major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
 $minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h



Summary of changes:
 buildserver/build_package.ps1 | 13 +++++++------
 bundle-mingw64.ps1            |  4 ++--
 setup-mingw64.ps1             |  2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)