Title: [98377] trunk/Tools
- Revision
- 98377
- Author
- dba...@webkit.org
- Date
- 2011-10-25 12:37:13 -0700 (Tue, 25 Oct 2011)
Log Message
build-webkit --clean should only clean build directory for CMake-based ports
https://bugs.webkit.org/show_bug.cgi?id=70834
Reviewed by Antonio Gomes.
Currently build-webkit --clean both cleans the build directory and builds WebKit for
CMake-based ports. Instead, build-webkit --clean should only clean up the build directory
as per its description in the usage message of build-webkit.
* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98376 => 98377)
--- trunk/Tools/ChangeLog 2011-10-25 19:32:31 UTC (rev 98376)
+++ trunk/Tools/ChangeLog 2011-10-25 19:37:13 UTC (rev 98377)
@@ -1,3 +1,17 @@
+2011-10-25 Daniel Bates <dba...@rim.com>
+
+ build-webkit --clean should only clean build directory for CMake-based ports
+ https://bugs.webkit.org/show_bug.cgi?id=70834
+
+ Reviewed by Antonio Gomes.
+
+ Currently build-webkit --clean both cleans the build directory and builds WebKit for
+ CMake-based ports. Instead, build-webkit --clean should only clean up the build directory
+ as per its description in the usage message of build-webkit.
+
+ * Scripts/webkitdirs.pm:
+ (buildCMakeProjectOrExit):
+
2011-10-25 Anna Cavender <ann...@chromium.org>
Enable running of track layout tests for Chromium
Modified: trunk/Tools/Scripts/webkitdirs.pm (98376 => 98377)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-10-25 19:32:31 UTC (rev 98376)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-10-25 19:37:13 UTC (rev 98377)
@@ -1664,10 +1664,9 @@
{
my ($clean, $port, $prefixPath, $makeArgs, @cmakeArgs) = @_;
my $returnCode;
- if ($clean) {
- $returnCode = exitStatus(cleanCMakeGeneratedProject());
- exit($returnCode) if $returnCode;
- }
+
+ exit(exitStatus(cleanCMakeGeneratedProject())) if $clean;
+
$returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
exit($returnCode) if $returnCode;
$returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
