Changeset 52183 in webkit

Timestamp:

Dec 15, 2009 4:51:47 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-15 Yaar Schnitman <​yaar@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/update-webkit-chromium (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-15  Yaar Schnitman  <yaar@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@webkit.org>
 

trunk/WebKitTools/Scripts/update-webkit-chromium

@@ -29 +29 @@
 # 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 $!;
@@ -49 +53 @@
 # 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 $!;