From db0240581320303616f8729030b12cc4e8b8fbee Mon Sep 17 00:00:00 2001 From: "andersca@apple.com" Date: Fri, 19 Feb 2016 00:01:32 +0000 Subject: [PATCH] .: 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. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196783 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 8 + Tools/ChangeLog | 17 ++ Tools/Scripts/webkitdirs.pm | 48 +--- .../All Source (target WebProcess).xcscheme | 213 ------------------ 4 files changed, 27 insertions(+), 259 deletions(-) delete mode 100644 WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme diff --git a/ChangeLog b/ChangeLog index d9adc3be6882..97a65ab3919d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2016-02-18 Anders Carlsson + + Get rid of the "All Source (target WebProcess)" scheme. + + Rubber-stamped by Dan Bernstein. + + * WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme: Removed. + 2016-02-18 Michael Catanzaro [CMake] Remove LLVM support diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 587c34f1cb66..03efcb51b1f7 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,20 @@ +2016-02-18 Anders Carlsson + + 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. + 2016-02-18 Ryan Haddad Skip API test WTF_ParkingLot.UnparkOneFiftyThenFiftyAll on ios-simulator diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index 48ea91b21fdf..179764407866 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -138,8 +138,6 @@ my $isCMakeBuild; my $isWin64; my $isInspectorFrontend; my $portName; -my $shouldTargetWebProcess; -my $shouldUseXPCServiceForWebProcess; my $shouldUseGuardMalloc; my $shouldNotUseNinja; my $xcodeVersion; @@ -1383,30 +1381,6 @@ sub isWindowsNT() return $ENV{'OS'} eq 'Windows_NT'; } -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"); -} - sub debugger { determineDebugger(); @@ -2173,12 +2147,10 @@ Usage: @{[basename($0)]} [options] [args ...] --help Show this help message --no-saved-state Launch the application without state restoration (OS X 10.7 and later) -g|--guard-malloc Enable Guard Malloc (OS X only) - --use-web-process-xpc-service Launch the Web Process as an XPC Service (OS X only) EOF if ($includeOptionsForDebugging) { print STDERR <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; - } + 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; } sub debugSafari diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme deleted file mode 100644 index 55aadffcc9ee..000000000000 --- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.36.0