<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203551] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203551">203551</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-07-21 21:45:20 -0700 (Thu, 21 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] webkitdirs.pm contains unused code to support outdated OS X and Xcode versions
https://bugs.webkit.org/show_bug.cgi?id=160072
Reviewed by Andy Estes.
* Scripts/webkitdirs.pm:
(readXcodeUserDefault): Changed to take a defaults key rather than a suffix. Removed support
for old Xcode versions.
(determineBaseProductDir): Removed support for old Xcode versions. Updated for the change
to readXcodeUserDefault.
(debugger): Deleted. This was only used for Darwin, where LLDB is now the only supported
debugger.
(determineDebugger): Ditto.
(checkRequiredSystemConfig): Updated to require at least OS X Yosemite v10.10.5 and Xcode
7.0.
(printHelpAndExitForRunAndDebugWebKitAppIfNeeded): Removed --use-gdb and --use-lldb
switches.
(execMacWebKitAppForDebugging): Removed support for GDB.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203550 => 203551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-22 03:29:16 UTC (rev 203550)
+++ trunk/Tools/ChangeLog 2016-07-22 04:45:20 UTC (rev 203551)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-07-21 Dan Bernstein <mitz@apple.com>
+
+ [Mac] webkitdirs.pm contains unused code to support outdated OS X and Xcode versions
+ https://bugs.webkit.org/show_bug.cgi?id=160072
+
+ Reviewed by Andy Estes.
+
+ * Scripts/webkitdirs.pm:
+ (readXcodeUserDefault): Changed to take a defaults key rather than a suffix. Removed support
+ for old Xcode versions.
+ (determineBaseProductDir): Removed support for old Xcode versions. Updated for the change
+ to readXcodeUserDefault.
+ (debugger): Deleted. This was only used for Darwin, where LLDB is now the only supported
+ debugger.
+ (determineDebugger): Ditto.
+ (checkRequiredSystemConfig): Updated to require at least OS X Yosemite v10.10.5 and Xcode
+ 7.0.
+ (printHelpAndExitForRunAndDebugWebKitAppIfNeeded): Removed --use-gdb and --use-lldb
+ switches.
+ (execMacWebKitAppForDebugging): Removed support for GDB.
+
</ins><span class="cx"> 2016-07-21 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (203550 => 203551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-07-22 03:29:16 UTC (rev 203550)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-07-22 04:45:20 UTC (rev 203551)
</span><span class="lines">@@ -129,7 +129,6 @@
</span><span class="cx"> my $configurationProductDir;
</span><span class="cx"> my $sourceDir;
</span><span class="cx"> my $currentSVNRevision;
</span><del>-my $debugger;
</del><span class="cx"> my $didLoadIPhoneSimulatorNotification;
</span><span class="cx"> my $nmPath;
</span><span class="cx"> my $osXVersion;
</span><span class="lines">@@ -209,15 +208,11 @@
</span><span class="cx">
</span><span class="cx"> sub readXcodeUserDefault($)
</span><span class="cx"> {
</span><del>- my ($unprefixedKey) = @_;
</del><ins>+ my ($key) = @_;
</ins><span class="cx">
</span><del>- determineXcodeVersion();
-
- my $xcodeDefaultsDomain = (eval "v$xcodeVersion" lt v4) ? "com.apple.Xcode" : "com.apple.dt.Xcode";
- my $xcodeDefaultsPrefix = (eval "v$xcodeVersion" lt v4) ? "PBX" : "IDE";
</del><span class="cx"> my $devnull = File::Spec->devnull();
</span><span class="cx">
</span><del>- my $value = `defaults read $xcodeDefaultsDomain ${xcodeDefaultsPrefix}${unprefixedKey} 2> ${devnull}`;
</del><ins>+ my $value = `defaults read com.apple.dt.Xcode ${key} 2> ${devnull}`;
</ins><span class="cx"> return if $?;
</span><span class="cx">
</span><span class="cx"> chomp $value;
</span><span class="lines">@@ -243,24 +238,20 @@
</span><span class="cx"> unlink($personalPlistFile) || die "Could not delete $personalPlistFile: $!";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- determineXcodeVersion();
</del><ins>+ my $buildLocationStyle = join '', readXcodeUserDefault("IDEBuildLocationStyle");
+ if ($buildLocationStyle eq "Custom") {
+ my $buildLocationType = join '', readXcodeUserDefault("IDECustomBuildLocationType");
+ # FIXME: Read CustomBuildIntermediatesPath and set OBJROOT accordingly.
+ $baseProductDir = readXcodeUserDefault("IDECustomBuildProductsPath") if $buildLocationType eq "Absolute";
+ }
</ins><span class="cx">
</span><del>- if (eval "v$xcodeVersion" ge v4) {
- my $buildLocationStyle = join '', readXcodeUserDefault("BuildLocationStyle");
- if ($buildLocationStyle eq "Custom") {
- my $buildLocationType = join '', readXcodeUserDefault("CustomBuildLocationType");
- # FIXME: Read CustomBuildIntermediatesPath and set OBJROOT accordingly.
- $baseProductDir = readXcodeUserDefault("CustomBuildProductsPath") if $buildLocationType eq "Absolute";
- }
</del><ins>+ # DeterminedByTargets corresponds to a setting of "Legacy" in Xcode.
+ # It is the only build location style for which SHARED_PRECOMPS_DIR is not
+ # overridden when building from within Xcode.
+ $setSharedPrecompsDir = 1 if $buildLocationStyle ne "DeterminedByTargets";
</ins><span class="cx">
</span><del>- # DeterminedByTargets corresponds to a setting of "Legacy" in Xcode.
- # It is the only build location style for which SHARED_PRECOMPS_DIR is not
- # overridden when building from within Xcode.
- $setSharedPrecompsDir = 1 if $buildLocationStyle ne "DeterminedByTargets";
- }
-
</del><span class="cx"> if (!defined($baseProductDir)) {
</span><del>- $baseProductDir = join '', readXcodeUserDefault("ApplicationwideBuildSettings");
</del><ins>+ $baseProductDir = join '', readXcodeUserDefault("IDEApplicationwideBuildSettings");
</ins><span class="cx"> $baseProductDir = $1 if $baseProductDir =~ /SYMROOT\s*=\s*\"(.*?)\";/s;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1390,32 +1381,6 @@
</span><span class="cx"> return $ENV{'OS'} eq 'Windows_NT';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub debugger
-{
- determineDebugger();
- return $debugger;
-}
-
-sub determineDebugger
-{
- return if defined($debugger);
-
- determineXcodeVersion();
- if (eval "v$xcodeVersion" ge v4.5) {
- $debugger = "lldb";
- } else {
- $debugger = "gdb";
- }
-
- if (checkForArgumentAndRemoveFromARGV("--use-lldb")) {
- $debugger = "lldb";
- }
-
- if (checkForArgumentAndRemoveFromARGV("--use-gdb")) {
- $debugger = "gdb";
- }
-}
-
</del><span class="cx"> sub appendToEnvironmentVariableList($$)
</span><span class="cx"> {
</span><span class="cx"> my ($name, $value) = @_;
</span><span class="lines">@@ -1516,17 +1481,16 @@
</span><span class="cx"> {
</span><span class="cx"> if (isDarwin()) {
</span><span class="cx"> chomp(my $productVersion = `sw_vers -productVersion`);
</span><del>- if (eval "v$productVersion" lt v10.7.5) {
</del><ins>+ if (eval "v$productVersion" lt v10.10.5) {
</ins><span class="cx"> print "*************************************************************\n";
</span><del>- print "Mac OS X Version 10.7.5 or later is required to build WebKit.\n";
</del><ins>+ print "OS X Yosemite v10.10.5 or later is required to build WebKit.\n";
</ins><span class="cx"> print "You have " . $productVersion . ", thus the build will most likely fail.\n";
</span><span class="cx"> print "*************************************************************\n";
</span><span class="cx"> }
</span><del>- my $xcodebuildVersionOutput = `xcodebuild -version`;
- my $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : undef;
- if (!$xcodeVersion || $xcodeVersion && eval "v$xcodeVersion" lt v4.6) {
</del><ins>+ determineXcodeVersion();
+ if (eval "v$xcodeVersion" lt v7.0) {
</ins><span class="cx"> print "*************************************************************\n";
</span><del>- print "Xcode Version 4.6 or later is required to build WebKit.\n";
</del><ins>+ print "Xcode 7.0 or later is required to build WebKit.\n";
</ins><span class="cx"> print "You have an earlier version of Xcode, thus the build will\n";
</span><span class="cx"> print "most likely fail. The latest Xcode is available from the App Store.\n";
</span><span class="cx"> print "*************************************************************\n";
</span><span class="lines">@@ -2160,17 +2124,10 @@
</span><span class="cx"> print STDERR <<EOF;
</span><span class="cx"> Usage: @{[basename($0)]} [options] [args ...]
</span><span class="cx"> --help Show this help message
</span><del>- --no-saved-state Launch the application without state restoration (OS X 10.7 and later)
</del><ins>+ --no-saved-state Launch the application without state restoration
</ins><span class="cx"> -g|--guard-malloc Enable Guard Malloc (OS X only)
</span><span class="cx"> EOF
</span><span class="cx">
</span><del>- if ($includeOptionsForDebugging) {
- print STDERR <<EOF;
- --use-gdb Use GDB (this is the default when using Xcode 4.4 or earlier)
- --use-lldb Use LLDB (this is the default when using Xcode 4.5 or later)
-EOF
- }
-
</del><span class="cx"> exit(1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2502,28 +2459,18 @@
</span><span class="cx"> sub execMacWebKitAppForDebugging($)
</span><span class="cx"> {
</span><span class="cx"> my ($appPath) = @_;
</span><del>- my $architectureSwitch;
- my $argumentsSeparator;
</del><ins>+ my $architectureSwitch = "--arch";
+ my $argumentsSeparator = "--";
</ins><span class="cx">
</span><del>- if (debugger() eq "lldb") {
- $architectureSwitch = "--arch";
- $argumentsSeparator = "--";
- } elsif (debugger() eq "gdb") {
- $architectureSwitch = "-arch";
- $argumentsSeparator = "--args";
- } else {
- die "Unknown debugger $debugger.\n";
- }
-
- my $debuggerPath = `xcrun -find $debugger`;
</del><ins>+ my $debuggerPath = `xcrun -find lldb`;
</ins><span class="cx"> chomp $debuggerPath;
</span><del>- die "Can't find the $debugger executable.\n" unless -x $debuggerPath;
</del><ins>+ die "Can't find the lldb executable.\n" unless -x $debuggerPath;
</ins><span class="cx">
</span><span class="cx"> my $productDir = productDir();
</span><span class="cx"> setupMacWebKitEnvironment($productDir);
</span><span class="cx">
</span><span class="cx"> my @architectureFlags = ($architectureSwitch, architecture());
</span><del>- print "Starting @{[basename($appPath)]} under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
</del><ins>+ print "Starting @{[basename($appPath)]} under lldb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
</ins><span class="cx"> exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSeparator, $appPath, argumentsForRunAndDebugMacWebKitApp() or die;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>