Title: [168727] releases/WebKitGTK/webkit-2.4
- Revision
- 168727
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:32:43 -0700 (Tue, 13 May 2014)
Log Message
Merge 165473 - [GTK][CMAKE] Too verbose build output
https://bugs.webkit.org/show_bug.cgi?id=130076
Reviewed by Carlos Garcia Campos.
.:
* Source/cmake/OptionsGTK.cmake: Generate a script which does the actual build. This
works around an issue where cmake --build doesn't support ninja's pretty printing.
Tools:
Instead of building with cmake --build which isn't smart about pretty printing and
colors, we build with a script which calls the proper build command.
* Scripts/webkitdirs.pm:
(buildCMakeGeneratedProject): For GTK+ call the script that we generate during
the CMake configuration pass.
Conflicts:
ChangeLog
Tools/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake (168726 => 168727)
--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake 2014-05-13 19:32:37 UTC (rev 168726)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake 2014-05-13 19:32:43 UTC (rev 168727)
@@ -298,3 +298,13 @@
endforeach ()
set(${_list_name} "${${_list_name}_TMP}")
endmacro()
+
+build_command(COMMAND_LINE_TO_BUILD)
+file(WRITE
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh
+ "#!/bin/sh\n"
+ "${COMMAND_LINE_TO_BUILD} $@"
+)
+file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh
+ DESTINATION ${CMAKE_BINARY_DIR}
+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (168726 => 168727)
--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-13 19:32:37 UTC (rev 168726)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-13 19:32:43 UTC (rev 168727)
@@ -2018,13 +2018,23 @@
if (! -d $buildPath) {
die "Must call generateBuildSystemFromCMakeProject() before building CMake project.";
}
+
+ my $command = "cmake";
my @args = ("--build", $buildPath, "--config", $config);
push @args, ("--", $makeArgs) if $makeArgs;
+ # GTK uses a build script to preserve colors and pretty-printing.
+ if (isGtk()) {
+ chdir "$buildPath" or die;
+ $command = "$buildPath/build.sh";
+ @args = ($makeArgs);
+ }
+
# 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(" ", jhbuildWrapperPrefixIfNeeded()) . " ";
- return system($wrapper . "cmake @args");
+ return system($wrapper . "$command @args");
+
}
sub cleanCMakeGeneratedProject()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
