diff options
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
5 files changed, 12 insertions, 12 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index 1de57a66..d019fc92 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -34,10 +34,10 @@ # Visual Studios are pre-provisioned to tier1 images # MSVC 2015 Update 3 -echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt +Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt # MSVC 2017 -echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt # MSVC 2017 Build Tools -echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index d2864281..991ccfa6 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -42,6 +42,6 @@ Download $url $url $zip Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" Extract-7Zip $zip C:\ -[Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine") -echo "QNX SDP = 7.0.0" >> ~/versions.txt -del $zip +Set-EnvironmentVariable "QNX_700" "C:\QNX700" +Write-Output "QNX SDP = 7.0.0" >> ~/versions.txt +Remove-Item -Path $zip diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index 3201032d..998e6bae 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 +. "$PSScriptRoot\..\common\windows\python3.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 index 298375a3..d1b6ac9e 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 @@ -43,9 +43,9 @@ $virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe" Download $url_official $url_cache $virtualboxPackage Verify-Checksum $virtualboxPackage $sha1 -Start-Process $virtualboxPackage -ArgumentList "--silent" -Wait +Run-Executable $virtualboxPackage "--silent" -echo "Cleaning $virtualboxPackage.." -Remove-Item -Recurse -Force "$virtualboxPackage" +Write-Output "Cleaning $virtualboxPackage.." +Remove-Item -Recurse -Force -Path "$virtualboxPackage" -echo "VirtualBox = $version" >> ~\versions.txt +Write-Output "VirtualBox = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 index 7d01edac..854bee01 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 @@ -41,4 +41,4 @@ $destination = "C:\Windows\temp\sign.zip" Download $url $url $destination Extract-Zip "$destination" "C:\Utils" -Remove-Item "$destination" +Remove-Item -Path "$destination" |