From d3e9467c4f5ad259d4ddd3c60dc7d921e6a87db6 Mon Sep 17 00:00:00 2001 From: "kov@webkit.org" Date: Tue, 17 Jan 2012 12:29:38 +0000 Subject: [PATCH] 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 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 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105142 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 14 ++++++++++++ Tools/Scripts/webkitdirs.pm | 33 +++++++++++++++------------ Tools/Scripts/webkitpy/common/config/ports.py | 1 + 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index b0e207e..86c4edb 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,17 @@ +2012-01-16 Gustavo Noronha Silva + + 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ø [Qt] Don't add _debug postfix to targets when building debug only diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index cf81c1a..ecf85ee 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -1838,6 +1838,25 @@ sub buildAutotoolsProject($@) 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 @@ sub buildAutotoolsProject($@) 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. diff --git a/Tools/Scripts/webkitpy/common/config/ports.py b/Tools/Scripts/webkitpy/common/config/ports.py index 3e100b0..7e967f1 100644 --- a/Tools/Scripts/webkitpy/common/config/ports.py +++ b/Tools/Scripts/webkitpy/common/config/ports.py @@ -172,6 +172,7 @@ class GtkPort(WebKitPort): 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 -- 2.7.4