Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Windows] Refactor Msys2 installation to use toolset part 1 #3487

Merged
merged 4 commits into from
Jun 2, 2021
Merged

[Windows] Refactor Msys2 installation to use toolset part 1 #3487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a88b9d3
Refactor Msys2 installation to use toolset
May 29, 2021
7fe592c
fix indent in the toolset files
May 31, 2021
e16e107
Resolve nitpicks
Jun 1, 2021
1a516e5
Remove typo (extra $)
Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions images/win/scripts/Installers/Install-Msys2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,41 +52,42 @@ Write-Host "`n$dash pacman --noconfirm -Syuu (2nd pass)"
pacman.exe -Syuu --noconfirm
taskkill /f /fi "MODULES eq msys-2.0.dll"

$toolsetContent = (Get-ToolsetContent).MsysPackages

Write-Host "`n$dash Install msys2 packages"
pacman.exe -S --noconfirm --needed --noprogressbar base-devel compression
$msys2Packages = $toolsetContent.msys2
pacman.exe -S --noconfirm --needed --noprogressbar $msys2Packages
taskkill /f /fi "MODULES eq msys-2.0.dll"

Write-Host "`n$dash Remove p7zip/7z package due to conflicts"
pacman.exe -R --noconfirm --noprogressbar p7zip

# mingw package list
# libxml2 can be removed from the list after the issue is fixed https://github.com/msys2/MINGW-packages/issues/8658
$tools64 = "___clang ___clang-tools-extra ___cmake ___libxml2 ___llvm ___toolchain ___ragel"
$tools32 = "___clang ___cmake ___libxml2 ___llvm ___toolchain ___ragel"

# install mingw64 packages
Write-Host "`n$dash Install mingw64 packages"
$pre = "mingw-w64-x86_64-"
pacman.exe -S --noconfirm --needed --noprogressbar $tools64.replace('___', $pre).split(' ')

# install mingw32 packages
Write-Host "`n$dash Install mingw32 packages"
$pre = "mingw-w64-i686-"
pacman.exe -S --noconfirm --needed --noprogressbar $tools32.replace('___', $pre).split(' ')
# install mingw packages
$archs = $toolsetContent.mingw.arch
foreach ($arch in $archs)
{
Write-Host "Installing $arch packages"
$archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch }
$runtimePackages = $archPackages.runtime_packages.name | ForEach-Object { "${arch}-$_" }
$additionalPackages = $archPackages.additional_packages | ForEach-Object { "${arch}-$_" }
$packagesToInstall = $runtimePackages + $additionalPackages
Write-Host "The following packages will be installed: $packagesToInstall"
pacman.exe -S --noconfirm --needed --noprogressbar $packagesToInstall
}

# clean all packages to decrease image size
Write-Host "`n$dash Clean packages"
pacman.exe -Scc --noconfirm

Write-Host "`n$dash Installed mingw64 packages"
pacman.exe -Q | grep ^mingw-w64-x86_64-

Write-Host "`n$dash Installed mingw32 packages"
pacman.exe -Q | grep ^mingw-w64-i686-

Write-Host "`n$dash Installed msys2 packages"
pacman.exe -Q | grep -v ^mingw-w64-
miketimofeev marked this conversation as resolved.
Show resolved Hide resolved

foreach ($arch in $archs)
{
Write-Host "`n$dash Installed $arch packages"
pacman.exe -Q | grep ^${arch}-
}

Write-Host "`nMSYS2 installation completed"

Invoke-PesterTests -TestFile "MSYS2"
73 changes: 73 additions & 0 deletions images/win/toolsets/toolset-2016.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,79 @@
"latest": "22"
}
},
"MsysPackages": {
"msys2": [
"base-devel",
"compression"
],
"mingw": [
{
"arch": "mingw-w64-x86_64",
"runtime_packages": [
{
"name": "clang",
"executables": [
"clang",
"g++",
"gcc"
]
},
{
"name": "cmake",
"executables": [
"cmake",
"cpack",
"ctest"
]
},
{
"name": "ragel",
"executables": [
"ragel"
]
}
],
"additional_packages": [
"clang-tools-extra",
"libxml2",
"llvm",
"toolchain"
]
},
{
"arch": "mingw-w64-i686",
"runtime_packages": [
{
"name": "clang",
"executables": [
"clang",
"g++",
"gcc"
]
},
{
"name": "cmake",
"executables": [
"cmake",
"cpack",
"ctest"
]
},
{
"name": "ragel",
"executables": [
"ragel"
]
}
],
"additional_packages": [
"libxml2",
"llvm",
"toolchain"
]
}
]
},
"visualStudio": {
"version" : "2017",
"subversion" : "15",
Expand Down
73 changes: 73 additions & 0 deletions images/win/toolsets/toolset-2019.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,79 @@
"latest": "22"
}
},
"MsysPackages": {
"msys2": [
"base-devel",
"compression"
],
"mingw": [
{
"arch": "mingw-w64-x86_64",
"runtime_packages": [
{
"name": "clang",
"executables": [
"clang",
"g++",
"gcc"
]
},
{
"name": "cmake",
"executables": [
"cmake",
"cpack",
"ctest"
]
},
{
"name": "ragel",
"executables": [
"ragel"
]
}
],
"additional_packages": [
"clang-tools-extra",
"libxml2",
"llvm",
"toolchain"
]
},
{
"arch": "mingw-w64-i686",
"runtime_packages": [
{
"name": "clang",
"executables": [
"clang",
"g++",
"gcc"
]
},
{
"name": "cmake",
"executables": [
"cmake",
"cpack",
"ctest"
]
},
{
"name": "ragel",
"executables": [
"ragel"
]
}
],
"additional_packages": [
"libxml2",
"llvm",
"toolchain"
]
}
]
},
"visualStudio": {
"version" : "2019",
"subversion" : "16",
Expand Down
3 changes: 3 additions & 0 deletions images/win/windows2016.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,9 @@
},
{
"type": "powershell",
"environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
],
"elevated_user": "SYSTEM",
"elevated_password": "",
"scripts": [
Expand Down
3 changes: 3 additions & 0 deletions images/win/windows2019.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@
},
{
"type": "powershell",
"environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
],
"elevated_user": "SYSTEM",
"elevated_password": "",
"scripts": [
Expand Down