gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/6ba18441 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/cfd8b4bf (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/c68c7bee (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/dbb48610 (commit)



commit 6ba18441ac2923378698f82779c7f7ed7a2e18f1
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 6 15:20:01 2018 -0800

    Uninstall GnuCash before building.
    
    To prevent linking from an old build screwing up the current one.
    Also remove the jhbuild info and  manifest on a releases build to
    force rebuilding if the release is the same.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 473bf8b..fa15ace 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -105,6 +105,24 @@ if ($hostname) {
 # Update MinGW-w64
 bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
 
+#GnuCash build still behaves badly if it finds its old build products. Clean them out.
+if ($branch -eq "releases") {
+    $module = get-childitem -path $target_dir\$package\$branch\build -filter gnucash-* -exclude gnucash-docs* -name -directory | sort-object -descending | select -f 1
+    $install_manifest = "$target_dir\$package\$branch\build\$module\install_manifest.txt"
+}
+else {
+    $install_manifest = "$target_dir\$package\$branch\build\gnucash-git\install_manifest.txt"
+}
+
+if (test-path -path $install_manifest) {
+    get-content $install_manifest | remove-item
+    remove-item $install_manifest
+    if ($branch -eq "releases") { # Force a release build even if nothing has changed.
+	remove-item $target_dir\$package\$branch\inst\_jhbuild\info\gnucash
+	remove-item $target_dir\$package\$branch\inst\_jhbuild\manifests\gnucash
+    }
+}
+
 # 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

commit cfd8b4bfb0359f41f88d41ee180cef0fc7d0f167
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 6 13:43:08 2018 -0800

    Fix msgfmt can't find its rules for appdata.xml.in.
    
    Also fix a jhbuild snivel about unknown variable mingw_base.

diff --git a/jhbuildrc.in b/jhbuildrc.in
index 6249cbc..c1ed1bf 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -57,16 +57,16 @@ add_to_path_var('PATH', os.path.join(_basedir, 'msys2', _arch, 'bin'))
 
 
 if _arch == 'mingw32':
-    mingw_base='/mingw32'
+    _mingw_base='/mingw32'
 else:
-    mingw_base='/mingw64'
+    _mingw_base='/mingw64'
 
 os.environ['SRCROOT'] = checkoutroot
 os.environ['PREFIX'] = prefix
 os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
 #os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
 #os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
-os.environ['XDG_DATA_DIRS'] = '/usr/local/share:/usr/share:' + mingw_base + '/share'
+os.environ['GETTEXTDATADIRS'] = os.path.join(_mingw_base, 'share', 'gettext')
 
 if _arch == 'mingw32':
     autogenargs = "--build=i686-w64-mingw32"
@@ -86,6 +86,6 @@ module_makeargs["aqbanking"]="-j 1"
 module_makeargs["gnucash"]="-j 1"
 module_makeargs["gnucash-git"]="-j 1"
 
-module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(mingw_base, 'share', 'aclocal')}
+module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
 module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
 

commit c68c7bee8953d8316c043187a6289742fbde4586
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 6 11:29:31 2018 -0800

    Use correct shell and specific target directory in the final message.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index b30efcb..389c85e 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -282,7 +282,7 @@ $jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in
 Write-Host @"
 
 
-Your build environment is now ready to use. Open an MSys2/Mingw32 shell from the start menu, cd to your target directory, and run
+Your build environment is now ready to use. Open an MSys2/$arch shell from the start menu, cd to $target_unix, and run
 jhbuild -f src/gnucash-on-windows.git/jhbuildrc build
 
 Note that the build will not work with the plain MSys2 shell!



Summary of changes:
 buildserver/build_package.ps1 | 18 ++++++++++++++++++
 jhbuildrc.in                  |  8 ++++----
 setup-mingw64.ps1             |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)