<!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>[196783] trunk</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/196783">196783</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-18 16:01:32 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>.:
Get rid of the "All Source (target WebProcess)" scheme.
Rubber-stamped by Dan Bernstein.
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme: Removed.
Tools:
Get rid of the --target-web-process and --use-web-process-xpc-service options.
Rubber-stamped by Dan Bernstein.
We now always use XPC, and --target-web-process is no longer supported.
* Scripts/webkitdirs.pm:
(execMacWebKitAppForDebugging):
(shouldTargetWebProcess): Deleted.
(determineShouldTargetWebProcess): Deleted.
(shouldUseXPCServiceForWebProcess): Deleted.
(determineShouldUseXPCServiceForWebProcess): Deleted.
(printHelpAndExitForRunAndDebugWebKitAppIfNeeded): Deleted.
(argumentsForRunAndDebugMacWebKitApp): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme">trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (196782 => 196783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-02-18 23:48:19 UTC (rev 196782)
+++ trunk/ChangeLog 2016-02-19 00:01:32 UTC (rev 196783)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2016-02-18 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the "All Source (target WebProcess)" scheme.
+
+ Rubber-stamped by Dan Bernstein.
+
+ * WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme: Removed.
+
</ins><span class="cx"> 2016-02-18 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Remove LLVM support
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196782 => 196783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-18 23:48:19 UTC (rev 196782)
+++ trunk/Tools/ChangeLog 2016-02-19 00:01:32 UTC (rev 196783)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-18 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the --target-web-process and --use-web-process-xpc-service options.
+
+ Rubber-stamped by Dan Bernstein.
+
+ We now always use XPC, and --target-web-process is no longer supported.
+
+ * Scripts/webkitdirs.pm:
+ (execMacWebKitAppForDebugging):
+ (shouldTargetWebProcess): Deleted.
+ (determineShouldTargetWebProcess): Deleted.
+ (shouldUseXPCServiceForWebProcess): Deleted.
+ (determineShouldUseXPCServiceForWebProcess): Deleted.
+ (printHelpAndExitForRunAndDebugWebKitAppIfNeeded): Deleted.
+ (argumentsForRunAndDebugMacWebKitApp): Deleted.
+
</ins><span class="cx"> 2016-02-18 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip API test WTF_ParkingLot.UnparkOneFiftyThenFiftyAll on ios-simulator
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (196782 => 196783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-02-18 23:48:19 UTC (rev 196782)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-02-19 00:01:32 UTC (rev 196783)
</span><span class="lines">@@ -138,8 +138,6 @@
</span><span class="cx"> my $isWin64;
</span><span class="cx"> my $isInspectorFrontend;
</span><span class="cx"> my $portName;
</span><del>-my $shouldTargetWebProcess;
-my $shouldUseXPCServiceForWebProcess;
</del><span class="cx"> my $shouldUseGuardMalloc;
</span><span class="cx"> my $shouldNotUseNinja;
</span><span class="cx"> my $xcodeVersion;
</span><span class="lines">@@ -1383,30 +1381,6 @@
</span><span class="cx"> return $ENV{'OS'} eq 'Windows_NT';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub shouldTargetWebProcess
-{
- determineShouldTargetWebProcess();
- return $shouldTargetWebProcess;
-}
-
-sub determineShouldTargetWebProcess
-{
- return if defined($shouldTargetWebProcess);
- $shouldTargetWebProcess = checkForArgumentAndRemoveFromARGV("--target-web-process");
-}
-
-sub shouldUseXPCServiceForWebProcess
-{
- determineShouldUseXPCServiceForWebProcess();
- return $shouldUseXPCServiceForWebProcess;
-}
-
-sub determineShouldUseXPCServiceForWebProcess
-{
- return if defined($shouldUseXPCServiceForWebProcess);
- $shouldUseXPCServiceForWebProcess = checkForArgumentAndRemoveFromARGV("--use-web-process-xpc-service");
-}
-
</del><span class="cx"> sub debugger
</span><span class="cx"> {
</span><span class="cx"> determineDebugger();
</span><span class="lines">@@ -2173,12 +2147,10 @@
</span><span class="cx"> --help Show this help message
</span><span class="cx"> --no-saved-state Launch the application without state restoration (OS X 10.7 and later)
</span><span class="cx"> -g|--guard-malloc Enable Guard Malloc (OS X only)
</span><del>- --use-web-process-xpc-service Launch the Web Process as an XPC Service (OS X only)
</del><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> if ($includeOptionsForDebugging) {
</span><span class="cx"> print STDERR <<EOF;
</span><del>- --target-web-process Debug the web process
</del><span class="cx"> --use-gdb Use GDB (this is the default when using Xcode 4.4 or earlier)
</span><span class="cx"> --use-lldb Use LLDB (this is the default when using Xcode 4.5 or later)
</span><span class="cx"> EOF
</span><span class="lines">@@ -2195,7 +2167,6 @@
</span><span class="cx"> # FIXME: Don't set ApplePersistenceIgnoreState once all supported OS versions respect ApplePersistenceIgnoreStateQuietly (rdar://15032886).
</span><span class="cx"> push @args, ("-ApplePersistenceIgnoreState", "YES");
</span><span class="cx"> }
</span><del>- push @args, ("-WebKit2UseXPCServiceForWebProcess", "YES") if shouldUseXPCServiceForWebProcess();
</del><span class="cx"> unshift @args, @ARGV;
</span><span class="cx">
</span><span class="cx"> return @args;
</span><span class="lines">@@ -2531,23 +2502,8 @@
</span><span class="cx"> setupMacWebKitEnvironment($productDir);
</span><span class="cx">
</span><span class="cx"> my @architectureFlags = ($architectureSwitch, architecture());
</span><del>- if (!shouldTargetWebProcess()) {
- print "Starting @{[basename($appPath)]} under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
- exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSeparator, $appPath, argumentsForRunAndDebugMacWebKitApp() or die;
- } else {
- if (shouldUseXPCServiceForWebProcess()) {
- die "Targeting the Web Process is not compatible with using an XPC Service for the Web Process at this time.";
- }
-
- my $webProcessShimPath = File::Spec->catfile($productDir, "SecItemShim.dylib");
- my $webProcessPath = File::Spec->catdir($productDir, "WebProcess.app");
- my $webKit2ExecutablePath = File::Spec->catfile($productDir, "WebKit2.framework", "WebKit2");
-
- appendToEnvironmentVariableList("DYLD_INSERT_LIBRARIES", $webProcessShimPath);
-
- print "Starting WebProcess under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
- exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSeparator, $webProcessPath, $webKit2ExecutablePath, "-type", "webprocess", "-client-executable", $appPath or die;
- }
</del><ins>+ print "Starting @{[basename($appPath)]} under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
+ exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSeparator, $appPath, argumentsForRunAndDebugMacWebKitApp() or die;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub debugSafari
</span></span></pre></div>
<a id="trunkWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme"></a>
<div class="delfile"><h4>Deleted: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme (196782 => 196783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2016-02-18 23:48:19 UTC (rev 196782)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2016-02-19 00:01:32 UTC (rev 196783)
</span><span class="lines">@@ -1,213 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- version = "1.7">
- <BuildAction
- parallelizeBuildables = "NO"
- buildImplicitDependencies = "YES">
- <PreActions>
- <ExecutionAction
- ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
- <ActionContent
- title = "Run Script"
- scriptText = "&quot;$SRCROOT/../../Tools/Scripts/copy-webkitlibraries-to-product-directory&quot; --wksi --llvm">
- <EnvironmentBuildable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "5D247B6114689B8600E78B76"
- BuildableName = "libWTF.a"
- BlueprintName = "WTF"
- ReferencedContainer = "container:Source/WTF/WTF.xcodeproj">
- </BuildableReference>
- </EnvironmentBuildable>
- </ActionContent>
- </ExecutionAction>
- </PreActions>
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "14F271BD18EA3963008C152F"
- BuildableName = "libbmalloc.a"
- BlueprintName = "bmalloc"
- ReferencedContainer = "container:Source/bmalloc/bmalloc.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "5D247B6114689B8600E78B76"
- BuildableName = "libWTF.a"
- BlueprintName = "WTF"
- ReferencedContainer = "container:Source/WTF/WTF.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "932F5BE30822A1C700736975"
- BuildableName = "All"
- BlueprintName = "All"
- ReferencedContainer = "container:Source/JavaScriptCore/JavaScriptCore.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "FB39D0D01200F0E300088E69"
- BuildableName = "libANGLE.a"
- BlueprintName = "ANGLE"
- ReferencedContainer = "container:Source/ThirdParty/ANGLE/ANGLE.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "41816F7913859C550057AAA4"
- BuildableName = "All"
- BlueprintName = "All"
- ReferencedContainer = "container:Source/WebCore/WebCore.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "A54C2256148B23DF00373FA3"
- BuildableName = "WebInspectorUI.framework"
- BlueprintName = "WebInspectorUI"
- ReferencedContainer = "container:Source/WebInspectorUI/WebInspectorUI.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "9398100A0824BF01008DF038"
- BuildableName = "WebKitLegacy.framework"
- BlueprintName = "WebKitLegacy"
- ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
- BuildableName = "All"
- BlueprintName = "All"
- ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "1A50DB1D110A3BDC000D3FE5"
- BuildableName = "WebProcess.app"
- BlueprintName = "WebProcess"
- ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "1A50DB1D110A3BDC000D3FE5"
- BuildableName = "WebProcess.app"
- BlueprintName = "WebProcess"
- ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <CommandLineArguments>
- <CommandLineArgument
- argument = "&quot;$(BUILT_PRODUCTS_DIR)/WebKit2.framework/WebKit2&quot;"
- isEnabled = "YES">
- </CommandLineArgument>
- <CommandLineArgument
- argument = "-type webprocess"
- isEnabled = "YES">
- </CommandLineArgument>
- <CommandLineArgument
- argument = "-client-executable /Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment"
- isEnabled = "YES">
- </CommandLineArgument>
- </CommandLineArguments>
- <EnvironmentVariables>
- <EnvironmentVariable
- key = "DYLD_INSERT_LIBRARIES"
- value = "$(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib"
- isEnabled = "YES">
- </EnvironmentVariable>
- </EnvironmentVariables>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
</del></span></pre>
</div>
</div>
</body>
</html>