From 5ff80b60cf279433ed64b59a3e34c93268d1e01c Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Mon, 12 Jun 2023 10:23:56 +0200 Subject: [PATCH] Meta: Rename `BuildIt.sh` to `BuildGNU.sh` Bring it in line with `Toolchain/BuildClang.sh`. --- .github/workflows/cmake.yml | 6 +++--- .github/workflows/pvs-studio-static-analysis.yml | 6 +++--- .github/workflows/sonar-cloud-static-analysis.yml | 6 +++--- Documentation/CLionConfiguration.md | 2 +- Meta/Azure/Caches.yml | 2 +- Meta/serenity.sh | 2 +- Toolchain/{BuildIt.sh => BuildGNU.sh} | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename Toolchain/{BuildIt.sh => BuildGNU.sh} (99%) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 4368f5995a2..4f3fdf2567e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -87,8 +87,8 @@ jobs: # *and* as actual output variable, in this order. message(" set-output name=time::${current_date}") message("::set-output name=time::${current_date}") - message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildIt.sh') }}") - message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildIt.sh') }}") + message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildGNU.sh') }}") + message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildGNU.sh') }}") - name: Toolchain cache uses: actions/cache/restore@v3 @@ -102,7 +102,7 @@ jobs: - name: Build toolchain if: ${{ !steps.toolchain-cache.outputs.cache-hit }} - run: ARCH="${{ matrix.arch }}" ${{ github.workspace }}/Toolchain/BuildIt.sh + run: ARCH="${{ matrix.arch }}" ${{ github.workspace }}/Toolchain/BuildGNU.sh - name: Update toolchain cache uses: actions/cache/save@v3 diff --git a/.github/workflows/pvs-studio-static-analysis.yml b/.github/workflows/pvs-studio-static-analysis.yml index 148b68a7477..affdb19536b 100644 --- a/.github/workflows/pvs-studio-static-analysis.yml +++ b/.github/workflows/pvs-studio-static-analysis.yml @@ -42,8 +42,8 @@ jobs: # *and* as actual output variable, in this order. message(" set-output name=time::${current_date}") message("::set-output name=time::${current_date}") - message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildIt.sh') }}") - message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildIt.sh') }}") + message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildGNU.sh') }}") + message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildGNU.sh') }}") - name: Toolchain cache # This job should always read the cache, never populate it. @@ -58,7 +58,7 @@ jobs: - name: Build toolchain if: ${{ !steps.toolchain-cache.outputs.cache-hit }} - run: ARCH="${{ env.PVS_STUDIO_ANALYSIS_ARCH }}" ${{ github.workspace }}/Toolchain/BuildIt.sh + run: ARCH="${{ env.PVS_STUDIO_ANALYSIS_ARCH }}" ${{ github.workspace }}/Toolchain/BuildGNU.sh - name: Create build directory run: | diff --git a/.github/workflows/sonar-cloud-static-analysis.yml b/.github/workflows/sonar-cloud-static-analysis.yml index a8e575a433e..84e6929fa90 100644 --- a/.github/workflows/sonar-cloud-static-analysis.yml +++ b/.github/workflows/sonar-cloud-static-analysis.yml @@ -74,8 +74,8 @@ jobs: # *and* as actual output variable, in this order. message(" set-output name=time::${current_date}") message("::set-output name=time::${current_date}") - message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildIt.sh') }}") - message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildIt.sh') }}") + message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildGNU.sh') }}") + message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/Patches/gcc/*.patch', 'Toolchain/BuildGNU.sh') }}") - name: Toolchain cache # This job should always read the cache, never populate it. @@ -90,7 +90,7 @@ jobs: - name: Build toolchain if: ${{ !steps.toolchain-cache.outputs.cache-hit }} - run: ARCH="${{ env.SONAR_ANALYSIS_ARCH }}" ${{ github.workspace }}/Toolchain/BuildIt.sh + run: ARCH="${{ env.SONAR_ANALYSIS_ARCH }}" ${{ github.workspace }}/Toolchain/BuildGNU.sh - name: Create build directory run: | diff --git a/Documentation/CLionConfiguration.md b/Documentation/CLionConfiguration.md index 30f0f46e2c4..2e9234afc4e 100644 --- a/Documentation/CLionConfiguration.md +++ b/Documentation/CLionConfiguration.md @@ -24,7 +24,7 @@ After opening the `serenity` repository in CLion as a new project, the "`Open Pr `Build Directory`: `Build/x86_64` -> _If you have not built the Toolchain at this point, please do so: `./Toolchain/BuildIt.sh`_ +> _If you have not built the Toolchain at this point, please do so: `./Toolchain/BuildGNU.sh`_ > _If you have not built host tools from Lagom at this point, please do so: `./Meta/serenity.sh build` or `ninja -C Build/superbuild-x86_64` after running `cmake -GNinja -S Meta/CMake/Superbuild -B Build/superbuild-x86_64`_ diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml index 2d9fad93805..bc8f76e2547 100644 --- a/Meta/Azure/Caches.yml +++ b/Meta/Azure/Caches.yml @@ -26,7 +26,7 @@ steps: - ${{ if eq(parameters.toolchain, 'gcc') }}: - task: Cache@2 inputs: - key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/binutils/*.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h' + key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildGNU.sh | Toolchain/Patches/binutils/*.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h' path: $(Build.SourcesDirectory)/Toolchain/Cache displayName: 'Toolchain Prebuilt Cache' diff --git a/Meta/serenity.sh b/Meta/serenity.sh index a81fcaec40f..d1611161a72 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -306,7 +306,7 @@ build_toolchain() { if [ "$TOOLCHAIN_TYPE" = "Clang" ]; then ( cd "$SERENITY_SOURCE_DIR/Toolchain" && ./BuildClang.sh ) else - ( cd "$SERENITY_SOURCE_DIR/Toolchain" && ARCH="$TARGET" ./BuildIt.sh ) + ( cd "$SERENITY_SOURCE_DIR/Toolchain" && ARCH="$TARGET" ./BuildGNU.sh ) fi } diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildGNU.sh similarity index 99% rename from Toolchain/BuildIt.sh rename to Toolchain/BuildGNU.sh index b8fcf2ff2bd..339a06ad3cb 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildGNU.sh @@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # shellcheck source=/dev/null . "${DIR}/../Meta/shell_include.sh" -exit_if_running_as_root "Do not run BuildIt.sh as root, your Build directory will become root-owned" +exit_if_running_as_root "Do not run BuildGNU.sh as root, your Build directory will become root-owned" echo "$DIR"