diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-09-06 09:38:08 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-10-11 07:43:59 +0300 |
| commit | eb63604bc9fd12939764d326f0341b013b34ed76 (patch) | |
| tree | a6ec6ead767e9bbd56b1fc1acb7cb87641a67734 | |
| parent | 33734ad9c1bd13391c7b112e4373668924e458e9 (diff) | |
Include VCToolsVersion and WindowsSDKVersion to versions.txt
Let's include these needed versions to versions.txt and set
Visual studio versions as a last items in the versions list.
Task-number: QTQAINFRA-4542
Change-Id: Ic4c4c9f092925b0e4dc05a1874fa2ee651b24b7d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -rw-r--r-- | coin/provisioning/common/windows/update-msvc2019.ps1 | 3 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 (renamed from coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 (renamed from coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1) | 0 |
5 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 index b7db04d1..733b5ed7 100644 --- a/coin/provisioning/common/windows/update-msvc2019.ps1 +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -70,3 +70,6 @@ $msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Insta Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt + +# Add Windows SDK Version and VCTools Version to versions.txt +cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" amd64 & set' |Select-String -Pattern '(WindowsSDKVersion)|(VCToolsVersion)' >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 index ae66d464..ae66d464 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 index c65290df..c65290df 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 index 1a52d747..1a52d747 100644 --- a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 +++ b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 index c65290df..c65290df 100644 --- a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 +++ b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 |