From 5c835157c64970303f3116b45ae1b1a309fbffa8 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Mon, 20 Apr 2026 21:59:33 -0600 Subject: [PATCH] Documentation+Meta: Remove references to nonexistent Toolchain directory After b1d708dd16a1e648992b34ed8091b242be0d3299, the Toolchain directory was removed from the repository. Some documentation and scripts still referenced it, so this commit removes those references. The only remaining references are in the gitignore file, to prevent bisections from being polluted by the presence of a Toolchain directory in the working copy. --- .devcontainer/devcontainer.json | 6 ------ .devcontainer/features/vcpkg-cache/install.sh | 2 +- Documentation/BuildInstructionsLadybird.md | 2 +- Documentation/EditorConfiguration/VSCodeConfiguration.md | 6 ------ Meta/ladybird.py | 1 - Meta/refresh-ladybird-qtcreator.sh | 1 - 6 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 62bef1de12..da96ea93b2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -47,16 +47,10 @@ // Excluding the generated directories keeps your file view clean and speeds up search. "files.exclude": { "**/.git": true, - "Toolchain/Local/**": true, - "Toolchain/Tarballs/**": true, - "Toolchain/Build/**": true, "Build/**": true }, "search.exclude": { "**/.git": true, - "Toolchain/Local/**": true, - "Toolchain/Tarballs/**": true, - "Toolchain/Build/**": true, "Build/**": true }, // Tab settings diff --git a/.devcontainer/features/vcpkg-cache/install.sh b/.devcontainer/features/vcpkg-cache/install.sh index 2bb7debef4..68932a0449 100644 --- a/.devcontainer/features/vcpkg-cache/install.sh +++ b/.devcontainer/features/vcpkg-cache/install.sh @@ -27,7 +27,7 @@ mkdir -p ${CACHE_DIR} git clone https://github.com/LadybirdBrowser/ladybird.git --depth 1 cd ladybird # Grab and bootstrap the exact commit of vcpkg that trunk is using -python3 ./Toolchain/BuildVcpkg.py +python3 ./Meta/build_vcpkg.py # Install the vcpkg.json in manifest mode from the root of the repo # Set the binary cache directory to the one we intend to use at container runtime diff --git a/Documentation/BuildInstructionsLadybird.md b/Documentation/BuildInstructionsLadybird.md index 4fdc782688..125f9b4da6 100644 --- a/Documentation/BuildInstructionsLadybird.md +++ b/Documentation/BuildInstructionsLadybird.md @@ -300,7 +300,7 @@ error: building skia:x64-linux failed with: BUILD_FAILED Elapsed time to handle skia:x64-linux: 1.6 s -- Running vcpkg install - failed -CMake Error at Toolchain/Tarballs/vcpkg/scripts/buildsystems/vcpkg.cmake:899 (message): +CMake Error at Build/vcpkg/scripts/buildsystems/vcpkg.cmake:899 (message): vcpkg install failed. See logs for more information: Build/release/vcpkg-manifest-install.log Call Stack (most recent call first): diff --git a/Documentation/EditorConfiguration/VSCodeConfiguration.md b/Documentation/EditorConfiguration/VSCodeConfiguration.md index ba17c829fa..6fc4537a72 100644 --- a/Documentation/EditorConfiguration/VSCodeConfiguration.md +++ b/Documentation/EditorConfiguration/VSCodeConfiguration.md @@ -102,16 +102,10 @@ These belong in the `.vscode/settings.json` of Ladybird. // Excluding the generated directories keeps your file view clean and speeds up search. "files.exclude": { "**/.git": true, - "Toolchain/Local/**": true, - "Toolchain/Tarballs/**": true, - "Toolchain/Build/**": true, "Build/**": true, }, "search.exclude": { "**/.git": true, - "Toolchain/Local/**": true, - "Toolchain/Tarballs/**": true, - "Toolchain/Build/**": true, "Build/**": true, }, // Force clang-format to respect Ladybird's .clang-format style file. This is not necessary if you're not using the Microsoft C++ extension. diff --git a/Meta/ladybird.py b/Meta/ladybird.py index 2c689bc73d..f25b353437 100755 --- a/Meta/ladybird.py +++ b/Meta/ladybird.py @@ -295,7 +295,6 @@ def configure_build_env(platform: Platform, preset: str) -> tuple[Path, Path]: sys.exit(1) vcpkg_root = str(build_root_dir / "vcpkg") - os.environ["PATH"] += os.pathsep + str(ladybird_source_dir.joinpath("Toolchain", "Local", "cmake", "bin")) os.environ["PATH"] += os.pathsep + vcpkg_root os.environ["VCPKG_ROOT"] = vcpkg_root if platform.host_architecture == HostArchitecture.riscv64: diff --git a/Meta/refresh-ladybird-qtcreator.sh b/Meta/refresh-ladybird-qtcreator.sh index 5ad7bc04c7..5d45b6db4f 100755 --- a/Meta/refresh-ladybird-qtcreator.sh +++ b/Meta/refresh-ladybird-qtcreator.sh @@ -16,7 +16,6 @@ find . \( \ -o -name Patches \ -o -name Ports \ -o -name Root \ - -o -name Toolchain \ -o -name Build \ \) -prune \ -o \( \