Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(scripts): do not depend on env in pw_run.sh for debug builds

Browse source
This commit is contained in:
Yury Semikhatsky 2019-12-23 15:27:23 -08:00
parent 659a30e627
commit 9a33222eb1
3 changed files with 55 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
browser_patches/webkit/build.sh
View file

@ -6,19 +6,14 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
cd "checkout" cd "checkout"
BUILD_TYPE=--release
if [[ -v WKDEBUG ]]; then
BUILD_TYPE=--debug
fi
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
./Tools/Scripts/build-webkit $BUILD_TYPE --touch-events ./Tools/Scripts/build-webkit --release --touch-events
elif [[ "$(uname)" == "Linux" ]]; then elif [[ "$(uname)" == "Linux" ]]; then
# Check that WebKitBuild exists and is not empty. # Check that WebKitBuild exists and is not empty.
if ! [[ (-d ./WebKitBuild) && (-n $(ls -1 ./WebKitBuild/)) ]]; then if ! [[ (-d ./WebKitBuild) && (-n $(ls -1 ./WebKitBuild/)) ]]; then
yes | DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs yes | DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs
fi fi
./Tools/Scripts/build-webkit --gtk $BUILD_TYPE --touch-events MiniBrowser ./Tools/Scripts/build-webkit --gtk --release --touch-events MiniBrowser
else else
echo "ERROR: cannot upload on this platform!" 1>&2 echo "ERROR: cannot upload on this platform!" 1>&2
exit 1; exit 1;

21
browser_patches/webkit/pw_run.sh
View file

@ -1,18 +1,13 @@
#!/bin/bash #!/bin/bash
BUILD_TYPE=Release
if [[ -v WKDEBUG ]]; then
BUILD_TYPE=Debug
fi
function runOSX() { function runOSX() {
# if script is run as-is # if script is run as-is
if [ -d $SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE/MiniBrowser.app ]; then if [ -d $SCRIPT_PATH/checkout/WebKitBuild/Release/MiniBrowser.app ]; then
DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE" DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/Release"
elif [ -d $SCRIPT_PATH/MiniBrowser.app ]; then elif [ -d $SCRIPT_PATH/MiniBrowser.app ]; then
DYLIB_PATH="$SCRIPT_PATH" DYLIB_PATH="$SCRIPT_PATH"
elif [ -d $SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/MiniBrowser.app ]; then elif [ -d $SCRIPT_PATH/WebKitBuild/Release/MiniBrowser.app ]; then
DYLIB_PATH="$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE" DYLIB_PATH="$SCRIPT_PATH/WebKitBuild/Release"
else else
echo "Cannot find a MiniBrowser.app in neither location" 1>&2 echo "Cannot find a MiniBrowser.app in neither location" 1>&2
exit 1 exit 1
@ -24,14 +19,14 @@ function runOSX() {
function runLinux() { function runLinux() {
# if script is run as-is # if script is run as-is
if [ -d $SCRIPT_PATH/checkout/WebKitBuild ]; then if [ -d $SCRIPT_PATH/checkout/WebKitBuild ]; then
LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE/bin" LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/Release/bin"
MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE/bin/MiniBrowser" MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/Release/bin/MiniBrowser"
elif [ -f $SCRIPT_PATH/MiniBrowser ]; then elif [ -f $SCRIPT_PATH/MiniBrowser ]; then
LD_PATH="$SCRIPT_PATH" LD_PATH="$SCRIPT_PATH"
MINIBROWSER="$SCRIPT_PATH/MiniBrowser" MINIBROWSER="$SCRIPT_PATH/MiniBrowser"
elif [ -d $SCRIPT_PATH/WebKitBuild ]; then elif [ -d $SCRIPT_PATH/WebKitBuild ]; then
LD_PATH="$SCRIPT_PATH/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/bin" LD_PATH="$SCRIPT_PATH/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/WebKitBuild/Release/bin"
MINIBROWSER="$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/bin/MiniBrowser" MINIBROWSER="$SCRIPT_PATH/WebKitBuild/Release/bin/MiniBrowser"
else else
echo "Cannot find a MiniBrowser.app in neither location" 1>&2 echo "Cannot find a MiniBrowser.app in neither location" 1>&2
exit 1 exit 1

45
browser_patches/webkit/pw_run_debug.sh Executable file
View file

@ -0,0 +1,45 @@
#!/bin/bash
function runOSX() {
# if script is run as-is
if [ -d $SCRIPT_PATH/checkout/WebKitBuild/Debug/MiniBrowser.app ]; then
DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/Debug"
elif [ -d $SCRIPT_PATH/MiniBrowser.app ]; then
DYLIB_PATH="$SCRIPT_PATH"
elif [ -d $SCRIPT_PATH/WebKitBuild/Debug/MiniBrowser.app ]; then
DYLIB_PATH="$SCRIPT_PATH/WebKitBuild/Debug"
else
echo "Cannot find a MiniBrowser.app in neither location" 1>&2
exit 1
fi
MINIBROWSER="$DYLIB_PATH/MiniBrowser.app/Contents/MacOS/MiniBrowser"
DYLD_FRAMEWORK_PATH=$DYLIB_PATH DYLD_LIBRARY_PATH=$DYLIB_PATH $MINIBROWSER "$@"
}
function runLinux() {
# if script is run as-is
if [ -d $SCRIPT_PATH/checkout/WebKitBuild ]; then
LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/Debug/bin"
MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/Debug/bin/MiniBrowser"
elif [ -f $SCRIPT_PATH/MiniBrowser ]; then
LD_PATH="$SCRIPT_PATH"
MINIBROWSER="$SCRIPT_PATH/MiniBrowser"
elif [ -d $SCRIPT_PATH/WebKitBuild ]; then
LD_PATH="$SCRIPT_PATH/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/WebKitBuild/Debug/bin"
MINIBROWSER="$SCRIPT_PATH/WebKitBuild/Debug/bin/MiniBrowser"
else
echo "Cannot find a MiniBrowser.app in neither location" 1>&2
exit 1
fi
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LD_PATH $MINIBROWSER "$@"
}
SCRIPT_PATH="$(cd "$(dirname "$0")" ; pwd -P)"
if [ "$(uname)" == "Darwin" ]; then
runOSX "$@"
elif [ "$(uname)" == "Linux" ]; then
runLinux "$@"
else
echo "ERROR: cannot run on this platform!" 1>&2
exit 1;
fi