browser(webkit): extract webkit embedders into webkit/src (microsoft#1919)

Author: pavelfeldman

browser_patches/export.sh

@@ -41,13 +41,13 @@ EXPORT_PATH=""
 if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
   FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
   CHECKOUT_PATH="$PWD/firefox/checkout"
-  EXPORT_PATH="$PWD/firefox/"
+  EXPORT_PATH="$PWD/firefox"
   BUILD_NUMBER_UPSTREAM_URL="https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/firefox/BUILD_NUMBER"
   source "./firefox/UPSTREAM_CONFIG.sh"
 elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
   FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout";
   CHECKOUT_PATH="$PWD/webkit/checkout"
-  EXPORT_PATH="$PWD/webkit/"
+  EXPORT_PATH="$PWD/webkit"
   BUILD_NUMBER_UPSTREAM_URL="https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/webkit/BUILD_NUMBER"
   source "./webkit/UPSTREAM_CONFIG.sh"
 else
@@ -112,21 +112,25 @@ fi
 
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 NEW_BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURRENT_BRANCH)
-NEW_DIFF=$(git diff --diff-algorithm=myers --full-index $NEW_BASE_REVISION $CURRENT_BRANCH)
+NEW_DIFF=$(git diff --diff-algorithm=myers --full-index $NEW_BASE_REVISION $CURRENT_BRANCH -- . ":!Tools/Playwright")
+
 # Increment BUILD_NUMBER
 BUILD_NUMBER=$(curl ${BUILD_NUMBER_UPSTREAM_URL})
 BUILD_NUMBER=$((BUILD_NUMBER+1))
-if [[ "$NEW_BASE_REVISION" == "$BASE_REVISION" && "$OLD_DIFF" == "$NEW_DIFF" ]]; then
-  echo "No changes"
-  exit 0
-fi
 
 echo "REMOTE_URL=\"$REMOTE_URL\"
 BASE_BRANCH=\"$BASE_BRANCH\"
 BASE_REVISION=\"$NEW_BASE_REVISION\"" > $EXPORT_PATH/UPSTREAM_CONFIG.sh
 echo "$NEW_DIFF" > $EXPORT_PATH/patches/$PATCH_NAME
 echo $BUILD_NUMBER > $EXPORT_PATH/BUILD_NUMBER
 
+if [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
+echo "-- patching WebKit embedders"
+rm -rf $EXPORT_PATH/src/*
+mkdir $EXPORT_PATH/src/Tools
+cp -r Tools/Playwright $EXPORT_PATH/src/Tools/
+fi
+
 NEW_BASE_REVISION_TEXT="$NEW_BASE_REVISION (not changed)"
 if [[ "$NEW_BASE_REVISION" != "$BASE_REVISION" ]]; then
   NEW_BASE_REVISION_TEXT="$YEL$NEW_BASE_REVISION (changed)$END"

browser_patches/prepare_checkout.sh

@@ -31,6 +31,7 @@ FRIENDLY_CHECKOUT_PATH="";
 CHECKOUT_PATH=""
 PATCHES_PATH=""
 BUILD_NUMBER=""
+PLAYWRIGHT_PATH=""
 if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
   FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
   CHECKOUT_PATH="$PWD/firefox/checkout"
@@ -41,6 +42,7 @@ elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
   FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout";
   CHECKOUT_PATH="$PWD/webkit/checkout"
   PATCHES_PATH="$PWD/webkit/patches"
+  PLAYWRIGHT_PATH="$PWD/webkit/src/Tools/Playwright"
   BUILD_NUMBER=$(cat "$PWD/webkit/BUILD_NUMBER")
   source "./webkit/UPSTREAM_CONFIG.sh"
 else
@@ -110,6 +112,13 @@ fi
 git checkout -b playwright-build
 echo "-- applying patches"
 git apply --index $PATCHES_PATH/*
+
+if [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
+echo "-- adding WebKit embedders"
+cp -r $PLAYWRIGHT_PATH Tools
+git add Tools/Playwright
+fi
+
 git commit -a --author="playwright-devops <[email protected]>" -m "chore: bootstrap build #$BUILD_NUMBER"
 
 echo

browser_patches/webkit/BUILD_NUMBER

@@ -1 +1 @@
-1204
+1205