File tree Expand file tree Collapse file tree 6 files changed +34
-8
lines changed Expand file tree Collapse file tree 6 files changed +34
-8
lines changed Original file line number Diff line number Diff line change @@ -61,6 +61,11 @@ elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
61
61
EXPORT_PATH=" $PWD /webkit"
62
62
BUILD_NUMBER_UPSTREAM_URL=" https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/webkit/BUILD_NUMBER"
63
63
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
64
69
else
65
70
echo ERROR: unknown browser to export - " $1 "
66
71
exit 1
Original file line number Diff line number Diff line change @@ -61,6 +61,11 @@ elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
61
61
WEBKIT_EXTRA_FOLDER_PATH=" $PWD /webkit/embedder/Playwright"
62
62
BUILD_NUMBER=$( head -1 " $PWD /webkit/BUILD_NUMBER" )
63
63
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
64
69
else
65
70
echo ERROR: unknown browser - " $1 "
66
71
exit 1
Original file line number Diff line number Diff line change @@ -29,7 +29,12 @@ if ! [[ -d $(dirname $ZIP_PATH) ]]; then
29
29
fi
30
30
31
31
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
33
38
34
39
set -x
35
40
if [[ " $( uname) " == " Darwin" ]]; then
Original file line number Diff line number Diff line change @@ -34,11 +34,16 @@ ensure_linux_deps() {
34
34
yes | DEBIAN_FRONTEND=noninteractive WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$( pwd) /WebKitBuild/GTK ./Tools/Scripts/update-webkitgtk-libs
35
35
}
36
36
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
38
41
cd " checkout"
42
+ fi
43
+
44
+ if [[ " $( uname) " == " Darwin" ]]; then
39
45
./Tools/Scripts/build-webkit --release --touch-events --orientation-events
40
46
elif [[ " $( uname) " == " Linux" ]]; then
41
- cd " checkout"
42
47
if [[ $# == 0 || (-z " $1 " ) ]]; then
43
48
echo
44
49
echo BUILDING: GTK and WPE
Original file line number Diff line number Diff line change 1
1
set PATH = %WEBKIT_BUILD_PATH%
2
- set WEBKIT_LIBRARIES = %~dp0 checkout\WebKitLibraries \win
3
- set WEBKIT_OUTPUTDIR = %~dp0 checkout\WebKitBuild
4
- perl %~dp0 checkout\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% %~dp0 checkout\WebKitBuild \Release\WebKit.sln /build " Release|x64"
2
+ set WEBKIT_LIBRARIES = %~dp0 WebKitLibraries \win
3
+ set WEBKIT_OUTPUTDIR = %~dp0 WebKitBuild
4
+ perl %~dp0 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% %~dp0 WebKitBuild \Release\WebKit.sln /build " Release|x64"
Original file line number Diff line number Diff line change 4
4
5
5
trap " cd $( pwd -P) " EXIT
6
6
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
8
14
9
15
if [[ -d ./WebKitBuild ]]; then
10
16
rm -rf ./WebKitBuild/Release
You can’t perform that action at this time.
0 commit comments