docker/windows: install cmake with choco as well

This commit is contained in:
Jordan Petridis 2020-01-21 20:22:56 +02:00 committed by GStreamer Merge Bot
parent 6fb7b6744c
commit 0320050e06
2 changed files with 2 additions and 7 deletions

View file

@ -1,4 +1,5 @@
Write-Host "Installing Choco" Write-Host "Installing Choco"
Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
Write-Host "Installing Choco packages" Write-Host "Installing Choco packages"
choco install -y python3 git git-lfs 7zip choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System'
choco install -y python3 git git-lfs 7zip

View file

@ -1,7 +1,6 @@
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
$msvc_2017_url = 'https://aka.ms/vs/15/release/vs_buildtools.exe' $msvc_2017_url = 'https://aka.ms/vs/15/release/vs_buildtools.exe'
$cmake_url = 'https://github.com/Kitware/CMake/releases/download/v3.16.1/cmake-3.16.1-win64-x64.msi'
$msys2_url = 'https://netcologne.dl.sourceforge.net/project/msys2/Base/x86_64/msys2-base-x86_64-20190524.tar.xz' $msys2_url = 'https://netcologne.dl.sourceforge.net/project/msys2/Base/x86_64/msys2-base-x86_64-20190524.tar.xz'
$msys_mingw_get_url = 'https://dotsrc.dl.osdn.net/osdn/mingw/68260/mingw-get-0.6.3-mingw32-pre-20170905-1-bin.tar.xz' $msys_mingw_get_url = 'https://dotsrc.dl.osdn.net/osdn/mingw/68260/mingw-get-0.6.3-mingw32-pre-20170905-1-bin.tar.xz'
@ -10,11 +9,6 @@ Invoke-WebRequest -Uri $msvc_2017_url -OutFile C:\vs_buildtools.exe
Start-Process C:\vs_buildtools.exe -ArgumentList '--quiet --wait --norestart --nocache --installPath C:\BuildTools --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended' -Wait Start-Process C:\vs_buildtools.exe -ArgumentList '--quiet --wait --norestart --nocache --installPath C:\BuildTools --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended' -Wait
Remove-Item C:\vs_buildtools.exe -Force Remove-Item C:\vs_buildtools.exe -Force
Write-Host "Installing CMake for Cerbero"
Invoke-WebRequest -Uri $cmake_url -OutFile C:\cmake-x64.msi
Start-Process msiexec -ArgumentList '-i C:\cmake-x64.msi -quiet -norestart ADD_CMAKE_TO_PATH=System' -Wait
Remove-Item C:\cmake-x64.msi -Force
Write-Host "Downloading and extracting mingw-get for MSYS" Write-Host "Downloading and extracting mingw-get for MSYS"
Invoke-WebRequest -Uri $msys_mingw_get_url -OutFile C:\mingw-get.tar.xz Invoke-WebRequest -Uri $msys_mingw_get_url -OutFile C:\mingw-get.tar.xz
7z e C:\mingw-get.tar.xz -o"C:\\" 7z e C:\mingw-get.tar.xz -o"C:\\"