Skip to content

Commit

Permalink
docs/config-prereqs.txt: update MacOS build agent setup [networkupsto…
Browse files Browse the repository at this point in the history
…ols#2522]

Signed-off-by: Jim Klimov <[email protected]>
  • Loading branch information
jimklimov committed Jul 19, 2024
1 parent cfe4985 commit 7dcc938
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
19 changes: 14 additions & 5 deletions docs/config-prereqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1400,11 +1400,20 @@ Alternatively, to prepare building sessions with `ci_build.sh` you can:

NOTE: For Jenkins agents, also need to `brew install --cask temurin@21`
for JRE/JDK 21. Java 17 or 21 (an LTS) is required to run Jenkins agents
after summer 2024. Note that you would have to create symbolic links to
e.g. `clang-14` and `clang++-14` in both `/usr/local/bin` (pointing to
`/bin/clang(++)` and in the `ccache` location prepared above (pointing
to `../bin/ccache`). Apparently that is the only compiler available;
various names of `gcc*` are symlinks to the same binary.
after summer 2024.

Note that you would have to create symbolic links to version-numbered names
of compilers, e.g. `clang-14` and `clang++-14` in both `/usr/local/bin`
(pointing to `/bin/clang(++)` and in the `ccache` location prepared above
(pointing to `../bin/ccache`), and repeat that in locations prepared by
XCode installation such as `/Library/Developer/CommandLineTools/usr/bin/`
and `/usr/local/Homebrew/Library/Homebrew/shims/mac/super/` just as
`ln -s clang{,-14} ; ln -s clang++{,-14}`. Apparently `clang` is the
only compiler available; various names of `gcc*` are links to the same
binaries.

WARNING: Take care to *NOT* symlink a `clang-cpp(-14)` which is not a
name recognized by XCode dispatcher program, so requests to it freeze.


Windows builds
Expand Down
4 changes: 3 additions & 1 deletion docs/nut.dict
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
personal_ws-1.1 en 3191 utf-8
personal_ws-1.1 en 3194 utf-8
AAC
AAS
ABI
Expand Down Expand Up @@ -207,6 +207,7 @@ CodingStyle
Collver
Colombier
Comfo
CommandLineTools
ConfigVoltage
ConnectUPS
Corbelli
Expand Down Expand Up @@ -1363,6 +1364,7 @@ Wrede
XAU
XC
XCP
XCode
XLA
XOFF
XON
Expand Down

0 comments on commit 7dcc938

Please sign in to comment.