Title: [212298] trunk/Tools
- Revision
- 212298
- Author
- clo...@igalia.com
- Date
- 2017-02-14 08:46:49 -0800 (Tue, 14 Feb 2017)
Log Message
[CMake] build-webkit should print the cmake command executed
https://bugs.webkit.org/show_bug.cgi?id=168318
Reviewed by Michael Catanzaro.
Run the cmake commands to configure or start the build through
a wrapper that prints the command before executing it.
* Scripts/webkitdirs.pm:
(systemVerbose):
(generateBuildSystemFromCMakeProject):
(buildCMakeGeneratedProject):
(cleanCMakeGeneratedProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (212297 => 212298)
--- trunk/Tools/ChangeLog 2017-02-14 16:33:24 UTC (rev 212297)
+++ trunk/Tools/ChangeLog 2017-02-14 16:46:49 UTC (rev 212298)
@@ -1,3 +1,19 @@
+2017-02-14 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [CMake] build-webkit should print the cmake command executed
+ https://bugs.webkit.org/show_bug.cgi?id=168318
+
+ Reviewed by Michael Catanzaro.
+
+ Run the cmake commands to configure or start the build through
+ a wrapper that prints the command before executing it.
+
+ * Scripts/webkitdirs.pm:
+ (systemVerbose):
+ (generateBuildSystemFromCMakeProject):
+ (buildCMakeGeneratedProject):
+ (cleanCMakeGeneratedProject):
+
2017-02-14 Jonathan Bedard <jbed...@apple.com>
run-webkit-tests for iOS Simulator always complains that stopping WebKitTestRunnerApp.app times out
Modified: trunk/Tools/Scripts/webkitdirs.pm (212297 => 212298)
--- trunk/Tools/Scripts/webkitdirs.pm 2017-02-14 16:33:24 UTC (rev 212297)
+++ trunk/Tools/Scripts/webkitdirs.pm 2017-02-14 16:46:49 UTC (rev 212298)
@@ -287,6 +287,11 @@
}
}
+sub systemVerbose {
+ print "+ @_\n";
+ return system(@_);
+}
+
sub setBaseProductDir($)
{
($baseProductDir) = @_;
@@ -1967,7 +1972,7 @@
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
# parsed for shell metacharacters.
my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " ";
- my $returnCode = system($wrapper . "cmake @args");
+ my $returnCode = systemVerbose($wrapper . "cmake @args");
chdir($originalWorkingDirectory);
return $returnCode;
@@ -2001,7 +2006,7 @@
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
# parsed for shell metacharacters. In particular, $makeArgs may contain such metacharacters.
my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " ";
- return system($wrapper . "$command @args");
+ return systemVerbose($wrapper . "$command @args");
}
sub cleanCMakeGeneratedProject()
@@ -2009,7 +2014,7 @@
my $config = configuration();
my $buildPath = File::Spec->catdir(baseProductDir(), $config);
if (-d $buildPath) {
- return system("cmake", "--build", $buildPath, "--config", $config, "--target", "clean");
+ return systemVerbose("cmake", "--build", $buildPath, "--config", $config, "--target", "clean");
}
return 0;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
