gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b4bd3289 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/19cdac27 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1003b04e (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/38762213 (commit)



commit b4bd3289fef5b45f4dccf117d468d85a20425fb1
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Nov 20 16:45:44 2020 -0800

    Replace two obsoleted package names (python2 and rsync2).
    
    Caused installation of build requirements to fail.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 4b00907..94d4294 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -236,7 +236,7 @@ bash-command -command "pacman -Syyuu --noconfirm"
 
 # Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
 # we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config python2 rsync2 sed texinfo texinfo-tex wget xmlto git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config python rsync sed texinfo texinfo-tex wget xmlto git texinfo"
 
 $toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config swig tools-git winpthreads-git"
 

commit 19cdac2741e81bc7007c271d1a7f33872a30f85f
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Nov 20 16:43:53 2020 -0800

    Update MSYS2 installers to latest versions.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 6df9435..4b00907 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -139,8 +139,8 @@ function make-unixpath([string]$path) {
 # Install MSYS2 for the current machine's architechture.
 
 if (!(test-path -path $bash_path)) {
-    $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20190524.exe"
-    $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20190524.exe"
+    $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20200903.exe"
+    $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20200903.exe"
 
     $mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}
     $msys_install_dir = (join-path $target_dir "msys2") -replace "\\", '/'

commit 1003b04e4fe525751c1a46f99c59dae0a3d0266d
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Nov 20 16:41:37 2020 -0800

    Bug 798014 - setup-mingw64 fails with a missing public key.
    
    Don't use a canned name for the download target, it prevents ever
    downloading a new one even after uninstalling MSYS2.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 948c87a..6df9435 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -103,17 +103,19 @@ function make-pkgnames ([string]$prefix, [string]$items) {
     $items.split(" ") | foreach-object {"$prefix$_"}
 }
 
-function Install-Package([string]$url, [string]$download_file,
-	  [string]$install_dir, [string]$setup_cmd, [string]$setup_args)
+function Install-Package([string]$url, [string]$install_dir,
+			 [string]$setup_args)
 {
+    $filename = $url.Substring($url.LastIndexOf("/") + 1)
+    $download_file = "$download_dir\$filename"
     if (!(test-path -path $download_file)) {
 	write-host "Downloading $download_file from $url"
-	(New-Object System.Net.WebClient).DownloadFile($url, $download_file)
+	(New-Object System.Net.WebClient).DownloadFile($url, "$download_file")
     }
 
-    write-host "Installing $download_dir\$setup_cmd $setup_args"
+    write-host "Installing $download_file $setup_args"
     $psi = new-object "Diagnostics.ProcessStartInfo"
-    $psi.Filename = "$download_dir\$setup_cmd"
+    $psi.Filename = "$download_file"
     $psi.Arguments = "$setup_args"
     $proc = [Diagnostics.Process]::Start($psi)
     $proc.waitForExit()
@@ -140,7 +142,6 @@ if (!(test-path -path $bash_path)) {
     $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20190524.exe"
     $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20190524.exe"
 
-    $mingw64_installer_file = "$download_dir\msys2.exe"
     $mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}
     $msys_install_dir = (join-path $target_dir "msys2") -replace "\\", '/'
     $msys_setup_args = @"
@@ -165,7 +166,7 @@ Controller.prototype.FinishedPageCallback = function() {
 
     $setup_script = "$target_dir\input.qs"
     set-content -path $setup_script -value $msys_setup_args | out-null
-    install-package -url $mingw64_installer -download_file $mingw64_installer_file -install_dir "$msys2_root" -setup_cmd "msys2.exe" -setup_args "--script $setup_script"
+    install-package -url $mingw64_installer -install_dir "$msys2_root" -setup_args "--script $setup_script"
 #    remove-item $setup_script
 }
 if (!(test-path -path $bash_path)) {



Summary of changes:
 setup-mingw64.ps1 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)