- Revision
- 116874
- Author
- [email protected]
- Date
- 2012-05-13 06:40:44 -0700 (Sun, 13 May 2012)
Log Message
Merge 111668 - [GTK] Allow to run any jhbuild command with jhbuild-wrapper script
https://bugs.webkit.org/show_bug.cgi?id=81888
Reviewed by Philippe Normand.
* Scripts/update-webkit-libs-jhbuild:
(runJhbuild): Helper function to run jhbuild with a given command.
Instead of running jhbuild directly, use the jhbuild-wrapper, so
that we don't need to run it first to check whether jhbuild is
installed or not.
* efl/run-with-jhbuild: Call jhbuild-wrapper with run command.
* gtk/run-with-jhbuild: Ditto.
* jhbuild/jhbuild-wrapper: Allow to execute any jhbuild command,
not only run.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116873 => 116874)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:40:28 UTC (rev 116873)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:40:44 UTC (rev 116874)
@@ -1,3 +1,20 @@
+2012-03-22 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Allow to run any jhbuild command with jhbuild-wrapper script
+ https://bugs.webkit.org/show_bug.cgi?id=81888
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/update-webkit-libs-jhbuild:
+ (runJhbuild): Helper function to run jhbuild with a given command.
+ Instead of running jhbuild directly, use the jhbuild-wrapper, so
+ that we don't need to run it first to check whether jhbuild is
+ installed or not.
+ * efl/run-with-jhbuild: Call jhbuild-wrapper with run command.
+ * gtk/run-with-jhbuild: Ditto.
+ * jhbuild/jhbuild-wrapper: Allow to execute any jhbuild command,
+ not only run.
+
2012-03-17 Dominik Röttsches <[email protected]>
[EFL] Add and use run-with-jhbuild and update-webkitefl-libs scripts for EFL
Modified: releases/WebKitGTK/webkit-1.8/Tools/Scripts/update-webkit-libs-jhbuild (116873 => 116874)
--- releases/WebKitGTK/webkit-1.8/Tools/Scripts/update-webkit-libs-jhbuild 2012-05-13 13:40:28 UTC (rev 116873)
+++ releases/WebKitGTK/webkit-1.8/Tools/Scripts/update-webkit-libs-jhbuild 2012-05-13 13:40:44 UTC (rev 116874)
@@ -41,21 +41,18 @@
}
}
+sub runJhbuild
+{
+ my $command = shift;
+ my @jhbuildArgs = ("./jhbuild-wrapper", "--".$platform, $command);
+ push(@jhbuildArgs, @ARGV[2..-1]);
+ system(@jhbuildArgs) == 0 or die "Running jhbuild-wrapper " . $command . " failed.\n";
+}
+
delete $ENV{AR_FLAGS} if exists $ENV{AR_FLAGS};
chdir(relativeScriptsDir() . "/../jhbuild") or die $!;
-my @ensureJhbuildArgs = ("./jhbuild-wrapper", "--".$platform, "echo", "Ensured jhbuild setup.");
-if (system(@ensureJhbuildArgs) != 0) {
- die "Failed to ensure jhbuild installed.\n";
-}
-
-chdir(relativeScriptsDir() . "/../".$platform) or die $!;
-
my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+" );
print "Updating " . $prettyPlatform{$platform} . " port dependencies using jhbuild...\n";
-my @jhbuildArgs = ("../../WebKitBuild/Dependencies/Root/bin/jhbuild", "--no-interact", "-f", "jhbuildrc");
-push(@jhbuildArgs, @ARGV[2..-1]);
-if (system(@jhbuildArgs) != 0) {
- die "Running jhbuild failed.\n"
-}
+runJhbuild("build");
Modified: releases/WebKitGTK/webkit-1.8/Tools/efl/run-with-jhbuild (116873 => 116874)
--- releases/WebKitGTK/webkit-1.8/Tools/efl/run-with-jhbuild 2012-05-13 13:40:28 UTC (rev 116873)
+++ releases/WebKitGTK/webkit-1.8/Tools/efl/run-with-jhbuild 2012-05-13 13:40:44 UTC (rev 116874)
@@ -21,6 +21,6 @@
import sys
jhbuild_wrapper = common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper')
-process = subprocess.Popen([jhbuild_wrapper, '--efl'] + sys.argv[1:])
+process = subprocess.Popen([jhbuild_wrapper, '--efl', 'run'] + sys.argv[1:])
process.wait()
sys.exit(process.returncode)
Modified: releases/WebKitGTK/webkit-1.8/Tools/gtk/run-with-jhbuild (116873 => 116874)
--- releases/WebKitGTK/webkit-1.8/Tools/gtk/run-with-jhbuild 2012-05-13 13:40:28 UTC (rev 116873)
+++ releases/WebKitGTK/webkit-1.8/Tools/gtk/run-with-jhbuild 2012-05-13 13:40:44 UTC (rev 116874)
@@ -22,6 +22,6 @@
import sys
jhbuild_wrapper = common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper')
-process = subprocess.Popen([jhbuild_wrapper, '--gtk'] + sys.argv[1:])
+process = subprocess.Popen([jhbuild_wrapper, '--gtk', 'run'] + sys.argv[1:])
process.wait()
sys.exit(process.returncode)
Modified: releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper (116873 => 116874)
--- releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:40:28 UTC (rev 116873)
+++ releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:40:44 UTC (rev 116874)
@@ -135,6 +135,6 @@
sys.exit(e)
ensure_jhbuild()
-process = subprocess.Popen([jhbuild_path, '--no-interact', '-f', top_level_path('Tools', platform, 'jhbuildrc'), 'run'] + sys.argv[2:])
+process = subprocess.Popen([jhbuild_path, '--no-interact', '-f', top_level_path('Tools', platform, 'jhbuildrc')] + sys.argv[2:])
process.wait()
sys.exit(process.returncode)
