From 9a33222eb1d41c9e64eab97aeb50c0711bc19a42 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Mon, 23 Dec 2019 15:27:23 -0800
Subject: [PATCH] fix(scripts): do not depend on env in pw_run.sh for debug
 builds

---
 browser_patches/webkit/build.sh        |  9 ++----
 browser_patches/webkit/pw_run.sh       | 21 +++++-------
 browser_patches/webkit/pw_run_debug.sh | 45 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 20 deletions(-)
 create mode 100755 browser_patches/webkit/pw_run_debug.sh

diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh
index 54b6807885..1cb3ebadb7 100755
--- a/browser_patches/webkit/build.sh
+++ b/browser_patches/webkit/build.sh
@@ -6,19 +6,14 @@ 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 $BUILD_TYPE --touch-events
+  ./Tools/Scripts/build-webkit --release --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 $BUILD_TYPE --touch-events MiniBrowser
+  ./Tools/Scripts/build-webkit --gtk --release --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 e9845f489c..95c3debba1 100755
--- a/browser_patches/webkit/pw_run.sh
+++ b/browser_patches/webkit/pw_run.sh
@@ -1,18 +1,13 @@
 #!/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/$BUILD_TYPE/MiniBrowser.app ]; then
-    DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE"
+  if [ -d $SCRIPT_PATH/checkout/WebKitBuild/Release/MiniBrowser.app ]; then
+    DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/Release"
   elif [ -d $SCRIPT_PATH/MiniBrowser.app ]; then
     DYLIB_PATH="$SCRIPT_PATH"
-  elif [ -d $SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/MiniBrowser.app ]; then
-    DYLIB_PATH="$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE"
+  elif [ -d $SCRIPT_PATH/WebKitBuild/Release/MiniBrowser.app ]; then
+    DYLIB_PATH="$SCRIPT_PATH/WebKitBuild/Release"
   else
     echo "Cannot find a MiniBrowser.app in neither location" 1>&2
     exit 1
@@ -24,14 +19,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/$BUILD_TYPE/bin"
-    MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/$BUILD_TYPE/bin/MiniBrowser"
+    LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/Release/bin"
+    MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/Release/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/$BUILD_TYPE/bin"
-    MINIBROWSER="$SCRIPT_PATH/WebKitBuild/$BUILD_TYPE/bin/MiniBrowser"
+    LD_PATH="$SCRIPT_PATH/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/WebKitBuild/Release/bin"
+    MINIBROWSER="$SCRIPT_PATH/WebKitBuild/Release/bin/MiniBrowser"
   else
     echo "Cannot find a MiniBrowser.app in neither location" 1>&2
     exit 1
diff --git a/browser_patches/webkit/pw_run_debug.sh b/browser_patches/webkit/pw_run_debug.sh
new file mode 100755
index 0000000000..19f0431e98
--- /dev/null
+++ b/browser_patches/webkit/pw_run_debug.sh
@@ -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