Changeset 291823 in webkit

Timestamp:

Mar 24, 2022, 4:23:53 PM (5 years ago)

Author:

Patrick Angle

Message:

REGRESSION(STP142): "A JavaScript exception occured: Can't find variable: utils" from SafariDriver
​https://bugs.webkit.org/show_bug.cgi?id=238335

Reviewed by Devin Rousso.

Following r289467, we can't just copy the WebDriver atom scripts to the build products, since they now need to
have utils.js in any script that uses the utils namespace. The WebKit.framework copy of these scripts are
later used while building safaridriver, so they need to include the scripts as well.

• WebKit.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-03-24  Patrick Angle  <pangle@apple.com>
+
+        REGRESSION(STP142): "A JavaScript exception occured: Can't find variable: utils" from SafariDriver
+        https://bugs.webkit.org/show_bug.cgi?id=238335
+
+        Reviewed by Devin Rousso.
+
+        Following r289467, we can't just copy the WebDriver atom scripts to the build products, since they now need to
+        have `utils.js` in any script that uses the `utils` namespace. The `WebKit.framework` copy of these scripts are
+        later used while building safaridriver, so they need to include the scripts as well.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
 2022-03-24  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -16686 +16686 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "DST_DIR=\"$TARGET_BUILD_DIR/$PRIVATE_HEADERS_FOLDER_PATH/atoms\"\nmkdir -p \"$DST_DIR\"\n\nfor ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do\n    eval WEBDRIVER_ATOM=\\${SCRIPT_INPUT_FILE_${i}}\n    ditto \"${WEBDRIVER_ATOM}\" \"${DST_DIR}/${WEBDRIVER_ATOM##*/}\"\ndone\n";
+                        shellScript = "DST_DIR=\"$TARGET_BUILD_DIR/$PRIVATE_HEADERS_FOLDER_PATH/atoms\"\nmkdir -p \"$DST_DIR\"\n\nfor ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do\n    eval WEBDRIVER_ATOM=\\${SCRIPT_INPUT_FILE_${i}}\n    python3 ${SRCROOT}/Scripts/generate-automation-atom.py \"${WEBDRIVER_ATOM}\" \"${DST_DIR}/${WEBDRIVER_ATOM##*/}\"\ndone\n";
                 };
                 A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */ = {