Skip to content

Commit 97544b5

Browse files
lazkalazka
committed
Add a page for repos and mirrors and one for package names
To keep the environment overview less overloaded.
1 parent e2fe13a commit 97544b5

4 files changed

Lines changed: 62 additions & 47 deletions

File tree

‎mkdocs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ nav:
6565
- docs/terminals.md
6666
- Package Management:
6767
- docs/package-management.md
68+
- docs/package-naming.md
69+
- docs/repos-mirrors.md
6870
- docs/package-management-tips.md
6971
- docs/filesystem-paths.md
7072
- docs/cmake.md

‎web/docs/environments.md‎

Lines changed: 13 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -22,53 +22,19 @@ tools.
2222

2323
## Overview
2424

25-
| | Name [^1] | Prefix | Toolchain | Architecture | Package prefix [^2] | C Library | C++ Library |
26-
| - | - | - | - | - | - | - |- |
27-
| ![msys](msys.png){: style="max-width:25px" } | **MSYS** | `/usr` | gcc | x86_64 | None | cygwin | libstdc++ |
28-
| ![mingw64](mingw64.png){: style="max-width:25px" } | **MINGW64** | `/mingw64` | gcc | x86_64 | `mingw-w64-x86_64-` | msvcrt | libstdc++ |
29-
| ![ucrt64](ucrt64.png){: style="max-width:25px" } | **UCRT64** | `/ucrt64` | gcc | x86_64 | `mingw-w64-ucrt-x86_64-` | ucrt | libstdc++ |
30-
| ![clang64](clang64.png){: style="max-width:25px" } | **CLANG64** | `/clang64` | llvm | x86_64 | `mingw-w64-clang-x86_64-` | ucrt | libc++ |
31-
| ![mingw32](mingw32.png){: style="max-width:25px" } | **MINGW32** | `/mingw32` | gcc | i686 | `mingw-w64-i686-` | msvcrt | libstdc++ |
32-
| ![clang32](clang32.png){: style="max-width:25px" } | **CLANG32** | `/clang32` | llvm | i686 | `mingw-w64-clang-i686-` | ucrt | libc++ |
33-
| ![clangarm64](clangarm64.png){: style="max-width:25px" } | **CLANGARM64** | `/clangarm64` | llvm | aarch64 | `mingw-w64-clang-aarch64-` | ucrt | libc++ |
34-
35-
[^1]: `MSYSTEM`
36-
[^2]: `MINGW_PACKAGE_PREFIX`
37-
38-
## Active environments
39-
40-
The package manager uses only environments that are configured under `/etc/pacman.conf`.
41-
You may add/uncomment/remove/comment those as needed:
42-
43-
```pkgconf
44-
# always include msys!
45-
[msys]
46-
Include = /etc/pacman.d/mirrorlist.msys
47-
48-
[mingw32]
49-
Include = /etc/pacman.d/mirrorlist.mingw
50-
51-
[mingw64]
52-
Include = /etc/pacman.d/mirrorlist.mingw
53-
54-
[ucrt64]
55-
Include = /etc/pacman.d/mirrorlist.mingw
56-
57-
[clang64]
58-
Include = /etc/pacman.d/mirrorlist.mingw
59-
60-
[clang32]
61-
Include = /etc/pacman.d/mirrorlist.mingw
62-
63-
#[clangarm64]
64-
#Include = /etc/pacman.d/mirrorlist.mingw
65-
```
66-
67-
For more details about how to install packages see ['Package Management'](package-management.md).
68-
69-
To launch an environment either use the wrapper executables like `ucrt64.exe` or
70-
call `msys2_shell.cmd` with either the matching parameter like `msys2_shell.cmd -clang64`
71-
or by setting `MSYSTEM`.
25+
| | Name | Prefix | Toolchain | Architecture | C Library | C++ Library |
26+
|----------------------------------------------------------|----------------|---------------|-----------|--------------|-----------|-------------|
27+
| ![msys](msys.png){: style="max-width:25px" } | **MSYS** | `/usr` | gcc | x86_64 | cygwin | libstdc++ |
28+
| ![mingw64](mingw64.png){: style="max-width:25px" } | **MINGW64** | `/mingw64` | gcc | x86_64 | msvcrt | libstdc++ |
29+
| ![ucrt64](ucrt64.png){: style="max-width:25px" } | **UCRT64** | `/ucrt64` | gcc | x86_64 | ucrt | libstdc++ |
30+
| ![clang64](clang64.png){: style="max-width:25px" } | **CLANG64** | `/clang64` | llvm | x86_64 | ucrt | libc++ |
31+
| ![mingw32](mingw32.png){: style="max-width:25px" } | **MINGW32** | `/mingw32` | gcc | i686 | msvcrt | libstdc++ |
32+
| ![clang32](clang32.png){: style="max-width:25px" } | **CLANG32** | `/clang32` | llvm | i686 | ucrt | libc++ |
33+
| ![clangarm64](clangarm64.png){: style="max-width:25px" } | **CLANGARM64** | `/clangarm64` | llvm | aarch64 | ucrt | libc++ |
34+
35+
The active environment is selected via the `MSYSTEM` environment variable.
36+
Setting `MSYSTEM` to `UCRT64` and starting a login shell will put you in that
37+
environment.
7238

7339
## GCC vs LLVM/Clang
7440

‎web/docs/package-naming.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Package Naming
2+
3+
| | Package prefix |
4+
|----------------------------------------------------------|----------------------------|
5+
| ![msys](msys.png){: style="max-width:25px" } | None |
6+
| ![mingw64](mingw64.png){: style="max-width:25px" } | `mingw-w64-x86_64-` |
7+
| ![ucrt64](ucrt64.png){: style="max-width:25px" } | `mingw-w64-ucrt-x86_64-` |
8+
| ![clang64](clang64.png){: style="max-width:25px" } | `mingw-w64-clang-x86_64-` |
9+
| ![mingw32](mingw32.png){: style="max-width:25px" } | `mingw-w64-i686-` |
10+
| ![clang32](clang32.png){: style="max-width:25px" } | `mingw-w64-clang-i686-` |
11+
| ![clangarm64](clangarm64.png){: style="max-width:25px" } | `mingw-w64-clang-aarch64-` |

‎web/docs/repos-mirrors.md‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Repositories and Mirrors
2+
3+
## Active environments
4+
5+
The package manager uses only environments that are configured under `/etc/pacman.conf`.
6+
You may add/uncomment/remove/comment those as needed:
7+
8+
```pkgconf
9+
# always include msys!
10+
[msys]
11+
Include = /etc/pacman.d/mirrorlist.msys
12+
13+
[mingw32]
14+
Include = /etc/pacman.d/mirrorlist.mingw
15+
16+
[mingw64]
17+
Include = /etc/pacman.d/mirrorlist.mingw
18+
19+
[ucrt64]
20+
Include = /etc/pacman.d/mirrorlist.mingw
21+
22+
[clang64]
23+
Include = /etc/pacman.d/mirrorlist.mingw
24+
25+
[clang32]
26+
Include = /etc/pacman.d/mirrorlist.mingw
27+
28+
#[clangarm64]
29+
#Include = /etc/pacman.d/mirrorlist.mingw
30+
```
31+
32+
For more details about how to install packages see ['Package Management'](package-management.md).
33+
34+
To launch an environment either use the wrapper executables like `ucrt64.exe` or
35+
call `msys2_shell.cmd` with either the matching parameter like `msys2_shell.cmd -clang64`
36+
or by setting `MSYSTEM`.

0 commit comments

Comments
 (0)