[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 9511d1919cf87ac00f7e122231070845c0313a73
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 00:51:47 2009 +0000

    2009-12-15  Yaar Schnitman  <yaar at chromium.org>
    
            Reviewed by Darin Fisher.
    
            update-webkit-chromium to auto-install gclient
    
            https://bugs.webkit.org/show_bug.cgi?id=32587
    
            * Scripts/update-webkit-chromium:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52183 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 85f190d..d1a743d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-15  Yaar Schnitman  <yaar at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        update-webkit-chromium to auto-install gclient
+
+        https://bugs.webkit.org/show_bug.cgi?id=32587
+
+        * Scripts/update-webkit-chromium:
+
 2009-12-15  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/update-webkit-chromium b/WebKitTools/Scripts/update-webkit-chromium
index 779b9a6..fa94f8c 100755
--- a/WebKitTools/Scripts/update-webkit-chromium
+++ b/WebKitTools/Scripts/update-webkit-chromium
@@ -28,24 +28,28 @@
 
 # Update script for the WebKit Chromium Port.
 
-# Check if gclient is installed.
-if (not `gclient --version`) {
-    print STDERR "gclient is required for updating chromium dependencies.\n";
-    print STDERR "Install depot_tools and add gclient to the environment\n";
-    print STDERR "path. For more information, refer to:\n";
-    print STDERR "http://dev.chromium.org/developers/how-tos/install-gclient\n";
-    die;
+chdir("WebKit/chromium") or die $!;
+
+# Find gclient or install it.
+my $gclientPath;
+if (`gclient --version`) {
+    $gclientPath = 'gclient';
+} elsif (-e 'depot_tools/gclient') {
+    $gclientPath = 'depot_tools/gclient';
+} else {
+    print "Installing chromium's depot_tools...\n";
+    system("svn co http://src.chromium.org/svn/trunk/tools/depot_tools") == 0 or die $1;
+    $gclientPath = 'depot_tools/gclient';
 }
 
-chdir("WebKit/chromium") or die $!;
 if (! -e ".gclient") {
     # If .gclient configuration file doesn't exist, create it.
     print "Configuring gclient...\n";
-    system("gclient", 
+    system($gclientPath, 
            "config", 
            "--spec=solutions=[{'name':'./','url':None}]") == 0 or die $!;
 }
 
 # Execute gclient sync.
 print "Updating chromium port dependencies using gclient...\n";
-system("gclient", "sync", "--force") == 0 or die $!;
+system($gclientPath, "sync", "--force") == 0 or die $!;

-- 
WebKit Debian packaging