Title: [168725] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm
- Revision
- 168725
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:32:29 -0700 (Tue, 13 May 2014)
Log Message
Merge 165457 - [GTK][CMake] --update-gtk has no effect
https://bugs.webkit.org/show_bug.cgi?id=130088
Patch by Gustavo Noronha Silva <gustavo.noro...@collabora.com> on 2014-03-11
Reviewed by Philippe Normand.
* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit): call update-webkitgtk-libs if --update-gtk has been passed
as an argument.
Conflicts:
Tools/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (168724 => 168725)
--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-13 19:32:26 UTC (rev 168724)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-13 19:32:29 UTC (rev 168725)
@@ -2048,6 +2048,10 @@
system("perl", "$sourceDir/Tools/Scripts/update-webkitefl-libs") == 0 or die $!;
}
+ if (isGtk() && checkForArgumentAndRemoveFromARGV("--update-gtk")) {
+ system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
+ }
+
$returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
exit($returnCode) if $returnCode;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
