197318 2019-04-26 10:34:17 -0700 Clarify linking of WebKitPluginHost.app and WebKitPluginAgent 2019-04-26 22:59:01 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 jbedard jbedard andersca ap jberlin krollin lforschler mitz ryanhaddad webkit-bug-importer oldest_to_newest 1530738 0 jbedard 2019-04-26 10:34:17 -0700 The current code which symlinks WebKitPluginHost.app and WebKitPluginAgent is far more confusing than it needs to be. 1530741 1 jbedard 2019-04-26 10:40:02 -0700 <rdar://problem/49779225> 1530742 2 368333 jbedard 2019-04-26 10:41:19 -0700 Created attachment 368333 Patch 1530746 3 jbedard 2019-04-26 10:47:02 -0700 Because the diffs of Xcode scripts are difficult to read: Existing code: Symlink WebKitPluginHost ------------------------------------------------------------ if [[ ${WK_PLATFORM_NAME} != "macosx" ]]; then exit 0 fi [[ -h "${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app" ]] || ln -s Versions/Current/WebKitPluginHost.app "${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app" [[ ${WK_USE_OVERRIDE_FRAMEWORKS_DIR} == "YES" ]] || [[ -h "${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent" ]] || ln -s Versions/Current/WebKitPluginAgent "${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent" if [[ "${CONFIGURATION}" != "Production" && ${ACTION} == "build" && ! -e "${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app" ]]; then if [[ -e "/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app" ]]; then ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app "${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app" else ln -s /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app "${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app" fi fi ------------------------------------------------------------ New Code: Link WebKitPluginAgent ------------------------------------------------------------ if [[ ${WK_PLATFORM_NAME} != "macosx" || "${WK_USE_OVERRIDE_FRAMEWORKS_DIR}" == "YES" ]]; then exit 0 fi ln -sf /System/Library/Frameworks/WebKit.framework/WebKitPluginAgent "${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/Current/WebKitPluginAgent" ln -sf Versions/Current/WebKitPluginAgent "${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent" ------------------------------------------------------------ Link WebKitPluginHost ------------------------------------------------------------ if [[ ${WK_PLATFORM_NAME} != "macosx" || "${WK_USE_OVERRIDE_FRAMEWORKS_DIR}" == "YES" ]]; then exit 0 fi rm -rf "${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/Current/WebKitPluginHost.app" ln -sf /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app "${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/Current/WebKitPluginHost.app" ln -sf Versions/Current/WebKitPluginHost.app "${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app" ------------------------------------------------------------ 1530848 4 368333 jbedard 2019-04-26 16:12:49 -0700 Comment on attachment 368333 Patch Clearly I am misunderstanding this code since EWS is choking on it. 368333 2019-04-26 10:41:19 -0700 2019-04-26 22:59:01 -0700 Patch bug-197318-20190426104119.patch text/plain 5655 jbedard SW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQ2OTYpCisrKyBTb3VyY2UvV2Vi S2l0TGVnYWN5L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5 LTA0LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBD bGFyaWZ5IGxpbmtpbmcgb2YgV2ViS2l0UGx1Z2luSG9zdC5hcHAgYW5kIFdlYktpdFBsdWdpbkFn ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcz MTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5Nzc5MjI1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0TGVnYWN5Lnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2o6IENsZWFuIHVwIGNvZGUgc3ltbGlua2luZyBXZWJLaXRQbHVnaW5Ib3N0 CisgICAgICAgIGFuZCBXZWJLaXRQbHVnaW5BZ2VudC4KKwogMjAxOS0wNC0yNSAgRnVqaWkgSGly b25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBy b2xsaW5nIG91dCByMjQ0NjY5LgpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9XZWJLaXRMZWdh Y3kueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 TGVnYWN5L1dlYktpdExlZ2FjeS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAy NDQ2OTYpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L1dlYktpdExlZ2FjeS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0zMTczLDcgKzMxNzMsOCBAQAogCQkJCTkz OTgxMTI3MDgyNEJGMDEwMDhERjAzOCAvKiBGcmFtZXdvcmtzICovLAogCQkJCTVEMEQ1NDIxMEU5 ODYzMUQwMDI5RTIyMyAvKiBDaGVjayBGb3IgV2VhayBWVGFibGVzIGFuZCBFeHRlcm5hbHMgKi8s CiAJCQkJMzcxM0YwMTgxNDI5MDVCNzAwMzYzODdGIC8qIENoZWNrIEZvciBJbmFwcHJvcHJpYXRl IE9iamVjdGl2ZS1DIENsYXNzIE5hbWVzICovLAotCQkJCTFBMzE5M0Q1MTkxODU2RTUwMEUxQ0Y4 OSAvKiBTeW1saW5rIFdlYktpdFBsdWdpbkhvc3QgKi8sCisJCQkJMzFGQURGNjAyMjczNjY4RTAw MTE1MzZFIC8qIExpbmsgV2ViS2l0UGx1Z2luQWdlbnQgKi8sCisJCQkJMUEzMTkzRDUxOTE4NTZF NTAwRTFDRjg5IC8qIExpbmsgV2ViS2l0UGx1Z2luSG9zdCAqLywKIAkJCSk7CiAJCQlidWlsZFJ1 bGVzID0gKAogCQkJCTUzNUUwOEMzMjI1NDVCNEMwMERGMDBDQSAvKiBQQlhCdWlsZFJ1bGUgKi8s CkBAIC0zMjM0LDE5ICszMjM1LDE5IEBACiAvKiBFbmQgUEJYUmVzb3VyY2VzQnVpbGRQaGFzZSBz ZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZSBzZWN0aW9uICov Ci0JCTFBMzE5M0Q1MTkxODU2RTUwMEUxQ0Y4OSAvKiBTeW1saW5rIFdlYktpdFBsdWdpbkhvc3Qg Ki8gPSB7CisJCTFBMzE5M0Q1MTkxODU2RTUwMEUxQ0Y4OSAvKiBMaW5rIFdlYktpdFBsdWdpbkhv c3QgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CiAJCQlidWlsZEFj dGlvbk1hc2sgPSAyMTQ3NDgzNjQ3OwogCQkJZmlsZXMgPSAoCiAJCQkpOwogCQkJaW5wdXRQYXRo cyA9ICgKIAkJCSk7Ci0JCQluYW1lID0gIlN5bWxpbmsgV2ViS2l0UGx1Z2luSG9zdCI7CisJCQlu YW1lID0gIkxpbmsgV2ViS2l0UGx1Z2luSG9zdCI7CiAJCQlvdXRwdXRQYXRocyA9ICgKIAkJCSk7 CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJCXNoZWxsUGF0 aCA9IC9iaW4vc2g7Ci0JCQlzaGVsbFNjcmlwdCA9ICJpZiBbWyAke1dLX1BMQVRGT1JNX05BTUV9 ICE9IFwibWFjb3N4XCIgXV07IHRoZW5cbiAgICBleGl0IDBcbmZpXG5cbltbIC1oIFwiJHtUQVJH RVRfQlVJTERfRElSfS9XZWJLaXRMZWdhY3kuZnJhbWV3b3JrL1dlYktpdFBsdWdpbkhvc3QuYXBw XCIgXV0gfHwgbG4gLXMgVmVyc2lvbnMvQ3VycmVudC9XZWJLaXRQbHVnaW5Ib3N0LmFwcCBcIiR7 VEFSR0VUX0JVSUxEX0RJUn0vV2ViS2l0TGVnYWN5LmZyYW1ld29yay9XZWJLaXRQbHVnaW5Ib3N0 LmFwcFwiXG5bWyAke1dLX1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUn0gPT0gXCJZRVNcIiBd XSB8fCBbWyAtaCBcIiR7VEFSR0VUX0JVSUxEX0RJUn0vV2ViS2l0TGVnYWN5LmZyYW1ld29yay9X ZWJLaXRQbHVnaW5BZ2VudFwiIF1dIHx8IGxuIC1zIFZlcnNpb25zL0N1cnJlbnQvV2ViS2l0UGx1 Z2luQWdlbnQgXCIke1RBUkdFVF9CVUlMRF9ESVJ9L1dlYktpdExlZ2FjeS5mcmFtZXdvcmsvV2Vi S2l0UGx1Z2luQWdlbnRcIlxuXG5pZiBbWyBcIiR7Q09ORklHVVJBVElPTn1cIiAhPSBcIlByb2R1 Y3Rpb25cIiAmJiAke0FDVElPTn0gPT0gXCJidWlsZFwiICAmJiAhIC1lIFwiJHtUQVJHRVRfQlVJ TERfRElSfS9XZWJLaXRMZWdhY3kuZnJhbWV3b3JrL1ZlcnNpb25zL0EvV2ViS2l0UGx1Z2luSG9z dC5hcHBcIiBdXTsgdGhlblxuICAgIGlmIFtbIC1lIFwiL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29y a3MvV2ViS2l0LmZyYW1ld29yay9XZWJLaXRQbHVnaW5Ib3N0LmFwcFwiIF1dOyB0aGVuXG4gICAg ICAgIGxuIC1zIC9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL1dlYktpdC5mcmFtZXdvcmsvV2Vi S2l0UGx1Z2luSG9zdC5hcHAgXCIke1RBUkdFVF9CVUlMRF9ESVJ9L1dlYktpdExlZ2FjeS5mcmFt ZXdvcmsvVmVyc2lvbnMvQS9XZWJLaXRQbHVnaW5Ib3N0LmFwcFwiXG4gICAgZWxzZVxuICAgICAg ICBsbiAtcyAvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9XZWJLaXQuZnJhbWV3b3JrL1ZlcnNp b25zL0EvRnJhbWV3b3Jrcy9XZWJLaXRMZWdhY3kuZnJhbWV3b3JrL1dlYktpdFBsdWdpbkhvc3Qu YXBwIFwiJHtUQVJHRVRfQlVJTERfRElSfS9XZWJLaXRMZWdhY3kuZnJhbWV3b3JrL1ZlcnNpb25z L0EvV2ViS2l0UGx1Z2luSG9zdC5hcHBcIlxuICAgIGZpXG5maVxuIjsKKwkJCXNoZWxsU2NyaXB0 ID0gImlmIFtbICR7V0tfUExBVEZPUk1fTkFNRX0gIT0gXCJtYWNvc3hcIiB8fCBcIiR7V0tfVVNF X09WRVJSSURFX0ZSQU1FV09SS1NfRElSfVwiID09IFwiWUVTXCIgXV07IHRoZW5cbiAgICBleGl0 IDBcbmZpXG5cbnJtIC1yZiBcIiR7VEFSR0VUX0JVSUxEX0RJUn0vV2ViS2l0TGVnYWN5LmZyYW1l d29yay9WZXJzaW9ucy9DdXJyZW50L1dlYktpdFBsdWdpbkhvc3QuYXBwXCJcbmxuIC1zZiAvU3lz dGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9XZWJLaXQuZnJhbWV3b3JrL1dlYktpdFBsdWdpbkhvc3Qu YXBwIFwiJHtUQVJHRVRfQlVJTERfRElSfS9XZWJLaXRMZWdhY3kuZnJhbWV3b3JrL1ZlcnNpb25z L0N1cnJlbnQvV2ViS2l0UGx1Z2luSG9zdC5hcHBcIlxubG4gLXNmIFZlcnNpb25zL0N1cnJlbnQv V2ViS2l0UGx1Z2luSG9zdC5hcHAgXCIke1RBUkdFVF9CVUlMRF9ESVJ9L1dlYktpdExlZ2FjeS5m cmFtZXdvcmsvV2ViS2l0UGx1Z2luSG9zdC5hcHBcIlxuIjsKIAkJfTsKIAkJMUMzOTVERTIwQzZC RThFMDAwMEQxRTUyIC8qIEdlbmVyYXRlIEV4cG9ydCBGaWxlcyAqLyA9IHsKIAkJCWlzYSA9IFBC WFNoZWxsU2NyaXB0QnVpbGRQaGFzZTsKQEAgLTMyNzgsNiArMzI3OSwyNCBAQAogCQkJc2hlbGxQ YXRoID0gL2Jpbi9zaDsKIAkJCXNoZWxsU2NyaXB0ID0gImV4ZWMgXCIke1NSQ1JPT1R9L21hYy9t aWdyYXRlLWhlYWRlcnMuc2hcIiI7CiAJCX07CisJCTMxRkFERjYwMjI3MzY2OEUwMDExNTM2RSAv KiBMaW5rIFdlYktpdFBsdWdpbkFnZW50ICovID0geworCQkJaXNhID0gUEJYU2hlbGxTY3JpcHRC dWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKKwkJCWZpbGVzID0g KAorCQkJKTsKKwkJCWlucHV0RmlsZUxpc3RQYXRocyA9ICgKKwkJCSk7CisJCQlpbnB1dFBhdGhz ID0gKAorCQkJKTsKKwkJCW5hbWUgPSAiTGluayBXZWJLaXRQbHVnaW5BZ2VudCI7CisJCQlvdXRw dXRGaWxlTGlzdFBhdGhzID0gKAorCQkJKTsKKwkJCW91dHB1dFBhdGhzID0gKAorCQkJKTsKKwkJ CXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOworCQkJc2hlbGxQYXRoID0g L2Jpbi9zaDsKKwkJCXNoZWxsU2NyaXB0ID0gImlmIFtbICR7V0tfUExBVEZPUk1fTkFNRX0gIT0g XCJtYWNvc3hcIiB8fCBcIiR7V0tfVVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSfVwiID09IFwi WUVTXCIgXV07IHRoZW5cbiAgICBleGl0IDBcbmZpXG5cbmxuIC1zZiAvU3lzdGVtL0xpYnJhcnkv RnJhbWV3b3Jrcy9XZWJLaXQuZnJhbWV3b3JrL1dlYktpdFBsdWdpbkFnZW50IFwiJHtUQVJHRVRf QlVJTERfRElSfS9XZWJLaXRMZWdhY3kuZnJhbWV3b3JrL1ZlcnNpb25zL0N1cnJlbnQvV2ViS2l0 UGx1Z2luQWdlbnRcIlxubG4gLXNmIFZlcnNpb25zL0N1cnJlbnQvV2ViS2l0UGx1Z2luQWdlbnQg XCIke1RBUkdFVF9CVUlMRF9ESVJ9L1dlYktpdExlZ2FjeS5mcmFtZXdvcmsvV2ViS2l0UGx1Z2lu QWdlbnRcIlxuIjsKKwkJfTsKIAkJMzcxM0YwMTgxNDI5MDVCNzAwMzYzODdGIC8qIENoZWNrIEZv ciBJbmFwcHJvcHJpYXRlIE9iamVjdGl2ZS1DIENsYXNzIE5hbWVzICovID0gewogCQkJaXNhID0g UEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOwogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0 NzsKQEAgLTMyOTEsNyArMzMxMCw3IEBACiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQ b3N0cHJvY2Vzc2luZyA9IDA7CiAJCQlzaGVsbFBhdGggPSAvYmluL3NoOwotCQkJc2hlbGxTY3Jp cHQgPSAiaWYgWyBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsaGRyc1wiIF0gfHwgWyBcIiR7QUNU SU9OfVwiID0gXCJpbnN0YWxsYXBpXCIgXTsgdGhlblxuICAgIGV4aXQgMDtcbmZpXG5cbmlmIFsg LWYgLi4vLi4vVG9vbHMvU2NyaXB0cy9jaGVjay1mb3ItaW5hcHByb3ByaWF0ZS1vYmpjLWNsYXNz LW5hbWVzIF07IHRoZW5cbiAgICAuLi8uLi9Ub29scy9TY3JpcHRzL2NoZWNrLWZvci1pbmFwcHJv cHJpYXRlLW9iamMtY2xhc3MtbmFtZXMgRE9NIFdlYiBfV2ViIHx8IGV4aXQgJD9cbmZpIjsKKwkJ CXNoZWxsU2NyaXB0ID0gImlmIFsgXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbGhkcnNcIiBdIHx8 IFsgXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbGFwaVwiIF07IHRoZW5cbiAgICBleGl0IDA7XG5m aVxuXG5pZiBbIC1mIC4uLy4uL1Rvb2xzL1NjcmlwdHMvY2hlY2stZm9yLWluYXBwcm9wcmlhdGUt b2JqYy1jbGFzcy1uYW1lcyBdOyB0aGVuXG4gICAgLi4vLi4vVG9vbHMvU2NyaXB0cy9jaGVjay1m b3ItaW5hcHByb3ByaWF0ZS1vYmpjLWNsYXNzLW5hbWVzIERPTSBXZWIgX1dlYiB8fCBleGl0ICQ/ XG5maVxuIjsKIAkJfTsKIAkJNUQwRDU0MjEwRTk4NjMxRDAwMjlFMjIzIC8qIENoZWNrIEZvciBX ZWFrIFZUYWJsZXMgYW5kIEV4dGVybmFscyAqLyA9IHsKIAkJCWlzYSA9IFBCWFNoZWxsU2NyaXB0 QnVpbGRQaGFzZTsK