Commit 54b6b95a authored by eseidel's avatar eseidel

2006-10-03 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed by eseidel.  Landed by eseidel.

        Offer a way for BuildBot to not colorize the cmake output, when building
        with the 'build-webkit' script. Add "--color" / "--no-color" option pair.

        Default is colorize output, though only Qt platform handles this for now.

        * Scripts/build-dumprendertree:
        * Scripts/build-webkit:
        * Scripts/webkitdirs.pm:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16736 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3b0d9c94
2006-10-03 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by eseidel. Landed by eseidel.
Offer a way for BuildBot to not colorize the cmake output, when building
with the 'build-webkit' script. Add "--color" / "--no-color" option pair.
Default is colorize output, though only Qt platform handles this for now.
* Scripts/build-dumprendertree:
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
2006-10-03 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by eseidel. Landed by eseidel.
......
......@@ -50,7 +50,7 @@ if (isOSX()) {
$result = buildVisualStudioProject("DumpRenderTree");
} elsif (isQt()) {
# Qt/Linux builds everything in one-shot.
$result = buildCMakeProject("WebKit");
$result = buildCMakeProject("WebKit", 1);
} else {
die "Building not defined for this platform!\n";
}
......
......@@ -36,11 +36,15 @@ use webkitdirs;
use POSIX;
my $svgSupport = 1;
GetOptions('svg!' => \$svgSupport);
my $colorSupport = 1; # Default: colorize make output
GetOptions('svg!' => \$svgSupport,
'color!' => \$colorSupport);
checkRequiredSystemConfig();
setConfiguration();
chdirWebKit();
my $productDir = productDir();
my @options = XcodeOptions();
my @additionalWebCoreOptions = ();
......@@ -96,7 +100,7 @@ for my $dir (@projects) {
}
} elsif (isQt()) {
if ($dir eq "WebKit") {
$result = buildCMakeProject($dir);
$result = buildCMakeProject($dir, $colorSupport);
}
}
......
......@@ -388,21 +388,26 @@ sub buildVisualStudioProject($)
return $result;
}
sub buildCMakeProject($)
sub buildCMakeProject($$)
{
my ($project) = @_;
my ($project, $colorize) = @_;
if ($project ne "WebKit") {
die "Qt/Linux builds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
}
my $config = configuration();
print "Calling 'cmake -DCMAKE_BUILD_TYPE=$config ../' in " . baseProductDir() . "/$config ...\n\n";
my @buildArgs = ("-DCMAKE_BUILD_TYPE=$config");
push @buildArgs, "-DWEBKIT_DO_NOT_USE_COLORFUL_OUTPUT=" . ($colorize ? "OFF" : "ON");
push @buildArgs, "../../";
print "Calling 'cmake @buildArgs' in " . baseProductDir() . "/$config ...\n\n";
system "mkdir -p " . baseProductDir() . "/$config";
chdir baseProductDir() . "/$config" or die "Failed to cd into " . baseProductDir() . "/$config \n";
my $result = system "cmake", "-DCMAKE_BUILD_TYPE=$config", "../../";
my $result = system "cmake", @buildArgs;
if($result ne 0) {
die "Failed to setup build environment using cmake!\n";
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment