Changeset 275614 in webkit
- Timestamp:
- Apr 7, 2021 11:20:27 AM (3 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r275605 r275614 1 2021-04-07 Jer Noble <jer.noble@apple.com> 2 3 [Cocoa] Add WebKitAdditions sources to project 4 https://bugs.webkit.org/show_bug.cgi?id=223803 5 6 Reviewed by Eric Carlson. 7 8 Enabling swift compilation requires modularization of the WebKit project, 9 but some of the headers in the WebKitLegacy.h umbrella header conflict with 10 filenames in the WebKit project, and can't be included in Objective-C or 11 Swift sources. To work around this issue for now, add "#if defined(__cplusplus)" 12 guards around those headers. 13 14 * Configurations/WebKit.xcconfig: 15 * UIProcess/API/Cocoa/WebKitLegacy.h: 16 * UIProcess/WebBackForwardList.h: 17 * UIProcess/WebPreferences.h: 18 * WebKit.xcodeproj/project.pbxproj: 19 * WebProcess/WebPage/WebFrame.h: 20 1 21 2021-04-07 Michael Catanzaro <mcatanzaro@gnome.org> 2 22 -
trunk/Source/WebKit/Configurations/WebKit.xcconfig
r275403 r275614 144 144 WK_LIBNETWORKEXTENSION_LDFLAGS_tvos = ; 145 145 146 FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork -framework Metal $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_BACKBOARD_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CONTACTS_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBNETWORKEXTENSION_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_UNIFORM_TYPE_IDENTIFIERS_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS) ;146 FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork -framework Metal $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_BACKBOARD_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CONTACTS_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBNETWORKEXTENSION_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_UNIFORM_TYPE_IDENTIFIERS_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS) $(WK_COORDINATOR_LDFLAGS); 147 147 148 148 // Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols. … … 168 168 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order; 169 169 170 EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/*; 171 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebKit.GPUProcess.sb com.apple.WebKit.WebAuthnProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb; 170 EXCLUDED_IOS_RESOURCE_FILE_NAMES = Resources/ios/*; 171 EXCLUDED_IOS_RESOURCE_FILE_NAMES[sdk=iphone*] = ; 172 173 EXCLUDED_MACOS_PLUGIN_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebKit.GPUProcess.sb com.apple.WebKit.WebAuthnProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb; 172 174 173 175 INSTALLHDRS_SCRIPT_PHASE = YES; … … 192 194 WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014)); 193 195 WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES; 196 197 WK_HAVE_COORDINATOR = $(WK_HAVE_COORDINATOR_$(WK_PLATFORM_NAME)); 198 WK_HAVE_COORDINATOR_macosx = $(WK_HAVE_COORDINATOR$(WK_MACOS_1200)); 199 WK_HAVE_COORDINATOR_MACOS_SINCE_1200 = YES; 200 201 WK_EXCLUDED_COORDINATOR_FILES = $(WK_EXCLUDED_COORDINATOR_FILES_$(WK_NOT_$(WK_HAVE_COORDINATOR))); 202 WK_EXCLUDED_COORDINATOR_FILES_YES = WKCoordinator.h WKCoordinator.mm WKGroupSession.swift 203 204 WK_COORDINATOR_LDFLAGS = $(WK_COORDINATOR_LDFLAGS_$(WK_HAVE_COORDINATOR)) 205 WK_COORDINATOR_LDFLAGS_YES = -weak-lWebKitSwift 206 207 EXCLUDED_SOURCE_FILE_NAMES = $(WK_EXCLUDED_COORDINATOR_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES) 208 SWIFT_INSTALL_OBJC_HEADER = NO -
trunk/Source/WebKit/UIProcess/WebPageProxy.cpp
r275537 r275614 299 299 #include "MediaSessionCoordinatorProxyPrivate.h" 300 300 #include "RemoteMediaSessionCoordinatorProxy.h" 301 302 #if USE(APPLE_INTERNAL_SDK) 303 #import <WebKitAdditions/WKCoordinatorAdditions.h> 304 #else 305 #define WEBPAGEPROXY_CONSTRUCTOR_WKCOORDINATOR_ADDITIONS 306 #define WEBPAGEPROXY_DESTRUCTOR_WKCOORDINATOR_ADDITIONS 307 #define WEBPAGEPROXY_DIDCOMMITLOADFORFRAME_WKCOORDINATOR_ADDITIONS 308 #endif 301 309 #endif 302 310 … … 559 567 #endif 560 568 569 #if ENABLE(MEDIA_SESSION_COORDINATOR) 570 WEBPAGEPROXY_CONSTRUCTOR_WKCOORDINATOR_ADDITIONS 571 #endif 561 572 } 562 573 … … 594 605 for (auto& callback : m_nextActivityStateChangeCallbacks) 595 606 callback(); 607 608 #if ENABLE(MEDIA_SESSION_COORDINATOR) 609 WEBPAGEPROXY_DESTRUCTOR_WKCOORDINATOR_ADDITIONS 610 #endif 596 611 } 597 612 … … 4750 4765 if (frame->isMainFrame()) 4751 4766 remoteInspectorInformationDidChange(); 4767 #endif 4768 4769 #if ENABLE(MEDIA_SESSION_COORDINATOR) 4770 WEBPAGEPROXY_DIDCOMMITLOADFORFRAME_WKCOORDINATOR_ADDITIONS 4752 4771 #endif 4753 4772 } -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r275553 r275614 1883 1883 CD8252DE25D4916C00862FD8 /* RemoteRemoteCommandListenerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD8252DA25D4915400862FD8 /* RemoteRemoteCommandListenerProxyMessageReceiver.cpp */; }; 1884 1884 CD8252E225D4919100862FD8 /* RemoteRemoteCommandListenerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD8252E025D4918400862FD8 /* RemoteRemoteCommandListenerMessageReceiver.cpp */; }; 1885 CD9549432615917B008372D9 /* WKGroupSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF17CC3260E8FAB00F0A4E8 /* WKGroupSession.swift */; }; 1885 1886 CDA041F41ACE2105004A13EC /* BackBoardServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */; }; 1886 1887 CDA29A1B1CBDBF4100901CCF /* PlaybackSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A191CBDBF4100901CCF /* PlaybackSessionManager.h */; }; … … 1916 1917 CDE555342406EB8C008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE5552E2406B897008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp */; }; 1917 1918 CDE555352406EB8C008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE555312406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp */; }; 1919 CDF17C9C260D4B8D00F0A4E8 /* WKCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF17C9A260D4B8D00F0A4E8 /* WKCoordinator.h */; }; 1920 CDF17C9D260D4B8D00F0A4E8 /* WKCoordinator.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDF17C9B260D4B8D00F0A4E8 /* WKCoordinator.mm */; }; 1918 1921 CE11AD521CBC482F00681EE5 /* CodeSigning.h in Headers */ = {isa = PBXBuildFile; fileRef = CE11AD511CBC482F00681EE5 /* CodeSigning.h */; }; 1919 1922 CE1A0BD61A48E6C60054EF74 /* TCCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BD01A48E6C60054EF74 /* TCCSPI.h */; }; … … 2190 2193 remoteGlobalIDString = BC3DE46515A91763008D26FC; 2191 2194 remoteInfo = WebKit2Service; 2195 }; 2196 CD954940261590B4008372D9 /* PBXContainerItemProxy */ = { 2197 isa = PBXContainerItemProxy; 2198 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 2199 proxyType = 1; 2200 remoteGlobalIDString = CD95493426159004008372D9; 2201 remoteInfo = WebKitSwift; 2192 2202 }; 2193 2203 E1AC2E2D20F7B98800B0897D /* PBXContainerItemProxy */ = { … … 5563 5573 CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebMediaKeyStorageManager.cpp; path = MediaCache/WebMediaKeyStorageManager.cpp; sourceTree = "<group>"; }; 5564 5574 CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebMediaKeyStorageManager.h; path = MediaCache/WebMediaKeyStorageManager.h; sourceTree = "<group>"; }; 5575 CD09FD0A26152E2300E4ACF1 /* WebKitSwift.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitSwift.xcconfig; sourceTree = "<group>"; }; 5565 5576 CD0C682F201FD10100A59409 /* WKFullScreenViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKFullScreenViewController.h; path = ios/fullscreen/WKFullScreenViewController.h; sourceTree = "<group>"; }; 5566 5577 CD0C6830201FD10100A59409 /* WKFullScreenViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFullScreenViewController.mm; path = ios/fullscreen/WKFullScreenViewController.mm; sourceTree = "<group>"; }; … … 5640 5651 CD8252E025D4918400862FD8 /* RemoteRemoteCommandListenerMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteRemoteCommandListenerMessageReceiver.cpp; sourceTree = "<group>"; }; 5641 5652 CD8252E125D4918500862FD8 /* RemoteRemoteCommandListenerMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteRemoteCommandListenerMessages.h; sourceTree = "<group>"; }; 5653 CD95493526159004008372D9 /* libWebKitSwift.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libWebKitSwift.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 5642 5654 CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackBoardServicesSPI.h; sourceTree = "<group>"; }; 5643 5655 CDA29A181CBDBF4100901CCF /* PlaybackSessionManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaybackSessionManager.mm; sourceTree = "<group>"; }; … … 5754 5766 CDE555302406B897008A3DDB /* RemoteLegacyCDMSessionMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteLegacyCDMSessionMessagesReplies.h; sourceTree = "<group>"; }; 5755 5767 CDE555312406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLegacyCDMSessionProxyMessageReceiver.cpp; sourceTree = "<group>"; }; 5768 CDF17C9A260D4B8D00F0A4E8 /* WKCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKCoordinator.h; sourceTree = "<group>"; }; 5769 CDF17C9B260D4B8D00F0A4E8 /* WKCoordinator.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKCoordinator.mm; sourceTree = "<group>"; }; 5770 CDF17CC3260E8FAB00F0A4E8 /* WKGroupSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WKGroupSession.swift; sourceTree = "<group>"; }; 5756 5771 CE11AD4F1CBC47F800681EE5 /* CodeSigning.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CodeSigning.mm; sourceTree = "<group>"; }; 5757 5772 CE11AD511CBC482F00681EE5 /* CodeSigning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeSigning.h; sourceTree = "<group>"; }; … … 6037 6052 runOnlyForDeploymentPostprocessing = 0; 6038 6053 }; 6054 CD95493326159004008372D9 /* Frameworks */ = { 6055 isa = PBXFrameworksBuildPhase; 6056 buildActionMask = 2147483647; 6057 files = ( 6058 ); 6059 runOnlyForDeploymentPostprocessing = 0; 6060 }; 6039 6061 /* End PBXFrameworksBuildPhase section */ 6040 6062 … … 6052 6074 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */, 6053 6075 8DC2EF5B0486A6940098B216 /* WebKit.framework */, 6076 CD95493526159004008372D9 /* libWebKitSwift.dylib */, 6054 6077 ); 6055 6078 name = Products; … … 6463 6486 BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */, 6464 6487 BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */, 6488 CD09FD0A26152E2300E4ACF1 /* WebKitSwift.xcconfig */, 6465 6489 37119A7C20CCB64E002C6DC9 /* WebKitTargetConditionals.xcconfig */, 6466 6490 ); … … 6928 6952 isa = PBXGroup; 6929 6953 children = ( 6954 CDF17C93260D3B5200F0A4E8 /* Coordinator */, 6930 6955 57FD316B22B3367E008D0E8B /* SOAuthorization */, 6931 6956 99C81D551C20DFBE005C4C82 /* AutomationClient.h */, … … 11353 11378 name = fullscreen; 11354 11379 sourceTree = "<group>"; 11380 }; 11381 CDF17C93260D3B5200F0A4E8 /* Coordinator */ = { 11382 isa = PBXGroup; 11383 children = ( 11384 CDF17C9A260D4B8D00F0A4E8 /* WKCoordinator.h */, 11385 CDF17C9B260D4B8D00F0A4E8 /* WKCoordinator.mm */, 11386 CDF17CC3260E8FAB00F0A4E8 /* WKGroupSession.swift */, 11387 ); 11388 name = Coordinator; 11389 path = usr/local/include/WebKitAdditions; 11390 sourceTree = BUILT_PRODUCTS_DIR; 11355 11391 }; 11356 11392 CE1A0BCA1A48E6C60054EF74 /* spi */ = { … … 12591 12627 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, 12592 12628 3309345B1315B9980097A7BC /* WKCookieManager.h in Headers */, 12629 CDF17C9C260D4B8D00F0A4E8 /* WKCoordinator.h in Headers */, 12593 12630 A1FB68241F6E518200C43F9F /* WKCrashReporter.h in Headers */, 12594 12631 512F58FA12A88A5400629530 /* WKCredential.h in Headers */, … … 12923 12960 runOnlyForDeploymentPostprocessing = 0; 12924 12961 }; 12962 CD95493126159004008372D9 /* Headers */ = { 12963 isa = PBXHeadersBuildPhase; 12964 buildActionMask = 2147483647; 12965 files = ( 12966 ); 12967 runOnlyForDeploymentPostprocessing = 0; 12968 }; 12925 12969 /* End PBXHeadersBuildPhase section */ 12926 12970 … … 13023 13067 1A1D2115191D96380001619F /* Postprocess Framework Headers */, 13024 13068 2E16B6F42019BC25008996D6 /* Copy Additional Resources */, 13069 CDF17CBE260DAD1B00F0A4E8 /* Copy Additional Sources */, 13025 13070 8DC2EF520486A6940098B216 /* Resources */, 13026 13071 372589431C1E496800C92CA9 /* Copy Shims */, … … 13046 13091 ); 13047 13092 dependencies = ( 13093 CD954941261590B4008372D9 /* PBXTargetDependency */, 13048 13094 E1AC2E3E20F7B9C000B0897D /* PBXTargetDependency */, 13049 13095 37F7407912721F740093869B /* PBXTargetDependency */, … … 13138 13184 productType = "com.apple.product-type.xpc-service"; 13139 13185 }; 13186 CD95493426159004008372D9 /* WebKitSwift */ = { 13187 isa = PBXNativeTarget; 13188 buildConfigurationList = CD95493B26159004008372D9 /* Build configuration list for PBXNativeTarget "WebKitSwift" */; 13189 buildPhases = ( 13190 CD95493126159004008372D9 /* Headers */, 13191 CD95493226159004008372D9 /* Sources */, 13192 CD95493326159004008372D9 /* Frameworks */, 13193 CD954942261590EE008372D9 /* Copy ObjC Interface Header */, 13194 ); 13195 buildRules = ( 13196 ); 13197 dependencies = ( 13198 ); 13199 name = WebKitSwift; 13200 productName = WebKitSwift; 13201 productReference = CD95493526159004008372D9 /* libWebKitSwift.dylib */; 13202 productType = "com.apple.product-type.library.dynamic"; 13203 }; 13140 13204 /* End PBXNativeTarget section */ 13141 13205 … … 13145 13209 attributes = { 13146 13210 DefaultBuildSystemTypeForWorkspace = Original; 13147 LastSwiftUpdateCheck = 0700;13211 LastSwiftUpdateCheck = 1300; 13148 13212 LastUpgradeCheck = 1140; 13149 13213 TargetAttributes = { … … 13152 13216 ProvisioningStyle = Automatic; 13153 13217 }; 13218 8DC2EF4F0486A6940098B216 = { 13219 LastSwiftMigration = 1300; 13220 }; 13154 13221 942DB232257EE6D4009BD80A = { 13155 13222 CreatedOnToolsVersion = 12.4; … … 13157 13224 A16E65FF2581930800EE1749 = { 13158 13225 CreatedOnToolsVersion = 12.4; 13226 }; 13227 CD95493426159004008372D9 = { 13228 CreatedOnToolsVersion = 13.0; 13159 13229 }; 13160 13230 E1AC2E2720F7B94C00B0897D = { … … 13179 13249 1A50DB38110A3C13000D3FE5 /* All */, 13180 13250 8DC2EF4F0486A6940098B216 /* WebKit */, 13251 CD95493426159004008372D9 /* WebKitSwift */, 13181 13252 2D7DEBD821269C6B00B9F73C /* Generate Unified Sources */, 13182 13253 C0CE72851247E66800BC0EC4 /* Derived Sources */, … … 13430 13501 ); 13431 13502 name = "Copy Additional Resources"; 13503 outputPaths = ( 13504 "", 13505 ); 13432 13506 runOnlyForDeploymentPostprocessing = 0; 13433 13507 shellPath = /bin/sh; … … 13795 13869 shellPath = /bin/sh; 13796 13870 shellScript = "Scripts/generate-derived-sources.sh\n"; 13871 }; 13872 CD954942261590EE008372D9 /* Copy ObjC Interface Header */ = { 13873 isa = PBXShellScriptBuildPhase; 13874 buildActionMask = 2147483647; 13875 files = ( 13876 ); 13877 inputFileListPaths = ( 13878 ); 13879 inputPaths = ( 13880 "$(DERIVED_SOURCES_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", 13881 ); 13882 name = "Copy ObjC Interface Header"; 13883 outputFileListPaths = ( 13884 ); 13885 outputPaths = ( 13886 "$(BUILT_PRODUCTS_DIR)/usr/local/include/$(TARGET_NAME)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", 13887 ); 13888 runOnlyForDeploymentPostprocessing = 0; 13889 shellPath = /bin/sh; 13890 shellScript = "if [[ \"$WK_HAVE_COORDINATOR\" == \"YES\" ]]\nthen\n ditto \"${DERIVED_SOURCES_DIR}/${SWIFT_OBJC_INTERFACE_HEADER_NAME}\" \"${BUILT_PRODUCTS_DIR}/usr/local/include/${TARGET_NAME}/${SWIFT_OBJC_INTERFACE_HEADER_NAME}\"\nfi\n"; 13891 }; 13892 CDF17CBE260DAD1B00F0A4E8 /* Copy Additional Sources */ = { 13893 isa = PBXShellScriptBuildPhase; 13894 buildActionMask = 2147483647; 13895 files = ( 13896 ); 13897 inputFileListPaths = ( 13898 ); 13899 inputPaths = ( 13900 "$(SDK_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.h", 13901 "$(SDK_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.mm", 13902 "$(SDK_DIR)/usr/local/include/WebKitAdditions/WKGroupSession.swift", 13903 ); 13904 name = "Copy Additional Sources"; 13905 outputFileListPaths = ( 13906 ); 13907 outputPaths = ( 13908 "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.h", 13909 "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.mm", 13910 "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/WKGroupSession.swift", 13911 ); 13912 runOnlyForDeploymentPostprocessing = 0; 13913 shellPath = /bin/bash; 13914 shellScript = "set -e\n\nRELATIVE_SOURCE_PATH=\"usr/local/include/WebKitAdditions\"\nSOURCE_PATH=\"$SDK_DIR/$RELATIVE_SOURCE_PATH\"\nDESTINATION_PATH=\"$BUILT_PRODUCTS_DIR/$RELATIVE_SOURCE_PATH\"\n\nfor SOURCE in WKCoordinator.h WKCoordinator.mm WKGroupSession.swift; do\n if [[ \"$SOURCE_PATH/$SOURCE\" -nt \"$DESTINATION_PATH/$SOURCE\" ]]; then\n ditto \"$SOURCE_PATH/$SOURCE\" \"$DESTINATION_PATH/$SOURCE\"\n fi\ndone\n"; 13797 13915 }; 13798 13916 E1AC2E2C20F7B95800B0897D /* Unlock Keychain */ = { … … 14298 14416 2D931169212F61B200044BFE /* WKContentView.mm in Sources */, 14299 14417 2D93116A212F61B500044BFE /* WKContentViewInteraction.mm in Sources */, 14418 CDF17C9D260D4B8D00F0A4E8 /* WKCoordinator.mm in Sources */, 14300 14419 637281A321ADC744009E0DE6 /* WKDownloadProgress.mm in Sources */, 14301 14420 5CE9120D2293C219005BEC78 /* WKMain.mm in Sources */, … … 14345 14464 runOnlyForDeploymentPostprocessing = 0; 14346 14465 }; 14466 CD95493226159004008372D9 /* Sources */ = { 14467 isa = PBXSourcesBuildPhase; 14468 buildActionMask = 2147483647; 14469 files = ( 14470 CD9549432615917B008372D9 /* WKGroupSession.swift in Sources */, 14471 ); 14472 runOnlyForDeploymentPostprocessing = 0; 14473 }; 14347 14474 /* End PBXSourcesBuildPhase section */ 14348 14475 … … 14452 14579 target = BC3DE46515A91763008D26FC /* WebContent */; 14453 14580 targetProxy = BCA8D46715BCE0D6009DC1F1 /* PBXContainerItemProxy */; 14581 }; 14582 CD954941261590B4008372D9 /* PBXTargetDependency */ = { 14583 isa = PBXTargetDependency; 14584 target = CD95493426159004008372D9 /* WebKitSwift */; 14585 targetProxy = CD954940261590B4008372D9 /* PBXContainerItemProxy */; 14454 14586 }; 14455 14587 E1AC2E2E20F7B98800B0897D /* PBXTargetDependency */ = { … … 14544 14676 baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */; 14545 14677 buildSettings = { 14678 LD_RUNPATH_SEARCH_PATHS = ( 14679 "$(inherited)", 14680 "@executable_path/Frameworks", 14681 "@loader_path/Frameworks", 14682 ); 14546 14683 OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; 14684 SWIFT_OPTIMIZATION_LEVEL = "-Onone"; 14685 SWIFT_VERSION = 5.0; 14547 14686 }; 14548 14687 name = Debug; … … 14552 14691 baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */; 14553 14692 buildSettings = { 14693 LD_RUNPATH_SEARCH_PATHS = ( 14694 "$(inherited)", 14695 "@executable_path/Frameworks", 14696 "@loader_path/Frameworks", 14697 ); 14554 14698 OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; 14699 SWIFT_VERSION = 5.0; 14555 14700 }; 14556 14701 name = Release; … … 14703 14848 baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */; 14704 14849 buildSettings = { 14850 LD_RUNPATH_SEARCH_PATHS = ( 14851 "$(inherited)", 14852 "@executable_path/Frameworks", 14853 "@loader_path/Frameworks", 14854 ); 14705 14855 OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; 14856 SWIFT_VERSION = 5.0; 14706 14857 }; 14707 14858 name = Production; … … 14865 15016 name = Production; 14866 15017 }; 15018 CD95493C26159004008372D9 /* Debug */ = { 15019 isa = XCBuildConfiguration; 15020 baseConfigurationReference = CD09FD0A26152E2300E4ACF1 /* WebKitSwift.xcconfig */; 15021 buildSettings = { 15022 }; 15023 name = Debug; 15024 }; 15025 CD95493D26159004008372D9 /* Release */ = { 15026 isa = XCBuildConfiguration; 15027 baseConfigurationReference = CD09FD0A26152E2300E4ACF1 /* WebKitSwift.xcconfig */; 15028 buildSettings = { 15029 }; 15030 name = Release; 15031 }; 15032 CD95493E26159004008372D9 /* Production */ = { 15033 isa = XCBuildConfiguration; 15034 baseConfigurationReference = CD09FD0A26152E2300E4ACF1 /* WebKitSwift.xcconfig */; 15035 buildSettings = { 15036 }; 15037 name = Production; 15038 }; 14867 15039 E1AC2E2820F7B94C00B0897D /* Debug */ = { 14868 15040 isa = XCBuildConfiguration; … … 15052 15224 defaultConfigurationName = Production; 15053 15225 }; 15226 CD95493B26159004008372D9 /* Build configuration list for PBXNativeTarget "WebKitSwift" */ = { 15227 isa = XCConfigurationList; 15228 buildConfigurations = ( 15229 CD95493C26159004008372D9 /* Debug */, 15230 CD95493D26159004008372D9 /* Release */, 15231 CD95493E26159004008372D9 /* Production */, 15232 ); 15233 defaultConfigurationIsVisible = 0; 15234 defaultConfigurationName = Production; 15235 }; 15054 15236 E1AC2E2B20F7B94C00B0897D /* Build configuration list for PBXAggregateTarget "Unlock Keychain" */ = { 15055 15237 isa = XCConfigurationList;
Note: See TracChangeset
for help on using the changeset viewer.