Title: [190772] branches/safari-601-branch/Tools
- Revision
- 190772
- Author
- [email protected]
- Date
- 2015-10-08 19:26:04 -0700 (Thu, 08 Oct 2015)
Log Message
Merged r190358. rdar://problem/23016109
Modified Paths
Added Paths
Diff
Modified: branches/safari-601-branch/Tools/ChangeLog (190771 => 190772)
--- branches/safari-601-branch/Tools/ChangeLog 2015-10-09 02:18:18 UTC (rev 190771)
+++ branches/safari-601-branch/Tools/ChangeLog 2015-10-09 02:26:04 UTC (rev 190772)
@@ -1,3 +1,17 @@
+2015-10-08 Lucas Forschler <[email protected]>
+
+ Merge r190358. rdar://problem/23016109
+
+ 2015-09-30 Timothy Hatcher <[email protected]>
+
+ Give WebKitLauncher the get-task-allow entitlement to allow it to work on El Capitan
+ https://bugs.webkit.org/show_bug.cgi?id=149674
+
+ Reviewed by Lucas Forschler.
+
+ * WebKitLauncher/WebKitLauncher.entitlements: Added.
+ * WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj:
+
2015-10-08 Andy Estes <[email protected]>
Merge r188150, r188517, r188844, r188845, r188851, r188852, r188880, r188881, r188988, r189193, r189289, and r190133.
Copied: branches/safari-601-branch/Tools/WebKitLauncher/WebKitLauncher.entitlements (from rev 190358, trunk/Tools/WebKitLauncher/WebKitLauncher.entitlements) (0 => 190772)
--- branches/safari-601-branch/Tools/WebKitLauncher/WebKitLauncher.entitlements (rev 0)
+++ branches/safari-601-branch/Tools/WebKitLauncher/WebKitLauncher.entitlements 2015-10-09 02:26:04 UTC (rev 190772)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.get-task-allow</key>
+ <true/>
+</dict>
+</plist>
Modified: branches/safari-601-branch/Tools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj (190771 => 190772)
--- branches/safari-601-branch/Tools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj 2015-10-09 02:18:18 UTC (rev 190771)
+++ branches/safari-601-branch/Tools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj 2015-10-09 02:26:04 UTC (rev 190772)
@@ -64,6 +64,7 @@
/* Begin PBXFileReference section */
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ 1C48994E1BBC547D00213C1C /* WebKitLauncher.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = WebKitLauncher.entitlements; sourceTree = SOURCE_ROOT; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
5D1067620FE63758002A2868 /* WebKitLauncherURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLauncherURLProtocol.h; sourceTree = "<group>"; };
5D1067630FE63758002A2868 /* WebKitLauncherURLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLauncherURLProtocol.m; sourceTree = "<group>"; };
@@ -177,6 +178,7 @@
5DA88F7E0FC8176100AB2F62 /* Base.xcconfig */,
5DA88F7F0FC8176100AB2F62 /* WebKitLauncher.xcconfig */,
5DA88F800FC8176100AB2F62 /* WebKitNightlyEnabler.xcconfig */,
+ 1C48994E1BBC547D00213C1C /* WebKitLauncher.entitlements */,
);
path = Configurations;
sourceTree = "<group>";
@@ -384,6 +386,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5DA88F7F0FC8176100AB2F62 /* WebKitLauncher.xcconfig */;
buildSettings = {
+ CODE_SIGN_ENTITLEMENTS = WebKitLauncher.entitlements;
};
name = Debug;
};
@@ -391,6 +394,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5DA88F7F0FC8176100AB2F62 /* WebKitLauncher.xcconfig */;
buildSettings = {
+ CODE_SIGN_ENTITLEMENTS = WebKitLauncher.entitlements;
};
name = Release;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
