Modified: trunk/Tools/.gitattributes (268489 => 268490)
--- trunk/Tools/.gitattributes 2020-10-14 21:48:50 UTC (rev 268489)
+++ trunk/Tools/.gitattributes 2020-10-14 22:10:11 UTC (rev 268490)
@@ -1,4 +1,3 @@
-WebKitLauncher/*.h diff=objcppheader
BuildSlaveSupport/win/kill-old-processes -crlf
DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
FindSafari/Safari.exe.manifest -crlf
Deleted: trunk/Tools/BuildSlaveSupport/build-launcher-app (268489 => 268490)
--- trunk/Tools/BuildSlaveSupport/build-launcher-app 2020-10-14 21:48:50 UTC (rev 268489)
+++ trunk/Tools/BuildSlaveSupport/build-launcher-app 2020-10-14 22:10:11 UTC (rev 268490)
@@ -1,121 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright (C) 2006 Apple Inc. All rights reserved.
-# Copyright (C) 2006 Mark Rowe <[email protected]>. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Creates the launcher WebKit.app with bundled frameworks.
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/../Scripts";
-use webkitdirs;
-
-my @xcodeBuildArguments = XcodeOptions();
-my $nightlyLauncherTemplatePath = "$FindBin::Bin/../WebKitLauncher";
-my $nightlyLauncherStagingPath = productDir() . "/WebKit.app";
-
-sub buildNightlyLauncher
-{
- chdir($nightlyLauncherTemplatePath);
- system("xcodebuild", "clean", "-alltargets", @xcodeBuildArguments, @ARGV) == 0 or die "Failed cleaning WebKitLauncher project";
- system("xcodebuild", @xcodeBuildArguments, @ARGV) == 0 or die "Failed building WebKitLauncher project";
- chdirWebKit();
-}
-
-sub currentRevision
-{
- my $sourceDir = sourceDir();
- if (isSVNDirectory($sourceDir)) {
- return currentSVNRevision();
- } elsif (isGitDirectory($sourceDir)) {
- my $gitLog = `cd $sourceDir && LC_ALL=C git log --grep='git-svn-id: ' -n 1 | grep git-svn-id:`;
- (my $revision) = ($gitLog =~ m/ +git-svn-id: .+@(\d+) /g);
- return $revision;
- }
-}
-
-sub currentBranch
-{
- my $sourceDir = sourceDir();
- my ($url, $branch);
- if (isSVNDirectory($sourceDir)) {
- my $svnInfo = `LC_ALL=C svn info $sourceDir | grep URL:`;
- ($url) = ($svnInfo =~ m/URL: (.+)/g);
- } elsif (isGitDirectory($sourceDir)) {
- my $gitLog = `cd $sourceDir && LC_ALL=C git log --grep='git-svn-id: ' -n 1 | grep git-svn-id:`;
- ($url) = ($gitLog =~ m/ +git-svn-id: (.+)@\d+ /g);
- }
- ($branch) = ($url =~ m/\/webkit\/(trunk|branches\/[^\/]+)/);
- die "Unable to determine current SVN branch in $sourceDir" unless (defined $branch);
- $branch =~ s/^branches\///;
- return $branch;
-}
-
-sub copyNightlyLauncher
-{
- my $revision = currentRevision();
- my $branch = currentBranch();
-
- my $infoPlist = "$nightlyLauncherStagingPath/Contents/Info.plist";
- my $versionFile = "$nightlyLauncherStagingPath/Contents/Resources/VERSION";
- my $branchFile = "$nightlyLauncherStagingPath/Contents/Resources/BRANCH";
- my $data;
- open(IN, $infoPlist) or die "Couldn't open Info.plist in built application for reading";
- {
- undef $/;
- $data = ""
- }
- close(IN);
- open(OUT, ">$infoPlist") or die "Couldn't open Info.plist in built application for writing";
- $data =~ s/VERSION/$revision/g;
- print OUT $data;
- close(OUT);
-
- open(OUT, ">$versionFile") or die "Couldn't open VERSION in built application for writing";
- print OUT "$revision\n";
- close(OUT);
-
- open(OUT, ">$branchFile") or die "Couldn't open BRANCH in built application for writing";
- print OUT "$branch\n";
- close(OUT);
-
- my @frameworks = ("_javascript_Core", "WebCore", "WebKit");
- for my $framework (@frameworks) {
- system("ditto", productDir() . "/$framework.framework", "$nightlyLauncherStagingPath/Contents/Resources/$framework.framework") == 0 or die "Failed copying $framework.framework into $nightlyLauncherStagingPath";
- }
-}
-
-my $b = currentBranch();
-my $r = currentRevision();
-print "Branch: ", $b, "\n";
-print "Revision: ", $r, "\n";
-
-chdirWebKit();
-buildNightlyLauncher();
-copyNightlyLauncher();
Modified: trunk/Tools/ChangeLog (268489 => 268490)
--- trunk/Tools/ChangeLog 2020-10-14 21:48:50 UTC (rev 268489)
+++ trunk/Tools/ChangeLog 2020-10-14 22:10:11 UTC (rev 268490)
@@ -1,3 +1,17 @@
+2020-10-14 Alexey Proskuryakov <[email protected]>
+
+ Remove WebKitLauncher
+ https://bugs.webkit.org/show_bug.cgi?id=217729
+
+ Reviewed by Darin Adler.
+
+ This is part of long defunct nightly build infrastructure.
+
+ * .gitattributes:
+ * BuildSlaveSupport/build-launcher-app: Removed.
+ * Scripts/webkitpy/style/checkers/sdkvariant.py:
+ * WebKitLauncher: Removed.
+
2020-10-14 Commit Queue <[email protected]>
Unreviewed, reverting r268431 and r268443.
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py (268489 => 268490)
--- trunk/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py 2020-10-14 21:48:50 UTC (rev 268489)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py 2020-10-14 22:10:11 UTC (rev 268490)
@@ -33,7 +33,6 @@
"Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig",
"Tools/WebEditingTester/Configurations/SDKVariant.xcconfig",
"Tools/MiniBrowser/Configurations/SDKVariant.xcconfig",
- "Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig",
"Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig",
"Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig",
"Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig",
