From 7dcc938bdc9b26a2e9b861940f70d0e17d3c9921 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Fri, 19 Jul 2024 00:58:21 +0200 Subject: [PATCH] docs/config-prereqs.txt: update MacOS build agent setup [#2522] Signed-off-by: Jim Klimov --- docs/config-prereqs.txt | 19 ++++++++++++++----- docs/nut.dict | 4 +++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/docs/config-prereqs.txt b/docs/config-prereqs.txt index 2a1a450137..8f6de45016 100644 --- a/docs/config-prereqs.txt +++ b/docs/config-prereqs.txt @@ -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 diff --git a/docs/nut.dict b/docs/nut.dict index d5661d3895..e4e92d8c09 100644 --- a/docs/nut.dict +++ b/docs/nut.dict @@ -1,4 +1,4 @@ -personal_ws-1.1 en 3191 utf-8 +personal_ws-1.1 en 3194 utf-8 AAC AAS ABI @@ -207,6 +207,7 @@ CodingStyle Collver Colombier Comfo +CommandLineTools ConfigVoltage ConnectUPS Corbelli @@ -1363,6 +1364,7 @@ Wrede XAU XC XCP +XCode XLA XOFF XON