From b1d708dd16a1e648992b34ed8091b242be0d3299 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 20 Apr 2026 10:25:21 -0400 Subject: [PATCH] Meta: Move BuildVcpkg script to the Meta directory It was the only thing left in the Toolchain directory. --- .github/actions/setup/action.yml | 2 +- Toolchain/BuildVcpkg.py => Meta/build_vcpkg.py | 0 Meta/ladybird.py | 2 +- Toolchain/.dockerignore | 1 - Toolchain/.gitignore | 5 ----- 5 files changed, 2 insertions(+), 8 deletions(-) rename Toolchain/BuildVcpkg.py => Meta/build_vcpkg.py (100%) delete mode 100644 Toolchain/.dockerignore delete mode 100644 Toolchain/.gitignore diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index b014ae43ba..e1335b5ff0 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -223,7 +223,7 @@ runs: - name: 'Install vcpkg' if: ${{ inputs.type == 'build' }} shell: bash - run: ./Toolchain/BuildVcpkg.py + run: ./Meta/build_vcpkg.py - name: 'Export installed versions' id: 'export-versions' diff --git a/Toolchain/BuildVcpkg.py b/Meta/build_vcpkg.py similarity index 100% rename from Toolchain/BuildVcpkg.py rename to Meta/build_vcpkg.py diff --git a/Meta/ladybird.py b/Meta/ladybird.py index cabdb5babd..d82049e527 100755 --- a/Meta/ladybird.py +++ b/Meta/ladybird.py @@ -17,12 +17,12 @@ from typing import Optional sys.path.append(str(Path(__file__).resolve().parent.parent)) +from Meta.build_vcpkg import build_vcpkg from Meta.find_compiler import pick_host_compiler from Meta.host_platform import HostArchitecture from Meta.host_platform import HostSystem from Meta.host_platform import Platform from Meta.utils import run_command -from Toolchain.BuildVcpkg import build_vcpkg def main(): diff --git a/Toolchain/.dockerignore b/Toolchain/.dockerignore deleted file mode 100644 index 72e8ffc0db..0000000000 --- a/Toolchain/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/Toolchain/.gitignore b/Toolchain/.gitignore deleted file mode 100644 index b4441196e5..0000000000 --- a/Toolchain/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Created by QEMU build -config-temp -config.log -# For caching the entire toolchain (useful on Travis) -Cache/