summaryrefslogtreecommitdiff
path: root/Tools/Scripts/update-webkitgtk-libs
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/Scripts/update-webkitgtk-libs')
-rwxr-xr-xTools/Scripts/update-webkitgtk-libs18
1 files changed, 3 insertions, 15 deletions
diff --git a/Tools/Scripts/update-webkitgtk-libs b/Tools/Scripts/update-webkitgtk-libs
index 8033c62eb..792cc28ab 100755
--- a/Tools/Scripts/update-webkitgtk-libs
+++ b/Tools/Scripts/update-webkitgtk-libs
@@ -1,5 +1,6 @@
#!/usr/bin/perl -w
# Copyright (C) 2011 Igalia S.L.
+# Copyright (C) 2012 Intel Corporation
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -19,18 +20,5 @@ use FindBin;
use lib $FindBin::Bin;
use webkitdirs;
-delete $ENV{AR_FLAGS} if exists $ENV{AR_FLAGS};
-
-chdir(relativeScriptsDir() . "/../gtk") or die $!;
-
-my @ensureJhbuildArgs = ("./run-with-jhbuild", "echo", "Ensured jhbuild setup.");
-if (system(@ensureJhbuildArgs) != 0) {
- die "Failed to ensure jhbuild installed.\n";
-}
-
-print "Updating GTK+ port dependencies using jhbuild...\n";
-my @jhbuildArgs = ("../../WebKitBuild/Dependencies/Root/bin/jhbuild", "--no-interact", "-f", "jhbuildrc");
-push(@jhbuildArgs, @ARGV[1..-1]);
-if (system(@jhbuildArgs) != 0) {
- die "Running jhbuild failed.\n"
-}
+my $scriptsDir = relativeScriptsDir();
+system("perl", "$scriptsDir/update-webkit-libs-jhbuild", "--gtk", @ARGV) == 0 or die $!;