Title: [105142] trunk/Tools
- Revision
- 105142
- Author
- [email protected]
- Date
- 2012-01-17 04:29:38 -0800 (Tue, 17 Jan 2012)
Log Message
GTK+ EWS needs to run update-webkitgtk-libs after applying a patch
https://bugs.webkit.org/show_bug.cgi?id=75857
Patch by Gustavo Noronha Silva <[email protected]> on 2012-01-16
Reviewed by Adam Barth.
* Scripts/webkitdirs.pm:
(buildAutotoolsProject): move cleaning the build to happen early,
and handle --update-gtk right after that
* Scripts/webkitpy/common/config/ports.py:
(GtkPort.build_webkit_command): pass --update-gtk as an option to
build-webkit, so that it is used in the EWS
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105141 => 105142)
--- trunk/Tools/ChangeLog 2012-01-17 12:20:27 UTC (rev 105141)
+++ trunk/Tools/ChangeLog 2012-01-17 12:29:38 UTC (rev 105142)
@@ -1,3 +1,17 @@
+2012-01-16 Gustavo Noronha Silva <[email protected]>
+
+ GTK+ EWS needs to run update-webkitgtk-libs after applying a patch
+ https://bugs.webkit.org/show_bug.cgi?id=75857
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitdirs.pm:
+ (buildAutotoolsProject): move cleaning the build to happen early,
+ and handle --update-gtk right after that
+ * Scripts/webkitpy/common/config/ports.py:
+ (GtkPort.build_webkit_command): pass --update-gtk as an option to
+ build-webkit, so that it is used in the EWS
+
2012-01-16 Tor Arne Vestbø <[email protected]>
[Qt] Don't add _debug postfix to targets when building debug only
Modified: trunk/Tools/Scripts/webkitdirs.pm (105141 => 105142)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-01-17 12:20:27 UTC (rev 105141)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-01-17 12:29:38 UTC (rev 105142)
@@ -1838,6 +1838,25 @@
my $config = passedConfiguration() || configuration();
my $prefix;
+ # Use rm to clean the build directory since distclean may miss files
+ if ($clean && -d $dir) {
+ system "rm", "-rf", "$dir";
+ }
+
+ if (! -d $dir) {
+ File::Path::mkpath($dir) or die "Failed to create build directory " . $dir
+ }
+ chdir $dir or die "Failed to cd into " . $dir . "\n";
+
+ if ($clean) {
+ return 0;
+ }
+
+ # We might need to update jhbuild dependencies.
+ if (checkForArgumentAndRemoveFromArrayRef("--update-gtk", \@buildParams)) {
+ system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
+ }
+
my @buildArgs = ();
my $makeArgs = $ENV{"WebKitMakeArguments"} || "";
for my $i (0 .. $#buildParams) {
@@ -1873,20 +1892,6 @@
push @buildArgs, "--disable-debug";
}
- # Use rm to clean the build directory since distclean may miss files
- if ($clean && -d $dir) {
- system "rm", "-rf", "$dir";
- }
-
- if (! -d $dir) {
- File::Path::mkpath($dir) or die "Failed to create build directory " . $dir
- }
- chdir $dir or die "Failed to cd into " . $dir . "\n";
-
- if ($clean) {
- return 0;
- }
-
# If GNUmakefile exists, don't run autogen.sh unless its arguments
# have changed. The makefile should be smart enough to track autotools
# dependencies and re-run autogen.sh when build files change.
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (105141 => 105142)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-01-17 12:20:27 UTC (rev 105141)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-01-17 12:29:38 UTC (rev 105142)
@@ -172,6 +172,7 @@
def build_webkit_command(cls, build_style=None):
command = WebKitPort.build_webkit_command(build_style=build_style)
command.append("--gtk")
+ command.append("--update-gtk")
command.append(WebKitPort.makeArgs())
return command
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
