Skip to content

Commit 13e2ef1

Browse files
authored
devops: suppport WK_CHECKOUT_PATH variable (#4617)
`WK_CHECKOUT_PATH` defines location of webkit checkout on the file system. All browser-related scripts, like `prepare_checkout.sh` and `export.sh` respect this environment variable on all platforms.
1 parent 71b7b48 commit 13e2ef1

File tree

6 files changed

+34
-8
lines changed

6 files changed

+34
-8
lines changed

browser_patches/export.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
6161
EXPORT_PATH="$PWD/webkit"
6262
BUILD_NUMBER_UPSTREAM_URL="https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/webkit/BUILD_NUMBER"
6363
source "./webkit/UPSTREAM_CONFIG.sh"
64+
if [[ ! -z "${WK_CHECKOUT_PATH}" ]]; then
65+
echo "WARNING: using checkout path from WK_CHECKOUT_PATH env: ${WK_CHECKOUT_PATH}"
66+
CHECKOUT_PATH="${WK_CHECKOUT_PATH}"
67+
FRIENDLY_CHECKOUT_PATH="<WK_CHECKOUT_PATH>"
68+
fi
6469
else
6570
echo ERROR: unknown browser to export - "$1"
6671
exit 1

browser_patches/prepare_checkout.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
6161
WEBKIT_EXTRA_FOLDER_PATH="$PWD/webkit/embedder/Playwright"
6262
BUILD_NUMBER=$(head -1 "$PWD/webkit/BUILD_NUMBER")
6363
source "./webkit/UPSTREAM_CONFIG.sh"
64+
if [[ ! -z "${WK_CHECKOUT_PATH}" ]]; then
65+
echo "WARNING: using checkout path from WK_CHECKOUT_PATH env: ${WK_CHECKOUT_PATH}"
66+
CHECKOUT_PATH="${WK_CHECKOUT_PATH}"
67+
FRIENDLY_CHECKOUT_PATH="<WK_CHECKOUT_PATH>"
68+
fi
6469
else
6570
echo ERROR: unknown browser - "$1"
6671
exit 1

browser_patches/webkit/archive.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ if ! [[ -d $(dirname $ZIP_PATH) ]]; then
2929
fi
3030

3131
main() {
32-
cd checkout
32+
if [[ ! -z "${WK_CHECKOUT_PATH}" ]]; then
33+
cd "${WK_CHECKOUT_PATH}"
34+
echo "WARNING: checkout path from WK_CHECKOUT_PATH env: ${WK_CHECKOUT_PATH}"
35+
else
36+
cd "checkout"
37+
fi
3338

3439
set -x
3540
if [[ "$(uname)" == "Darwin" ]]; then

browser_patches/webkit/build.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,16 @@ ensure_linux_deps() {
3434
yes | DEBIAN_FRONTEND=noninteractive WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK ./Tools/Scripts/update-webkitgtk-libs
3535
}
3636

37-
if [[ "$(uname)" == "Darwin" ]]; then
37+
if [[ ! -z "${WK_CHECKOUT_PATH}" ]]; then
38+
cd "${WK_CHECKOUT_PATH}"
39+
echo "WARNING: checkout path from WK_CHECKOUT_PATH env: ${WK_CHECKOUT_PATH}"
40+
else
3841
cd "checkout"
42+
fi
43+
44+
if [[ "$(uname)" == "Darwin" ]]; then
3945
./Tools/Scripts/build-webkit --release --touch-events --orientation-events
4046
elif [[ "$(uname)" == "Linux" ]]; then
41-
cd "checkout"
4247
if [[ $# == 0 || (-z "$1") ]]; then
4348
echo
4449
echo BUILDING: GTK and WPE

browser_patches/webkit/buildwin.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set PATH=%WEBKIT_BUILD_PATH%
2-
set WEBKIT_LIBRARIES=%~dp0checkout\WebKitLibraries\win
3-
set WEBKIT_OUTPUTDIR=%~dp0checkout\WebKitBuild
4-
perl %~dp0checkout\Tools\Scripts\build-webkit --wincairo --release --no-ninja --touch-events --orientation-events --dark-mode-css --generate-project-only --cmakeargs="-DLIBVPX_PACKAGE_PATH=C:\vcpkg\packages\libvpx_x64-windows"
5-
%DEVENV% %~dp0checkout\WebKitBuild\Release\WebKit.sln /build "Release|x64"
2+
set WEBKIT_LIBRARIES=%~dp0WebKitLibraries\win
3+
set WEBKIT_OUTPUTDIR=%~dp0WebKitBuild
4+
perl %~dp0Tools\Scripts\build-webkit --wincairo --release --no-ninja --touch-events --orientation-events --dark-mode-css --generate-project-only --cmakeargs="-DLIBVPX_PACKAGE_PATH=C:\vcpkg\packages\libvpx_x64-windows"
5+
%DEVENV% %~dp0WebKitBuild\Release\WebKit.sln /build "Release|x64"

browser_patches/webkit/clean.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ set +x
44

55
trap "cd $(pwd -P)" EXIT
66
cd "$(dirname $0)"
7-
cd "checkout"
7+
8+
if [[ ! -z "${WK_CHECKOUT_PATH}" ]]; then
9+
cd "${WK_CHECKOUT_PATH}"
10+
echo "WARNING: checkout path from WK_CHECKOUT_PATH env: ${WK_CHECKOUT_PATH}"
11+
else
12+
cd "checkout"
13+
fi
814

915
if [[ -d ./WebKitBuild ]]; then
1016
rm -rf ./WebKitBuild/Release

0 commit comments

Comments
 (0)