gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Oct 19 14:57:55 EDT 2017
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/58616b7f (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/f118eaca (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/2a61fd4b (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/2577cc5c (commit)
commit 58616b7fc4493e1cad616b907457343ebddf7c56
Merge: f118eac 2577cc5
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 11:57:40 2017 -0700
Set Powershell's output encoding to UTF8.
So that Inno Setup's output in the build log is intelligible.
diff --cc buildserver/build_package.ps1
index d74ecd1,d74ecd1..473bf8b
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@@ -66,6 -66,6 +66,10 @@@ $env:MSYSTEM = 'MINGW32
$env:TERM = 'dumb' #Prevent escape codes in the log.
$env:TARGET = "$package-$branch"
++if ($PSVersionTable.PSVersion.Major -ge 3) {
++ $PSDefaultParameterValues['*:Encoding'] = 'utf8'
++ }
++
function bash-command() {
param ([string]$command = "")
if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
commit f118eaca662169f31591444b37d590e114d56522
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 11:27:50 2017 -0700
Turn off debugging output from bash-command function.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index fe4f884..8838341 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -108,7 +108,7 @@ function bash-command() {
write-host "Shell program not found, aborting."
return
}
- write-host "Running bash command ""$command"""
+ #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
}
commit 2a61fd4bdbd9ecc3eedc7b05e99eb8c03d3005a3
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 11:19:04 2017 -0700
Use system.net.downloadfile instead of invoke-webrequest.
Fixes bug 787177.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index eef3451..fe4f884 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -90,7 +90,7 @@ function Install-Package([string]$url, [string]$download_file,
{
if (!(test-path -path $download_file)) {
write-host "Downloading $download_file from $url"
- invoke-webrequest -uri $url -outfile $download_file
+ (New-Object System.Net.WebClient).DownloadFile($url, $download_file)
}
write-host "Installing $download_dir\$setup_cmd $setup_args"
Summary of changes:
buildserver/build_package.ps1 | 4 ++++
setup-mingw64.ps1 | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list