[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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111668 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 52726ccd402c6c8228eb4236781dc7c3678239e8..4d84e4654c6c9a39cfe60f90d738d92dc501c592 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2012-03-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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-22  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, test-webkitpy fix after r111661.

diff --git a/Tools/Scripts/update-webkit-libs-jhbuild b/Tools/Scripts/update-webkit-libs-jhbuild
index 7e2440ad3ee8154c71a25f4c8346d7e4c3e0016d..48343fb3056a1dd5e45d310c59d200dc39b14d88 100755 (executable)
--- a/Tools/Scripts/update-webkit-libs-jhbuild
+++ b/Tools/Scripts/update-webkit-libs-jhbuild
@@ -41,21 +41,18 @@ if (!$getOptionsResult) {
     }
 }
 
+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");

diff --git a/Tools/efl/run-with-jhbuild b/Tools/efl/run-with-jhbuild
index 624191a251669635ba91fd9edda28ff7a5151bc1..8cde7dab4b984ab3385510f93e46b784d85f4421 100755 (executable)
--- a/Tools/efl/run-with-jhbuild
+++ b/Tools/efl/run-with-jhbuild
@@ -21,6 +21,6 @@ import subprocess
 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)

diff --git a/Tools/gtk/run-with-jhbuild b/Tools/gtk/run-with-jhbuild
index fdf6f0f2ad7a9c4fde9a2a3959ca03e859790f46..9ff0034bad58ae51ad189810a052cb17c17276f8 100755 (executable)
--- a/Tools/gtk/run-with-jhbuild
+++ b/Tools/gtk/run-with-jhbuild
@@ -22,6 +22,6 @@ import subprocess
 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)

diff --git a/Tools/jhbuild/jhbuild-wrapper b/Tools/jhbuild/jhbuild-wrapper
index ac4d77c755fe6b08d780e35983ff2f1947b51e43..5b423fe3bd8645c9935bcd1b2ace438d8469b2a2 100755 (executable)
--- a/Tools/jhbuild/jhbuild-wrapper
+++ b/Tools/jhbuild/jhbuild-wrapper
@@ -135,6 +135,6 @@ except ValueError as e:
     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)