gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1eded2f0 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/813f961f (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/c8ec7f53 (commit)



commit 1eded2f0193b38f23029f57d3af384a393714057
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Sep 27 09:25:14 2020 -0700

    Release GnuCash 4.2

diff --git a/gnucash.modules b/gnucash.modules
index 0a91f50..6612941 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -274,8 +274,8 @@
 
  <cmake id="gnucash"
         cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest">
-   <branch module="project/gnucash/gnucash%20%28stable%29/4.1/gnucash-4.1.tar.bz2"
-	   repo="sourceforge" version="4.1"/>
+   <branch module="project/gnucash/gnucash%20%28stable%29/4.2/gnucash-4.2.tar.bz2"
+	   repo="sourceforge" version="4.2"/>
     <dependencies>
       <dep package="libofx"/>
       <dep package="aqbanking"/>
@@ -333,8 +333,8 @@
   <cmake id="gnucash-docs"
         cmakeargs="-G'MSYS Makefiles'"
         use-ninja="False"> <!-- Can't use ninja for now. See https://bugs.gnucash.org/show_bug.cgi?id=797622 -->
-    <branch  module="project/gnucash/gnucash%20%28stable%29/4.1/gnucash-docs-4.1.tar.gz"
-	     version="4.1" repo="sourceforge"/>
+    <branch  module="project/gnucash/gnucash%20%28stable%29/4.2/gnucash-docs-4.2.tar.gz"
+	     version="4.2" repo="sourceforge"/>
   </cmake>
 
   <cmake id="gnucash-unstable-docs"

commit 813f961fa26d526f9ed5818b1101f91f0b3ec435
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Sep 27 09:24:54 2020 -0700

    Put msys2\usr\bin at the front of the path instead of the end.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 90b020f..9fedbd6 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -66,7 +66,7 @@ $env:MSYSTEM = 'MINGW32'
 $env:TERM = 'dumb' #Prevent escape codes in the log.
 $env:TARGET = "$package-$branch"
 # This allows us to run Msys2 commands such as bash.exe directly
-$Env:Path = "$Env:Path;$target_dir\msys2\usr\bin"
+$Env:Path = "$target_dir\msys2\usr\bin;$Env:Path"
 
 if ($PSVersionTable.PSVersion.Major -ge 3) {
     $PSDefaultParameterValues['*:Encoding'] = 'utf8'



Summary of changes:
 buildserver/build_package.ps1 | 2 +-
 gnucash.modules               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)