From d8520f0695be3dae734a419694ea4a9f43f25f32 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Mon, 7 Dec 2020 09:21:36 -0800
Subject: [PATCH] devops: fix webkit building on windows (#4618)

---
 browser_patches/webkit/build.sh     | 3 ++-
 browser_patches/webkit/buildwin.bat | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh
index 2527d37918..e5a0144c70 100755
--- a/browser_patches/webkit/build.sh
+++ b/browser_patches/webkit/build.sh
@@ -4,6 +4,7 @@ set +x
 
 trap "cd $(pwd -P)" EXIT
 cd "$(dirname $0)"
+SCRIPT_FOLDER="$(pwd -P)"
 
 build_gtk() {
   if ! [[ -d ./WebKitBuild/GTK/DependenciesGTK ]]; then
@@ -69,7 +70,7 @@ elif [[ "$(uname)" == "Linux" ]]; then
     build_wpe
   fi
 elif [[ "$(uname)" == MINGW* ]]; then
-  /c/Windows/System32/cmd.exe "/c buildwin.bat"
+  /c/Windows/System32/cmd.exe "/c $(cygpath -w ${SCRIPT_FOLDER}/buildwin.bat)"
 else
   echo "ERROR: cannot upload on this platform!" 1>&2
   exit 1;
diff --git a/browser_patches/webkit/buildwin.bat b/browser_patches/webkit/buildwin.bat
index 1d6977cc93..a6c238c6ff 100644
--- a/browser_patches/webkit/buildwin.bat
+++ b/browser_patches/webkit/buildwin.bat
@@ -1,5 +1,5 @@
 set PATH=%WEBKIT_BUILD_PATH%
-set WEBKIT_LIBRARIES=%~dp0WebKitLibraries\win
-set WEBKIT_OUTPUTDIR=%~dp0WebKitBuild
-perl %~dp0Tools\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"
-%DEVENV% %~dp0WebKitBuild\Release\WebKit.sln /build "Release|x64"
+set WEBKIT_LIBRARIES=WebKitLibraries\win
+set WEBKIT_OUTPUTDIR=WebKitBuild
+perl 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"
+%DEVENV% WebKitBuild\Release\WebKit.sln /build "Release|x64"