LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-08-15 16:30:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Meta: Re-bootstrap vcpkg when we update its version

Browse Source 
Fetching package versions that were shipped after vcpkg was last
bootstrapped requires re-bootstrapping vcpkg.
This commit is contained in:
Timothy Flynn 2024-06-22 11:52:25 -04:00 committed by Andreas Kling
parent a3c8e60710
commit 946a09d355
Notes: sideshowbarker 2024-07-17 02:39:10 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/946a09d355
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/249
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Meta/ladybird.sh
View File

@ -127,7 +127,6 @@ build_cmake() {
} }
build_vcpkg() { build_vcpkg() {
echo "Building vcpkg"
( cd "$LADYBIRD_SOURCE_DIR/Toolchain" && ./BuildVcpkg.sh ) ( cd "$LADYBIRD_SOURCE_DIR/Toolchain" && ./BuildVcpkg.sh )
} }
@ -136,10 +135,7 @@ ensure_toolchain() {
build_cmake build_cmake
fi fi
# FIXME: Add a version check if needed. build_vcpkg
if [ ! -x "${LADYBIRD_SOURCE_DIR}/Toolchain/Local/vcpkg/bin/vcpkg" ]; then
build_vcpkg
fi
} }
run_gdb() { run_gdb() {

12
Toolchain/BuildVcpkg.sh
View File

@ -26,7 +26,17 @@ PREFIX_DIR="$DIR/Local/vcpkg"
mkdir -p "$DIR/Tarballs" mkdir -p "$DIR/Tarballs"
pushd "$DIR/Tarballs" pushd "$DIR/Tarballs"
[ ! -d vcpkg ] && git clone $GIT_REPO if [[ ! -d vcpkg ]]; then
git clone "${GIT_REPO}"
else
bootstrapped_vcpkg_version=$(git -C vcpkg rev-parse HEAD)
if [[ "${bootstrapped_vcpkg_version}" == "${GIT_REV}" ]]; then
exit 0
fi
fi
echo "Building vcpkg"
cd vcpkg cd vcpkg
git fetch origin git fetch origin