From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Fri, 21 May 2010 16:53:46 +0100 Subject: Merge WebKit at r59636: Initial merge by git Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91 --- WebKitTools/Scripts/build-dumprendertree | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'WebKitTools/Scripts/build-dumprendertree') diff --git a/WebKitTools/Scripts/build-dumprendertree b/WebKitTools/Scripts/build-dumprendertree index 6502916..87c720f 100755 --- a/WebKitTools/Scripts/build-dumprendertree +++ b/WebKitTools/Scripts/build-dumprendertree @@ -70,20 +70,9 @@ if (isAppleMacWebKit()) { $result = buildXCodeProject("DumpRenderTree", $clean, XcodeOptions(), @ARGV); } elsif (isAppleWinWebKit()) { $result = buildVisualStudioProject("DumpRenderTree.sln", $clean); -} elsif (isQt() || isGtk() || isWx()) { - # Qt, Gtk and wxWindows build everything in one shot. No need to build anything here. +} elsif (isQt() || isGtk() || isWx() || isChromium()) { + # Qt, Gtk wxWindows, and Chromium build everything in one shot. No need to build anything here. $result = 0; -} elsif (isChromium()) { - if (isDarwin()) { - $result = buildXCodeProject("DumpRenderTree.gyp/DumpRenderTree", $clean, "-configuration", configuration(), @ARGV); - } elsif (isCygwin() || isWindows()) { - # Windows build - builds the root visual studio solution. - $result = buildChromiumVisualStudioProject("DumpRenderTree.gyp/DumpRenderTree.sln", $clean); - } elsif (isLinux()) { - $result = buildChromiumMakefile("../../WebKit/chromium/", "DumpRenderTree", $clean); - } else { - die "This platform is not supported by Chromium.\n"; - } } else { die "Building not defined for this platform!\n"; } -- cgit v1.1