146158 2015-06-19 13:24:21 -0700 Add a JSC symlink in /System/Library/PrivateFrameworks 2015-06-19 13:41:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca mitz oldest_to_newest 1103379 0 andersca 2015-06-19 13:24:21 -0700 Add a JSC symlink in /System/Library/PrivateFrameworks 1103380 1 255219 andersca 2015-06-19 13:24:38 -0700 Created attachment 255219 Patch 1103386 2 255219 mitz 2015-06-19 13:32:03 -0700 Comment on attachment 255219 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255219&action=review > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:6782 > + runOnlyForDeploymentPostprocessing = 0; I think you want to run this only when installing. > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:6784 > + shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\nmkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\nfi\nif [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/JavaScriptCore.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/JavaScriptCore.framework\" ]]; then\necho \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/JavaScriptCore.framework already exists and is a directory.\"\nexit 1\nfi\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../Frameworks/JavaScriptCore.framework ${INSTALL_DIR}/../PrivateFrameworks/JavaScriptCore.framework\nfi"; There’s no need to do this for iphonesimulator, only iphoneos. Instead of using ${INSTALL_DIR}, I’d use paths relative to ${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}, like in WebKit2. I think the “If the symlink already exists” comment isn’t helpful. Not sure checking for the “exists and is a directory” case is necessary, especially for something that’s only done when installing. 1103388 3 255222 andersca 2015-06-19 13:34:43 -0700 Created attachment 255222 Patch 1103392 4 andersca 2015-06-19 13:41:09 -0700 Committed r185765: <http://trac.webkit.org/changeset/185765> 255219 2015-06-19 13:24:38 -0700 2015-06-19 13:34:38 -0700 Patch bug-146158-20150619142400.patch text/plain 3392 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZTYwZjUwMDZjY2JmMmU3NGE0MzFkY2ZmMGUyY2RiODRlNmY5YjJmLi4zMjFmYWFiZGQzMTliMzZk ZGFhMTQ1NTc5ODZiNWMyMTJmMTlhOTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNS0wNi0xOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIEFkZCBhIEpTQyBzeW1saW5rIGluIC9TeXN0ZW0vTGlicmFyeS9Qcml2 YXRlRnJhbWV3b3JrcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ2MTU4CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIxNDY1OTY4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDE1LTA2LTE5ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQXZvaWQgZ2V0 T3duUHJvcGVydHlOYW1lcy9TeW1ib2xzIG9uIHZlcnkgbGFyZ2UgbGlzdHMKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggMjkxY2ViY2MzMjM3NjYwMTE5YjlkYTQxZGE4NTM5M2UwMDQ5 OWY1YS4uODQ2ZmZmNWY0ZGY2ZTBhZmM1OTA5ZTcwMTc5ODg1N2M5NTIwMTE0YyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTY2NTQsNiArNjY1NCw3IEBACiAJCQkJNUQyOUQ4QkUw RTk4NjBCNDAwQzNEMkQwIC8qIENoZWNrIEZvciBXZWFrIFZUYWJsZXMgYW5kIEV4dGVybmFscyAq LywKIAkJCQkzNzEzRjAxNDE0MjkwNTI0MDAzNjM4N0YgLyogQ2hlY2sgRm9yIEluYXBwcm9wcmlh dGUgT2JqZWN0aXZlLUMgQ2xhc3MgTmFtZXMgKi8sCiAJCQkJQTU1REVBQTQxNjcwM0RGNzAwM0RC ODQxIC8qIENoZWNrIEZvciBJbmFwcHJvcHJpYXRlIE1hY3JvcyBpbiBFeHRlcm5hbCBIZWFkZXJz ICovLAorCQkJCTFBMDJEOUE4MUIzNEE4ODIwMDBEMTUyMiAvKiBBZGQgU3ltbGluayBpbiAvU3lz dGVtL0xpYnJhcnkvUHJpdmF0ZUZyYW1ld29ya3MgKi8sCiAJCQkpOwogCQkJYnVpbGRSdWxlcyA9 ICgKIAkJCSk7CkBAIC02NzY4LDYgKzY3NjksMjAgQEAKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7 CiAJCQlzaGVsbFNjcmlwdCA9ICJzZXQgLWVcblxuaWYgW1sgJEVOQUJMRV9GVExfSklUICE9IFwi RU5BQkxFX0ZUTF9KSVRcIiBdXVxudGhlblxuICAgIGV4aXQgMFxuZmlcblxuaWYgW1sgJHtDT05G SUdVUkFUSU9OOj1EZWJ1Z30gIT0gXCJQcm9kdWN0aW9uXCIgXV1cbnRoZW5cbiAgICAjIENvcHkg dGhlIGxsdm1Gb3JKU0MgbGlicmFyeSBpbnRvIHRoZSBmcmFtZXdvcmsuXG4gICAgZGl0dG8gXCIk e0JVSUxUX1BST0RVQ1RTX0RJUn0vbGlibGx2bUZvckpTQy5keWxpYlwiIFwiJHtCVUlMVF9QUk9E VUNUU19ESVJ9LyR7Q09OVEVOVFNfRk9MREVSX1BBVEh9L0xpYnJhcmllcy9saWJsbHZtRm9ySlND LmR5bGliXCJcbmZpXG5cbmlmIFtbICRQTEFURk9STV9OQU1FICE9IFwibWFjb3N4XCIgXV1cbnRo ZW5cbiAgICBleGl0IDBcbmZpXG5cbmlmIFsgISAtZSBcIiR7QlVJTFRfUFJPRFVDVFNfRElSfS8k e1dSQVBQRVJfTkFNRX0vTGlicmFyaWVzXCIgXVxudGhlblxuICAgIGxuIC1mcyBcIlZlcnNpb25z L0N1cnJlbnQvTGlicmFyaWVzXCIgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vJHtXUkFQUEVSX05B TUV9L0xpYnJhcmllc1wiXG5maSI7CiAJCX07CisJCTFBMDJEOUE4MUIzNEE4ODIwMDBEMTUyMiAv KiBBZGQgU3ltbGluayBpbiAvU3lzdGVtL0xpYnJhcnkvUHJpdmF0ZUZyYW1ld29ya3MgKi8gPSB7 CisJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CisJCQlidWlsZEFjdGlvbk1hc2sg PSAyMTQ3NDgzNjQ3OworCQkJZmlsZXMgPSAoCisJCQkpOworCQkJaW5wdXRQYXRocyA9ICgKKwkJ CSk7CisJCQluYW1lID0gIkFkZCBTeW1saW5rIGluIC9TeXN0ZW0vTGlicmFyeS9Qcml2YXRlRnJh bWV3b3JrcyI7CisJCQlvdXRwdXRQYXRocyA9ICgKKwkJCSk7CisJCQlydW5Pbmx5Rm9yRGVwbG95 bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKKwkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7CisJCQlzaGVs bFNjcmlwdCA9ICJpZiBbWyAke1BMQVRGT1JNX05BTUV9ID09IFwiaXBob25lb3NcIiB8fCAke1BM QVRGT1JNX05BTUV9ID09IFwiaXBob25lc2ltdWxhdG9yXCIgXV07IHRoZW5cbmlmIFtbICEgLWQg XCIke0lOU1RBTExfRElSfS8uLi9Qcml2YXRlRnJhbWV3b3Jrc1wiIF1dOyB0aGVuXG5ta2RpciAt cCBcIiR7SU5TVEFMTF9ESVJ9Ly4uL1ByaXZhdGVGcmFtZXdvcmtzXCJcbmZpXG5pZiBbWyAtZCBc IiR7SU5TVEFMTF9ESVJ9Ly4uL1ByaXZhdGVGcmFtZXdvcmtzL0phdmFTY3JpcHRDb3JlLmZyYW1l d29ya1wiICYmICEgLUwgXCIke0lOU1RBTExfRElSfS8uLi9Qcml2YXRlRnJhbWV3b3Jrcy9KYXZh U2NyaXB0Q29yZS5mcmFtZXdvcmtcIiBdXTsgdGhlblxuZWNobyBcIkVSUk9SOiBDYW5ub3QgY3Jl YXRlIHN5bWxpbmsuICR7SU5TVEFMTF9ESVJ9Ly4uL1ByaXZhdGVGcmFtZXdvcmtzL0phdmFTY3Jp cHRDb3JlLmZyYW1ld29yayBhbHJlYWR5IGV4aXN0cyBhbmQgaXMgYSBkaXJlY3RvcnkuXCJcbmV4 aXQgMVxuZmlcbiMgSWYgdGhlIHN5bWxpbmsgYWxyZWFkeSBleGlzdHMsIHJlbW92ZSBpdCBhbmQg Y3JlYXRlIHRoZSBuZXcgb25lIGluIGl0cyBwbGFjZS5cbmxuIC1zIC1oIC1mIC4uL0ZyYW1ld29y a3MvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrICR7SU5TVEFMTF9ESVJ9Ly4uL1ByaXZhdGVGcmFt ZXdvcmtzL0phdmFTY3JpcHRDb3JlLmZyYW1ld29ya1xuZmkiOworCQl9OwogCQkzNzEzRjAxNDE0 MjkwNTI0MDAzNjM4N0YgLyogQ2hlY2sgRm9yIEluYXBwcm9wcmlhdGUgT2JqZWN0aXZlLUMgQ2xh c3MgTmFtZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CiAJCQli dWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3Owo= 255222 2015-06-19 13:34:43 -0700 2015-06-19 13:35:53 -0700 Patch bug-146158-20150619143404.patch text/plain 3031 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZTYwZjUwMDZjY2JmMmU3NGE0MzFkY2ZmMGUyY2RiODRlNmY5YjJmLi4zMjFmYWFiZGQzMTliMzZk ZGFhMTQ1NTc5ODZiNWMyMTJmMTlhOTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNS0wNi0xOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIEFkZCBhIEpTQyBzeW1saW5rIGluIC9TeXN0ZW0vTGlicmFyeS9Qcml2 YXRlRnJhbWV3b3JrcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ2MTU4CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIxNDY1OTY4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDE1LTA2LTE5ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQXZvaWQgZ2V0 T3duUHJvcGVydHlOYW1lcy9TeW1ib2xzIG9uIHZlcnkgbGFyZ2UgbGlzdHMKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggMjkxY2ViY2MzMjM3NjYwMTE5YjlkYTQxZGE4NTM5M2UwMDQ5 OWY1YS4uMGZjYjA5MmU3NzFkZWFhNTk1ZjU0YmMzNmMzZGE4M2IwZjgwMDc5NiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTY2NTQsNiArNjY1NCw3IEBACiAJCQkJNUQyOUQ4QkUw RTk4NjBCNDAwQzNEMkQwIC8qIENoZWNrIEZvciBXZWFrIFZUYWJsZXMgYW5kIEV4dGVybmFscyAq LywKIAkJCQkzNzEzRjAxNDE0MjkwNTI0MDAzNjM4N0YgLyogQ2hlY2sgRm9yIEluYXBwcm9wcmlh dGUgT2JqZWN0aXZlLUMgQ2xhc3MgTmFtZXMgKi8sCiAJCQkJQTU1REVBQTQxNjcwM0RGNzAwM0RC ODQxIC8qIENoZWNrIEZvciBJbmFwcHJvcHJpYXRlIE1hY3JvcyBpbiBFeHRlcm5hbCBIZWFkZXJz ICovLAorCQkJCTFBMDJEOUE4MUIzNEE4ODIwMDBEMTUyMiAvKiBBZGQgU3ltbGluayBpbiAvU3lz dGVtL0xpYnJhcnkvUHJpdmF0ZUZyYW1ld29ya3MgKi8sCiAJCQkpOwogCQkJYnVpbGRSdWxlcyA9 ICgKIAkJCSk7CkBAIC02NzY4LDYgKzY3NjksMjAgQEAKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7 CiAJCQlzaGVsbFNjcmlwdCA9ICJzZXQgLWVcblxuaWYgW1sgJEVOQUJMRV9GVExfSklUICE9IFwi RU5BQkxFX0ZUTF9KSVRcIiBdXVxudGhlblxuICAgIGV4aXQgMFxuZmlcblxuaWYgW1sgJHtDT05G SUdVUkFUSU9OOj1EZWJ1Z30gIT0gXCJQcm9kdWN0aW9uXCIgXV1cbnRoZW5cbiAgICAjIENvcHkg dGhlIGxsdm1Gb3JKU0MgbGlicmFyeSBpbnRvIHRoZSBmcmFtZXdvcmsuXG4gICAgZGl0dG8gXCIk e0JVSUxUX1BST0RVQ1RTX0RJUn0vbGlibGx2bUZvckpTQy5keWxpYlwiIFwiJHtCVUlMVF9QUk9E VUNUU19ESVJ9LyR7Q09OVEVOVFNfRk9MREVSX1BBVEh9L0xpYnJhcmllcy9saWJsbHZtRm9ySlND LmR5bGliXCJcbmZpXG5cbmlmIFtbICRQTEFURk9STV9OQU1FICE9IFwibWFjb3N4XCIgXV1cbnRo ZW5cbiAgICBleGl0IDBcbmZpXG5cbmlmIFsgISAtZSBcIiR7QlVJTFRfUFJPRFVDVFNfRElSfS8k e1dSQVBQRVJfTkFNRX0vTGlicmFyaWVzXCIgXVxudGhlblxuICAgIGxuIC1mcyBcIlZlcnNpb25z L0N1cnJlbnQvTGlicmFyaWVzXCIgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vJHtXUkFQUEVSX05B TUV9L0xpYnJhcmllc1wiXG5maSI7CiAJCX07CisJCTFBMDJEOUE4MUIzNEE4ODIwMDBEMTUyMiAv KiBBZGQgU3ltbGluayBpbiAvU3lzdGVtL0xpYnJhcnkvUHJpdmF0ZUZyYW1ld29ya3MgKi8gPSB7 CisJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CisJCQlidWlsZEFjdGlvbk1hc2sg PSA4OworCQkJZmlsZXMgPSAoCisJCQkpOworCQkJaW5wdXRQYXRocyA9ICgKKwkJCSk7CisJCQlu YW1lID0gIkFkZCBTeW1saW5rIGluIC9TeXN0ZW0vTGlicmFyeS9Qcml2YXRlRnJhbWV3b3JrcyI7 CisJCQlvdXRwdXRQYXRocyA9ICgKKwkJCSk7CisJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rw cm9jZXNzaW5nID0gMTsKKwkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7CisJCQlzaGVsbFNjcmlwdCA9 ICJpZiBbWyAke1BMQVRGT1JNX05BTUV9ICE9IFwiaXBob25lb3NcIiBdXTsgdGhlblxuZXhpdCAw O1xuZmlcblxuaWYgW1sgISAtZCBcIiR7SU5TVEFMTF9ST09UfS8ke1NZU1RFTV9MSUJSQVJZX0RJ Un0vUHJpdmF0ZUZyYW1ld29ya3NcIiBdXTsgdGhlblxubWtkaXIgLXAgXCIke0lOU1RBTExfUk9P VH0vJHtTWVNURU1fTElCUkFSWV9ESVJ9L1ByaXZhdGVGcmFtZXdvcmtzXCJcbmZpXG5cbmxuIC1z IC1oIC1mIC4uL0ZyYW1ld29ya3MvSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrICR7SU5TVEFMTF9S T09UfS8ke1NZU1RFTV9MSUJSQVJZX0RJUn0vUHJpdmF0ZUZyYW1ld29ya3MvSmF2YVNjcmlwdENv cmUuZnJhbWV3b3JrXG5maSI7CisJCX07CiAJCTM3MTNGMDE0MTQyOTA1MjQwMDM2Mzg3RiAvKiBD aGVjayBGb3IgSW5hcHByb3ByaWF0ZSBPYmplY3RpdmUtQyBDbGFzcyBOYW1lcyAqLyA9IHsKIAkJ CWlzYSA9IFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZTsKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDIx NDc0ODM2NDc7Cg==