diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2018-02-14 07:46:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-26 19:52:45 +0000 |
commit | cb6709ce5c48a31ba1170c71494c1a3869ffa5bb (patch) | |
tree | 8fdb8721a71cba868c2fbfe7c9fbc237d1f990a8 /coin/provisioning/common/windows/android.ps1 | |
parent | 08c88de5c8d531fb4fee03a0c337dd93739d365a (diff) |
Unify Windows provisioning scripts & improve error handlingv5.11.0-beta1
While Coin should also see exit codes != 0 as error, we should
stick to one way of handling script errors. As Power Shell cmdlets
signal an error by throwing an exception we should do the same
(and that approach also works in Coin).
Additionally extracting 7zip files was unified across scripts by
using the existing helper function instead of reinventing the wheel
again and again.
A similar helper function was introduced for starting an external
application (and handling its errors).
Also echo and other "cmd" commands were replaced by their PowerShell
equivalents to have a unified approach across our Windows provisioning
scripts.
Change-Id: I70129ce38692f1396c33c13b33a2918485fa5271
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/android.ps1')
-rw-r--r-- | coin/provisioning/common/windows/android.ps1 | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index f5e916e8..881d057e 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -70,23 +70,19 @@ function Install($1, $2, $3, $4) { } function SdkUpdate ($1, $2) { - echo "Running Android SDK update for $1..." + Write-Host "Running Android SDK update for $1..." cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2" } -echo "Installing Android ndk $nkdVersion" +Write-Host "Installing Android ndk $nkdVersion" Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl -echo "Set environment variable ANDROID_NDK_HOME=$ndkFolder" -[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME", $ndkFolder, "Machine") -echo "Set environment variable ANDROID_NDK_ROOT=$ndkFolder" -[Environment]::SetEnvironmentVariable("ANDROID_NDK_ROOT", $ndkFolder, "Machine") +Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder +Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder -#echo "Installing Android sdk $sdkVersion" +#Write-Host "Installing Android sdk $sdkVersion" Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl -echo "Set environment variable ANDROID_SDK_HOME=$sdkFolder" -[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME", $sdkFolder, "Machine") -echo "Set environment variable ANDROID_API_VERSION $sdkApiLevel" -[Environment]::SetEnvironmentVariable("ANDROID_API_VERSION", $sdkApiLevel, "Machine") +Set-EnvironmentVariable "ANDROID_SDK_HOME" $sdkFolder +Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel # SDK update SdkUpdate $sdkFolder $sdkApiLevel @@ -94,5 +90,11 @@ SdkUpdate $sdkFolder tools SdkUpdate $sdkFolder platform-tools SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion -# kill adb. This process prevent's provisioning to continue -taskkill /im adb.exe /f +# kill adb. This process prevents provisioning to continue +$p = Get-Process -Name "adb.exe" -ErrorAction:SilentlyContinue +if ($p -ne $null) { + Write-Host "Stopping adb.exe" + Stop-Process -Force $p +} else { + Write-Host "adb.exe not running" +} |