Meta: Rename BuildIt.sh to BuildGNU.sh

Bring it in line with `Toolchain/BuildClang.sh`.
This commit is contained in:
Jelle Raaijmakers 2023-06-12 10:23:56 +02:00 committed by Tim Flynn
parent 867e04768e
commit 5ff80b60cf
Notes: sideshowbarker 2024-07-17 04:49:48 +09:00
7 changed files with 13 additions and 13 deletions

View file

@ -87,8 +87,8 @@ jobs:
# *and* as actual output variable, in this order. # *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=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/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/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') }}")
- name: Toolchain cache - name: Toolchain cache
uses: actions/cache/restore@v3 uses: actions/cache/restore@v3
@ -102,7 +102,7 @@ jobs:
- name: Build toolchain - name: Build toolchain
if: ${{ !steps.toolchain-cache.outputs.cache-hit }} 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 - name: Update toolchain cache
uses: actions/cache/save@v3 uses: actions/cache/save@v3

View file

@ -42,8 +42,8 @@ jobs:
# *and* as actual output variable, in this order. # *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=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/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/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') }}")
- name: Toolchain cache - name: Toolchain cache
# This job should always read the cache, never populate it. # This job should always read the cache, never populate it.
@ -58,7 +58,7 @@ jobs:
- name: Build toolchain - name: Build toolchain
if: ${{ !steps.toolchain-cache.outputs.cache-hit }} 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 - name: Create build directory
run: | run: |

View file

@ -74,8 +74,8 @@ jobs:
# *and* as actual output variable, in this order. # *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=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/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/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') }}")
- name: Toolchain cache - name: Toolchain cache
# This job should always read the cache, never populate it. # This job should always read the cache, never populate it.
@ -90,7 +90,7 @@ jobs:
- name: Build toolchain - name: Build toolchain
if: ${{ !steps.toolchain-cache.outputs.cache-hit }} 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 - name: Create build directory
run: | run: |

View file

@ -24,7 +24,7 @@ After opening the `serenity` repository in CLion as a new project, the "`Open Pr
`Build Directory`: `Build/x86_64` `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`_ > _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`_

View file

@ -26,7 +26,7 @@ steps:
- ${{ if eq(parameters.toolchain, 'gcc') }}: - ${{ if eq(parameters.toolchain, 'gcc') }}:
- task: Cache@2 - task: Cache@2
inputs: 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 path: $(Build.SourcesDirectory)/Toolchain/Cache
displayName: 'Toolchain Prebuilt Cache' displayName: 'Toolchain Prebuilt Cache'

View file

@ -306,7 +306,7 @@ build_toolchain() {
if [ "$TOOLCHAIN_TYPE" = "Clang" ]; then if [ "$TOOLCHAIN_TYPE" = "Clang" ]; then
( cd "$SERENITY_SOURCE_DIR/Toolchain" && ./BuildClang.sh ) ( cd "$SERENITY_SOURCE_DIR/Toolchain" && ./BuildClang.sh )
else else
( cd "$SERENITY_SOURCE_DIR/Toolchain" && ARCH="$TARGET" ./BuildIt.sh ) ( cd "$SERENITY_SOURCE_DIR/Toolchain" && ARCH="$TARGET" ./BuildGNU.sh )
fi fi
} }

View file

@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "${DIR}/../Meta/shell_include.sh" . "${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" echo "$DIR"