savetemp

jcbhmr · web-flow · commit 602c49018df3 · 2025-01-08T23:19:05.000Z
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/cpp:ubuntu",
+    "image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-24.04",
     "features": {
         "ghcr.io/devcontainers/features/rust": {},
         "ghcr.io/devcontainers/features/python": {}
diff --git a/.devcontainer/updateContentCommand.sh b/.devcontainer/updateContentCommand.sh
@@ -4,16 +4,14 @@ set -ex
 cargo install mdbook
 cargo install mdbook-cmdrun mdbook-codename
 
-(
-    cd "$(mktemp -d)"
-    # wget doesn't work for some reason. 🤷‍♀️
-    curl -LO https://apt.kitware.com/kitware-archive.sh
-    chmod +x ./kitware-archive.sh
-    sudo ./kitware-archive.sh
-    rm -rf "$PWD"
-)
+curl https://apt.kitware.com/kitware-archive.sh | sudo sh
+sudo apt-get update
 sudo apt-get install -y cmake
 
+sudo apt-get update
+sudo apt-get install -y lsb-release wget software-properties-common gnupg
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" bash all
+
 sudo apt-get update
 sudo apt-get install -y clang-format
 
@@ -25,8 +23,11 @@ pipx install cmakelang
     cd cosmocc
     wget https://cosmo.zip/pub/cosmocc/cosmocc.zip
     unzip cosmocc.zip
+    echo 'export PATH="$PATH:$HOME/cosmocc/bin"' >> ~/.bashrc
     rm cosmocc.zip
 )
+# https://github.com/jart/cosmopolitan/issues/1325
+chmod +x ~/cosmocc/bin/cosmoranlib
 
 curl -sS https://webi.sh/zig | sh
 source ~/.config/envman/PATH.env
diff --git a/README.md b/README.md
@@ -26,6 +26,6 @@ To create a new example ("Cool feature" in this example):
 3. Create your example in `src/cool-feature/`. Add a bunch of comments _in the code files_ so that they are visible on the website and when viewing the file in an IDE.
 4. `{{#include filename.txt}}` any interesting files in `src/cool-feature/README.md`.
 5. Add any shell commands to interact with the example to the `src/cool-feature/README.md`. Make sure to document them.
-6. (Optional) Use `<!-- cmdrun cmake ... -->` or similar inside a `` ``` `` code block to run that command and use its output at build time.
+6. (Optional) Use `<!-- cmdrun cmake ... -->` or similar inside a `` ``` `` code block to run that command and use its output at build time. Remember to add `--fresh` and `--clean-first` to CMake commands so that the output is reproducable. Also add `exec 2>&1 && ...` so that stderr is redirected to stdout (which is what `mdbook-cmdrun` captures).
 7. Create a corresponding `.devcontainer/cool-feature/devcontainer.json` that will open the example's folder. Add any necessary dependencies to the dev container.
 8. Add an "Open in Codespaces" button to the `src/cool-feature/README.md`.
