Changeset 98377 in webkit

Timestamp:

Oct 25, 2011, 12:37:13 PM (15 years ago)

Author:

dbates@webkit.org

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-25  Daniel Bates  <dbates@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  <annacc@chromium.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1665 +1665 @@
     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;