From 64ac60b19fa22aee14b8de449bd2450728325188 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Mon, 23 Dec 2019 08:16:39 -0800 Subject: [PATCH] feat(scripts): support Debug builds in pw_run.sh --- browser_patches/webkit/pw_run.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/browser_patches/webkit/pw_run.sh b/browser_patches/webkit/pw_run.sh index 95c3debba1..e9845f489c 100755 --- a/browser_patches/webkit/pw_run.sh +++ b/browser_patches/webkit/pw_run.sh @@ -1,13 +1,18 @@ #!/bin/bash +BUILD_TYPE=Release +if [[ -v WKDEBUG ]]; then + BUILD_TYPE=Debug +fi + function runOSX() { # if script is run as-is - if [ -d $SCRIPT_PATH/checkout/WebKitBuild/Release/MiniBrowser.app ]; then - DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/Release" + if [ -d $SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE/MiniBrowser.app ]; then + DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE" elif [ -d $SCRIPT_PATH/MiniBrowser.app ]; then DYLIB_PATH="$SCRIPT_PATH" - elif [ -d $SCRIPT_PATH/WebKitBuild/Release/MiniBrowser.app ]; then - DYLIB_PATH="$SCRIPT_PATH/WebKitBuild/Release" + elif [ -d $SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/MiniBrowser.app ]; then + DYLIB_PATH="$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE" else echo "Cannot find a MiniBrowser.app in neither location" 1>&2 exit 1 @@ -19,14 +24,14 @@ function runOSX() { 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/Release/bin" - MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/Release/bin/MiniBrowser" + LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE/bin" + MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE/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/Release/bin" - MINIBROWSER="$SCRIPT_PATH/WebKitBuild/Release/bin/MiniBrowser" + LD_PATH="$SCRIPT_PATH/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/bin" + MINIBROWSER="$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/bin/MiniBrowser" else echo "Cannot find a MiniBrowser.app in neither location" 1>&2 exit 1