diff --git a/src/README.md b/src/README.md
@@ -4,4 +4,4 @@ CMake is an open source cross-platform meta build system that works on Windows,
 
 *CMake by Example* is a hands-on introduction to how to use CMake to build C/C++ projects using annotated example projects. Make sure you have [installed the latest version of CMake on your system](https://cmake.org/download/). Check out the first [Hello world](hello-world.md) example to get started.
 
-<!-- cmdrun grep '^- ' SUMMARY.md | sed 's/README\.md/index.html/' -->
+<!-- cmdrun exec 2>&1 && grep '^- ' SUMMARY.md | sed 's/README\.md/index.html/' -->
diff --git a/src/SUMMARY.md b/src/SUMMARY.md
@@ -16,7 +16,7 @@
 - [Arrays]()
 - [Functions]()
 - [Macros]()
-- [Set C/C++ standard]()
+- [Set C/C++ standard](set-c-cxx-standard/README.md)
 - [Toolchain files]()
 - [Custom targets]()
 - [Post-build commands]()
@@ -27,7 +27,6 @@
 - [Xrepo dependency]()
 - [Testing-only dependencies]()
 - [cosmocc toolchain](cosmocc-toolchain/README.md)
-- [Zig toolchain](zig-toolchain/README.md)
 - [Spawning processes]()
 - [HTTP requests]()
 - [String functions]()
diff --git a/src/cosmocc-toolchain/README.md b/src/cosmocc-toolchain/README.md
@@ -27,15 +27,15 @@ cmake --toolchain ./cmake/cosmocc.cmake -B ./build/
 ```
 
 ```
-<!-- cmdrun cmake --fresh --toolchain ./cmake/cosmocc.cmake -B ./build/ -->
+<!-- cmdrun exec 2>&1 && cmake --fresh --toolchain ./cmake/cosmocc.cmake -B ./build/ -->
 ```
 
 ```sh:
 cmake --build ./build/
 ```
 
 ```
-<!-- cmdrun cmake --build ./build/ --clean-first -->
+<!-- cmdrun exec 2>&1 && cmake --build ./build/ --clean-first -->
 ```
 
 <details>
@@ -45,7 +45,7 @@ cmake --build ./build/
 ```
 
 ```
-<!-- cmdrun ./build/cosmocc-toolchain -->
+<!-- cmdrun exec 2>&1 && ./build/cosmocc-toolchain -->
 ```
 
 </details>
diff --git a/src/cosmocc-toolchain/cmake/cosmocc.cmake b/src/cosmocc-toolchain/cmake/cosmocc.cmake
@@ -1,9 +1,16 @@
 set(CMAKE_SYSTEM_NAME Generic)
 unset(CMAKE_SYSTEM_PROCESSOR)
-set(CMAKE_ASM_COMPILER cosmocc)
-set(CMAKE_C_COMPILER cosmocc)
-set(CMAKE_CXX_COMPILER cosmoc++)
+
+set(CMAKE_ASM_COMPILER "cosmocc")
+
+set(CMAKE_C_COMPILER "cosmocc")
+
+set(CMAKE_CXX_COMPILER "cosmoc++")
+
+find_program(CMAKE_AR "cosmoar" REQUIRED)
+
+find_program(CMAKE_RANLIB "cosmoranlib" REQUIRED)
+
 set(CMAKE_USER_MAKE_RULES_OVERRIDE
     "${CMAKE_CURRENT_LIST_DIR}/cosmocc-override.cmake")
-find_program(CMAKE_AR cosmoar REQUIRED)
-find_program(CMAKE_RANLIB cosmoranlib REQUIRED)
+
diff --git a/src/hello-world/README.md b/src/hello-world/README.md
@@ -26,7 +26,7 @@ cmake -B ./build/
 ```
 
 ```
-<!-- cmdrun cmake --fresh -B ./build/ -->
+<!-- cmdrun exec 2>&1 && cmake --fresh -B ./build/ -->
 ```
 
 ```sh:
@@ -40,7 +40,7 @@ cmake --build ./build/
 ```
 
 ```
-<!-- cmdrun cmake --build ./build/ --clean-first -->
+<!-- cmdrun exec 2>&1 && cmake --build ./build/ --clean-first -->
 ```
 
 ```sh:
@@ -52,5 +52,5 @@ cmake --build ./build/
 ```
 
 ```
-<!-- cmdrun ./build/hello-world -->
+<!-- cmdrun exec 2>&1 && ./build/hello-world -->
 ```
diff --git a/src/logging/README.md b/src/logging/README.md
@@ -20,7 +20,7 @@ cmake -B ./build/
 ```
 
 ```
-<!-- cmdrun cmake --fresh -B ./build/ -->
+<!-- cmdrun exec 2>&1 && cmake --fresh -B ./build/ -->
 ```
 
 ```sh:
@@ -29,5 +29,5 @@ cmake --build ./build/
 ```
 
 ```
-<!-- cmdrun cmake --build ./build/ --clean-first -->
+<!-- cmdrun exec 2>&1 && cmake --build ./build/ --clean-first -->
 ```
diff --git a/src/scripts/README.md b/src/scripts/README.md
@@ -27,5 +27,5 @@ cmake -P ./cat.cmake ./raven.txt
 ```
 
 ```
-<!-- cmdrun ./cat.cmake ./raven.txt -->
+<!-- cmdrun exec 2>&1 && ./cat.cmake ./raven.txt -->
 ```
diff --git a/src/set-c-cxx-standard/CMakeLists.txt b/src/set-c-cxx-standard/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.30)
+
+project(set-c-cxx-standard)
+
+add_executable(main1 main1.c)
+target_compile_features(main1 PRIVATE c_std_23)
+
+add_executable(main2 main2.cpp)
+target_compile_features(main2 PRIVATE cxx_std_23)
diff --git a/src/set-c-cxx-standard/README.md b/src/set-c-cxx-standard/README.md
@@ -0,0 +1,47 @@
+# Set C/C++ standard
+
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/jcbhmr/cmakebyexample.jcbhmr.com?quickstart=1&devcontainer_path=.devcontainer%2Fset-c-cxx-standard%2Fdevcontainer.json)
+
+```c:main1.c
+{{#include main1.c}}
+```
+
+```cpp:main2.cpp
+{{#include main2.cpp}}
+```
+
+```cmake:CMakeLists.txt
+{{#include CMakeLists.txt}}
+```
+
+```sh:
+cmake -B ./build/
+```
+
+```
+<!-- cmdrun exec 2>&1 && cmake --fresh -B ./build/ -->
+```
+
+```sh:
+cmake --build ./build/
+```
+
+```
+<!-- cmdrun exec 2>&1 && cmake --build ./build/ --clean-first -->
+```
+
+```sh:
+./build/main1
+```
+
+```
+<!-- cmdrun exec 2>&1 && ./build/main1 -->
+```
+
+```sh:
+./build/main2
+```
+
+```
+<!-- cmdrun exec 2>&1 && ./build/main2 -->
+```
diff --git a/src/set-c-cxx-standard/cmake/clang-18.cmake b/src/set-c-cxx-standard/cmake/clang-18.cmake
@@ -0,0 +1,12 @@
+set(CMAKE_ASM_COMPILER "clang-18")
+
+set(CMAKE_C_COMPILER "clang-18")
+
+set(CMAKE_CXX_COMPILER "clang++-18")
+
+find_program(CMAKE_AR "llvm-ar-18" REQUIRED)
+
+find_program(CMAKE_RANLIB "llvm-ranlib-18" REQUIRED)
+
+string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++ -fuse-ld=lld")
+string(APPEND CMAKE_EXE_LINKER_FLAGS " -stdlib=libc++ -fuse-ld=lld")
diff --git a/src/set-c-cxx-standard/main1.c b/src/set-c-cxx-standard/main1.c
@@ -0,0 +1,8 @@
+#include <stddef.h>
+#include <stdio.h>
+
+int main() {
+    int *int_ptr;
+    printf("int_ptr == nullptr: %d\n", int_ptr == nullptr);
+    return 0;
+}
diff --git a/src/set-c-cxx-standard/main2.cpp b/src/set-c-cxx-standard/main2.cpp
@@ -0,0 +1,6 @@
+#include <print>
+ 
+int main() {
+    std::println("Hello, World!");
+    return 0;
+}
diff --git a/src/zig-toolchain/README.md.skip b/src/zig-toolchain/README.md.skip
@@ -1,9 +1,15 @@
+<!--
+The "zig cc" C/C++ Clang toolchain doesn't work with CMake right now.
+https://github.com/ziglang/zig/issues/20709
+https://github.com/ziglang/zig/issues/22269
+-->
+
 # Zig toolchain
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/jcbhmr/cmakebyexample.jcbhmr.com?quickstart=1&devcontainer_path=.devcontainer%2Fzig-toolchain%2Fdevcontainer.json)
 
 ```cmake:cmake/zig-x86_64-linux-musl.cmake
-{{#include cmake/cosmocc.cmake}}
+{{#include cmake/zig-x86_64-linux-musl.cmake}}
 ```
 
 <details>
@@ -23,15 +29,15 @@ cmake --toolchain ./cmake/zig-x86_64-linux-musl.cmake -B ./build/
 ```
 
 ```
-<!-- cmdrun cmake --fresh --toolchain ./cmake/zig-x86_64-linux-musl.cmake -B ./build/ -->
+<!-- cmdrun exec 2>&1 && cmake --fresh --toolchain ./cmake/zig-x86_64-linux-musl.cmake -B ./build/ -->
 ```
 
 ```sh:
 cmake --build ./build/
 ```
 
 ```
-<!-- cmdrun cmake --build ./build/ --clean-first -->
+<!-- cmdrun exec 2>&1 && cmake --build ./build/ --clean-first -->
 ```
 
 <details>
@@ -41,7 +47,7 @@ cmake --build ./build/
 ```
 
 ```
-<!-- cmdrun ./build/zig-toolchain -->
+<!-- cmdrun exec 2>&1 && ./build/zig-toolchain -->
 ```
 
 </details>
diff --git a/src/zig-toolchain/cmake/zig-ar b/src/zig-toolchain/cmake/zig-ar
diff --git a/src/zig-toolchain/cmake/zig-ranlib b/src/zig-toolchain/cmake/zig-ranlib
diff --git a/src/zig-toolchain/main.c b/src/zig-toolchain/main.c
@@ -8,5 +8,14 @@ int main() {
     #else
         puts("This is some other architecture");
     #endif
+
+    #if defined(_WIN32) || defined(_WIN64)
+        puts("You're on Windows");
+    #elif defined(__unix__)
+        puts("You're on Linux");
+    #else
+        puts("Not Windows or Linux");
+    #endif
+
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "image": "mcr.microsoft.com/devcontainers/cpp:ubuntu",`
	`2`	`+ "image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-24.04",`
`3`	`3`	`"features": {`
`4`	`4`	`"ghcr.io/devcontainers/features/rust": {},`
`5`	`5`	`"ghcr.io/devcontainers/features/python": {}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ CMake is an open source cross-platform meta build system that works on Windows,`
`4`	`4`
`5`	`5`	`CMake by Example is a hands-on introduction to how to use CMake to build C/C++ projects using annotated example projects. Make sure you have [installed the latest version of CMake on your system](https://cmake.org/download/). Check out the first [Hello world](hello-world.md) example to get started.`
`6`	`6`
`7`		`-<!-- cmdrun grep '^- ' SUMMARY.md \| sed 's/README\.md/index.html/' -->`
	`7`	`+<!-- cmdrun exec 2>&1 && grep '^- ' SUMMARY.md \| sed 's/README\.md/index.html/' -->`