Title: [111802] trunk/Tools
- Revision
- 111802
- Author
- [email protected]
- Date
- 2012-03-22 18:25:10 -0700 (Thu, 22 Mar 2012)
Log Message
[CMake] Fix build-jsc after r111778 and r111797.
https://bugs.webkit.org/show_bug.cgi?id=82001
Reviewed by Filip Pizlo.
Contrary to the comment in build-jsc, buildCMakeProjectOrExit()
does return if no error occurred, and build-jsc failed with
"building not defined for this platform".
* Scripts/build-jsc: Always exit after caling
buildCMakeProjectOrExit().
* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit): Return 0 if no error occurred.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111801 => 111802)
--- trunk/Tools/ChangeLog 2012-03-23 01:04:07 UTC (rev 111801)
+++ trunk/Tools/ChangeLog 2012-03-23 01:25:10 UTC (rev 111802)
@@ -1,5 +1,21 @@
2012-03-22 Raphael Kubo da Costa <[email protected]>
+ [CMake] Fix build-jsc after r111778 and r111797.
+ https://bugs.webkit.org/show_bug.cgi?id=82001
+
+ Reviewed by Filip Pizlo.
+
+ Contrary to the comment in build-jsc, buildCMakeProjectOrExit()
+ does return if no error occurred, and build-jsc failed with
+ "building not defined for this platform".
+
+ * Scripts/build-jsc: Always exit after caling
+ buildCMakeProjectOrExit().
+ * Scripts/webkitdirs.pm:
+ (buildCMakeProjectOrExit): Return 0 if no error occurred.
+
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
[CMake] Unreviewed build fix after r111778.
* DumpRenderTree/efl/CMakeLists.txt: Replace
Modified: trunk/Tools/Scripts/build-jsc (111801 => 111802)
--- trunk/Tools/Scripts/build-jsc 2012-03-23 01:04:07 UTC (rev 111801)
+++ trunk/Tools/Scripts/build-jsc 2012-03-23 01:25:10 UTC (rev 111802)
@@ -67,7 +67,8 @@
my $result = buildQMakeProjects(\@projects, 0, @ARGV);
exit exitStatus($result);
} elsif (cmakeBasedPortName()) {
- buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, undef, ("-DONLY_BUILD_JAVASCRIPTCORE=1", cmakeBasedPortArguments())); # This call never returns.
+ buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, undef, ("-DONLY_BUILD_JAVASCRIPTCORE=1", cmakeBasedPortArguments())); # This call only returns if nothing wrong happened
+ exit exitStatus(0);
}
sub buildMyProject
Modified: trunk/Tools/Scripts/webkitdirs.pm (111801 => 111802)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-03-23 01:04:07 UTC (rev 111801)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-23 01:25:10 UTC (rev 111802)
@@ -2042,6 +2042,7 @@
exit($returnCode) if $returnCode;
$returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
exit($returnCode) if $returnCode;
+ return 0;
}
sub cmakeBasedPortArguments()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
