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