Title: [203209] trunk/Tools
- Revision
- 203209
- Author
- [email protected]
- Date
- 2016-07-13 19:38:07 -0700 (Wed, 13 Jul 2016)
Log Message
[iOS] Copy WebKitTestRunnerInjectedBundle.bundle into PlugIns subdirectory and code sign it
https://bugs.webkit.org/show_bug.cgi?id=159738
<rdar://problem/27304649>
Reviewed by Dan Bernstein.
The bundle WebKitTestRunnerInjectedBundle.bundle contains executable code and should be
code signed if applicable. We should also copy this bundle into the PlugIns subdirectory
of the WebKitTestRunnerApp.app bundle instead of the top-level bundle directory as the
PlugIns subdirectory is the directory where loadable bundles of an app are expected to live.
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::initializeInjectedBundlePath): Modified code to look for the
bundle WebKitTestRunnerInjectedBundle.bundle in the plugin directory of the main bundle.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (203208 => 203209)
--- trunk/Tools/ChangeLog 2016-07-14 02:01:33 UTC (rev 203208)
+++ trunk/Tools/ChangeLog 2016-07-14 02:38:07 UTC (rev 203209)
@@ -1,3 +1,21 @@
+2016-07-13 Daniel Bates <[email protected]>
+
+ [iOS] Copy WebKitTestRunnerInjectedBundle.bundle into PlugIns subdirectory and code sign it
+ https://bugs.webkit.org/show_bug.cgi?id=159738
+ <rdar://problem/27304649>
+
+ Reviewed by Dan Bernstein.
+
+ The bundle WebKitTestRunnerInjectedBundle.bundle contains executable code and should be
+ code signed if applicable. We should also copy this bundle into the PlugIns subdirectory
+ of the WebKitTestRunnerApp.app bundle instead of the top-level bundle directory as the
+ PlugIns subdirectory is the directory where loadable bundles of an app are expected to live.
+
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::initializeInjectedBundlePath): Modified code to look for the
+ bundle WebKitTestRunnerInjectedBundle.bundle in the plugin directory of the main bundle.
+
2016-07-13 Beth Dakin <[email protected]>
Attempted build fix.
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (203208 => 203209)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2016-07-14 02:01:33 UTC (rev 203208)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2016-07-14 02:38:07 UTC (rev 203209)
@@ -61,7 +61,7 @@
29A8FCDD145F0337009045A6 /* JSAccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1345E7021006AA5A6 /* JSAccessibilityTextMarkerRange.cpp */; };
29A8FCE2145F037B009045A6 /* AccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1145F037B009045A6 /* AccessibilityTextMarkerRange.cpp */; };
29A8FCE5145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */; };
- 2E34C90018B68808000067BB /* WebKitTestRunnerInjectedBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */; };
+ 2E34C90018B68808000067BB /* WebKitTestRunnerInjectedBundle.bundle in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2E63ED8A1891AD7E002A7AFC /* AccessibilityControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED751891ACE9002A7AFC /* AccessibilityControllerIOS.mm */; };
2E63ED8B1891AD7E002A7AFC /* AccessibilityTextMarkerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED771891ACE9002A7AFC /* AccessibilityTextMarkerIOS.mm */; };
2E63ED8E1891AD7E002A7AFC /* EventSenderProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */; };
@@ -171,6 +171,20 @@
};
/* End PBXContainerItemProxy section */
+/* Begin PBXCopyFilesBuildPhase section */
+ CEC209031D36E36A00261596 /* Copy Plug-Ins */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 13;
+ files = (
+ 2E34C90018B68808000067BB /* WebKitTestRunnerInjectedBundle.bundle in Copy Plug-Ins */,
+ );
+ name = "Copy Plug-Ins";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
/* Begin PBXFileReference section */
0F2109C7189C650D00F879A3 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; };
0F5169CA1445222D00E0A9D7 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -767,6 +781,7 @@
2EE52CDC1890A9A80010ED21 /* Sources */,
2EE52CDD1890A9A80010ED21 /* Frameworks */,
2EE52CDE1890A9A80010ED21 /* Resources */,
+ CEC209031D36E36A00261596 /* Copy Plug-Ins */,
);
buildRules = (
);
@@ -878,7 +893,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 2E34C90018B68808000067BB /* WebKitTestRunnerInjectedBundle.bundle in Resources */,
2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */,
0F87B6191BACC558004EC572 /* Launch.storyboard in Resources */,
);
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (203208 => 203209)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-07-14 02:01:33 UTC (rev 203208)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-07-14 02:38:07 UTC (rev 203209)
@@ -65,7 +65,7 @@
void TestController::initializeInjectedBundlePath()
{
- NSString *nsBundlePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"WebKitTestRunnerInjectedBundle.bundle"];
+ NSString *nsBundlePath = [[NSBundle mainBundle].builtInPlugInsPath stringByAppendingPathComponent:@"WebKitTestRunnerInjectedBundle.bundle"];
m_injectedBundlePath.adopt(WKStringCreateWithCFString((CFStringRef)nsBundlePath));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
