WebKit Bugzilla
Attachment 368333 Details for
Bug 197318
: Clarify linking of WebKitPluginHost.app and WebKitPluginAgent
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-197318-20190426104119.patch (text/plain), 5.52 KB, created by
Jonathan Bedard
on 2019-04-26 10:41:19 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Jonathan Bedard
Created:
2019-04-26 10:41:19 PDT
Size:
5.52 KB
patch
obsolete
>Index: Source/WebKitLegacy/ChangeLog >=================================================================== >--- Source/WebKitLegacy/ChangeLog (revision 244696) >+++ Source/WebKitLegacy/ChangeLog (working copy) >@@ -1,3 +1,14 @@ >+2019-04-26 Jonathan Bedard <jbedard@apple.com> >+ >+ Clarify linking of WebKitPluginHost.app and WebKitPluginAgent >+ https://bugs.webkit.org/show_bug.cgi?id=197318 >+ <rdar://problem/49779225> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * WebKitLegacy.xcodeproj/project.pbxproj: Clean up code symlinking WebKitPluginHost >+ and WebKitPluginAgent. >+ > 2019-04-25 Fujii Hironori <Hironori.Fujii@sony.com> > > Unreviewed, rolling out r244669. >Index: Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj >=================================================================== >--- Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (revision 244696) >+++ Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (working copy) >@@ -3173,7 +3173,8 @@ > 939811270824BF01008DF038 /* Frameworks */, > 5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */, > 3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */, >- 1A3193D5191856E500E1CF89 /* Symlink WebKitPluginHost */, >+ 31FADF602273668E0011536E /* Link WebKitPluginAgent */, >+ 1A3193D5191856E500E1CF89 /* Link WebKitPluginHost */, > ); > buildRules = ( > 535E08C322545B4C00DF00CA /* PBXBuildRule */, >@@ -3234,19 +3235,19 @@ > /* End PBXResourcesBuildPhase section */ > > /* Begin PBXShellScriptBuildPhase section */ >- 1A3193D5191856E500E1CF89 /* Symlink WebKitPluginHost */ = { >+ 1A3193D5191856E500E1CF89 /* Link WebKitPluginHost */ = { > isa = PBXShellScriptBuildPhase; > buildActionMask = 2147483647; > files = ( > ); > inputPaths = ( > ); >- name = "Symlink WebKitPluginHost"; >+ name = "Link WebKitPluginHost"; > outputPaths = ( > ); > runOnlyForDeploymentPostprocessing = 0; > shellPath = /bin/sh; >- shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n exit 0\nfi\n\n[[ -h \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" ]] || ln -s Versions/Current/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n[[ ${WK_USE_OVERRIDE_FRAMEWORKS_DIR} == \"YES\" ]] || [[ -h \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\" ]] || ln -s Versions/Current/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && ${ACTION} == \"build\" && ! -e \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\n if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n fi\nfi\n"; >+ shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" || \"${WK_USE_OVERRIDE_FRAMEWORKS_DIR}\" == \"YES\" ]]; then\n exit 0\nfi\n\nrm -rf \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/Current/WebKitPluginHost.app\"\nln -sf /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/Current/WebKitPluginHost.app\"\nln -sf Versions/Current/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n"; > }; > 1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = { > isa = PBXShellScriptBuildPhase; >@@ -3278,6 +3279,24 @@ > shellPath = /bin/sh; > shellScript = "exec \"${SRCROOT}/mac/migrate-headers.sh\""; > }; >+ 31FADF602273668E0011536E /* Link WebKitPluginAgent */ = { >+ isa = PBXShellScriptBuildPhase; >+ buildActionMask = 2147483647; >+ files = ( >+ ); >+ inputFileListPaths = ( >+ ); >+ inputPaths = ( >+ ); >+ name = "Link WebKitPluginAgent"; >+ outputFileListPaths = ( >+ ); >+ outputPaths = ( >+ ); >+ runOnlyForDeploymentPostprocessing = 0; >+ shellPath = /bin/sh; >+ shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" || \"${WK_USE_OVERRIDE_FRAMEWORKS_DIR}\" == \"YES\" ]]; then\n exit 0\nfi\n\nln -sf /System/Library/Frameworks/WebKit.framework/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/Current/WebKitPluginAgent\"\nln -sf Versions/Current/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\n"; >+ }; > 3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */ = { > isa = PBXShellScriptBuildPhase; > buildActionMask = 2147483647; >@@ -3291,7 +3310,7 @@ > ); > runOnlyForDeploymentPostprocessing = 0; > shellPath = /bin/sh; >- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names DOM Web _Web || exit $?\nfi"; >+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names DOM Web _Web || exit $?\nfi\n"; > }; > 5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */ = { > isa = PBXShellScriptBuildPhase;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
jbedard
:
commit-queue-
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 197318
:
368333