Title: [149166] trunk/Tools
- Revision
- 149166
- Author
- [email protected]
- Date
- 2013-04-25 21:50:30 -0700 (Thu, 25 Apr 2013)
Log Message
Remove support for Chromium from build/update scripts
https://bugs.webkit.org/show_bug.cgi?id=115218
Patch by Seokju Kwon <[email protected]> on 2013-04-25
Reviewed by Darin Adler.
* Scripts/build-webkit:
(writeCongrats):
* Scripts/update-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (149165 => 149166)
--- trunk/Tools/ChangeLog 2013-04-26 02:47:26 UTC (rev 149165)
+++ trunk/Tools/ChangeLog 2013-04-26 04:50:30 UTC (rev 149166)
@@ -1,5 +1,16 @@
2013-04-25 Seokju Kwon <[email protected]>
+ Remove support for Chromium from build/update scripts
+ https://bugs.webkit.org/show_bug.cgi?id=115218
+
+ Reviewed by Darin Adler.
+
+ * Scripts/build-webkit:
+ (writeCongrats):
+ * Scripts/update-webkit:
+
+2013-04-25 Seokju Kwon <[email protected]>
+
Remove support for Chromium from api-test
https://bugs.webkit.org/show_bug.cgi?id=115211
Modified: trunk/Tools/Scripts/build-webkit (149165 => 149166)
--- trunk/Tools/Scripts/build-webkit 2013-04-26 02:47:26 UTC (rev 149165)
+++ trunk/Tools/Scripts/build-webkit 2013-04-26 04:50:30 UTC (rev 149166)
@@ -117,8 +117,6 @@
--coverage Enable Code Coverage support (Mac only)
--blackberry Build the BlackBerry port on Mac/Linux
- --chromium Build the Chromium port on Mac/Win/Linux
- --chromium-android Build the Chromium port on Android
--efl Build the EFL port
--gtk Build the GTK+ port
--qt Build the Qt port
@@ -281,30 +279,6 @@
my $result = 0;
-if (isChromium()) {
- # Currently chromium does not honour the features passed to build-webkit.
- # Until this is solved, we issue a warning about that.
- foreach (@features) {
- if (${$_->{value}} ne $_->{default}) {
- print "\n";
- print "===========================================================\n";
- print " Chromium does not honor the features passed to build-webkit.\n";
- print " The preferred way is to set up your overrides in ~/.gyp/include.gypi.\n";
- print " See https://trac.webkit.org/wiki/Chromium#Buildingwithfeaturedefines\n";
- print " on how to do that.\n";
- print "===========================================================\n";
- last;
- }
- }
-
- @options = @ARGV;
- # Chromium doesn't build by project directories.
- @projects = ();
- push @options, "--makeargs=" . $makeArgs if $makeArgs;
- $result = buildChromium($clean, @options);
- exit exitStatus($result) if exitStatus($result);
-}
-
if (isEfl()) {
# By default we build using all of the available CPUs.
$makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
@@ -438,9 +412,7 @@
print "\n";
print "====================================================================\n";
print " WebKit is now built ($buildTime). \n";
- if (!isChromium()) {
- print " To run $launcherName with this newly-built code, use the\n";
- print " \"$launcherPath\" script.\n";
- }
+ print " To run $launcherName with this newly-built code, use the\n";
+ print " \"$launcherPath\" script.\n";
print "====================================================================\n";
}
Modified: trunk/Tools/Scripts/update-webkit (149165 => 149166)
--- trunk/Tools/Scripts/update-webkit 2013-04-26 02:47:26 UTC (rev 149165)
+++ trunk/Tools/Scripts/update-webkit 2013-04-26 04:50:30 UTC (rev 149166)
@@ -46,11 +46,7 @@
my $quiet = '';
my $showHelp;
my $useGYP = 0;
-my $useMake = 0;
-my $useNinja = -1; # -1: Let update-webkit-chromium pick the default.
-determineIsChromium();
-determineIsChromiumAndroid();
determineIsQt();
determineIsWinCairo();
@@ -60,17 +56,11 @@
'h|help' => \$showHelp,
'q|quiet' => \$quiet,
'gyp' => \$useGYP,
- 'make' => \$useMake,
- 'ninja!' => \$useNinja,
);
if (!$getOptionsResult || $showHelp) {
print STDERR <<__END__;
Usage: @{[ basename($0) ]} [options]
- --chromium also update dependencies of the chromium port
- --make generate the Makefile-based build system (Chromium only)
- --[no-]ninja generate the ninja-based build system (Chromium only)
- --chromium-android also update dependencies of the chromium port for Android
-h|--help show the help message
-q|--quiet pass -q to svn update for quiet updates
--gyp generate project files from gyp after update
@@ -79,10 +69,6 @@
exit 1;
}
-if ($useMake) {
- $ENV{"GYP_GENERATORS"} = "make";
-}
-
my @svnOptions = ();
push @svnOptions, '-q' if $quiet;
@@ -98,13 +84,6 @@
print "Updating Internal\n" unless $quiet;
runSvnUpdate() if isSVNDirectory(".");
runGitUpdate() if isGitDirectory(".");
-} elsif (isChromium()) {
- my @chromiumUpdateArgs = ("perl", "Tools/Scripts/update-webkit-chromium");
- push @chromiumUpdateArgs, "--chromium-android" if isChromiumAndroid();
- push @chromiumUpdateArgs, "--force" if forceChromiumUpdate();
- push @chromiumUpdateArgs, "--ninja" if $useNinja == 1;
- push @chromiumUpdateArgs, "--no-ninja" if $useNinja == 0;
- system(@chromiumUpdateArgs) == 0 or die $!;
} elsif (isAppleWinWebKit()) {
system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
if (isWinCairo()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
