Title: [148934] trunk/Tools
- Revision
- 148934
- Author
- mr...@apple.com
- Date
- 2013-04-22 17:10:59 -0700 (Mon, 22 Apr 2013)
Log Message
<http://webkit.org/b/114989> Add a user default to allow use of the Safari binary rather than SafariForWebKitDevelopment
Reviewed by Anders Carlsson.
* Scripts/webkitdirs.pm:
(skipSafariExecutableEntitlementChecks): Look for the SkipSafariExecutableEntitlementChecks default in the
/Library/Preferences/org.webkit.BuildConfiguration preference domain.
(safariPathFromSafariBundle): If the user default is set asking us to skip the entitlement checks, return
the path to the regular Safari binary.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (148933 => 148934)
--- trunk/Tools/ChangeLog 2013-04-22 23:50:41 UTC (rev 148933)
+++ trunk/Tools/ChangeLog 2013-04-23 00:10:59 UTC (rev 148934)
@@ -1,3 +1,15 @@
+2013-04-22 Mark Rowe <mr...@apple.com>
+
+ <http://webkit.org/b/114989> Add a user default to allow use of the Safari binary rather than SafariForWebKitDevelopment
+
+ Reviewed by Anders Carlsson.
+
+ * Scripts/webkitdirs.pm:
+ (skipSafariExecutableEntitlementChecks): Look for the SkipSafariExecutableEntitlementChecks default in the
+ /Library/Preferences/org.webkit.BuildConfiguration preference domain.
+ (safariPathFromSafariBundle): If the user default is set asking us to skip the entitlement checks, return
+ the path to the regular Safari binary.
+
2013-04-22 Ryuan Choi <ryuan.c...@samsung.com>
Unreviewed Efl build fix after r148921
Modified: trunk/Tools/Scripts/webkitdirs.pm (148933 => 148934)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-04-22 23:50:41 UTC (rev 148933)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-04-23 00:10:59 UTC (rev 148934)
@@ -683,6 +683,11 @@
$architecture = $passedArchitecture if $passedArchitecture;
}
+sub skipSafariExecutableEntitlementChecks
+{
+ return `defaults read /Library/Preferences/org.webkit.BuildConfiguration SkipSafariExecutableEntitlementChecks 2>/dev/null` eq "1\n";
+}
+
sub executableHasEntitlements
{
my $executablePath = shift;
@@ -695,8 +700,11 @@
if (isAppleMacWebKit()) {
my $safariPath = "$safariBundle/Contents/MacOS/Safari";
+ return $safariPath if skipSafariExecutableEntitlementChecks();
+
my $safariForWebKitDevelopmentPath = "$safariBundle/Contents/MacOS/SafariForWebKitDevelopment";
return $safariForWebKitDevelopmentPath if -f $safariForWebKitDevelopmentPath && executableHasEntitlements($safariPath);
+
return $safariPath;
}
return $safariBundle if isAppleWinWebKit();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
