Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Unified Diff: bootstrap/gclient.bat

Issue 9751009: Fix git depot_tools update flow. (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools
Patch Set: fix to unix endlines Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « README ('k') | bootstrap/gclient.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bootstrap/gclient.bat
diff --git a/bootstrap/gclient.bat b/bootstrap/gclient.bat
index aff14dc5623858fa662f1f2cce4d1862a5f2247c..deef8608ca3a3938d82eb9e31b8b8ec6dc62117e 100644
--- a/bootstrap/gclient.bat
+++ b/bootstrap/gclient.bat
@@ -1,10 +1,22 @@
-@echo off
-:: Copyright (c) 2009 The Chromium Authors. All rights reserved.
-:: Use of this source code is governed by a BSD-style license that can be
-:: found in the LICENSE file.
-
-:: Synchronize the root directory before deferring control back up to it.
-call "%~dp0\update_depot_tools.bat"
-
-:: Defer control.
-python "%~dp0\..\gclient.py" %*
+@echo off
+:: Copyright (c) 2012 The Chromium Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that can be
+:: found in the LICENSE file.
+
+:: IMPORTANT NOTE:
+:: The bootstrap flow has been removed. This file's only purpose is to make the
+:: transition smooth as the previous update script called bootstrap\gclient.bat
+:: The current flow took place on March 21, 2012. This file should be removed
+:: when it is believed everyone has updated since then.
+
+:: At this point we know %DEPOT_TOOLS_UPDATE% != 0 as in the previous script
+:: bootstrap\gclient.bat was only called if this was the case.
+
+:: Update the root directory. The previous version only supported svn so there
+:: is no need looking for git here (i.e. if someone has git they can't get to
+:: this point where the bootstrap dir is gone during the update anyways...)
+IF NOT EXIST "%~dp0..\.svn\." GOTO :EOF
+call svn up -q "%~dp0.."
+
+:: Call the updated gclient.bat in the root directory to wrap the update.
+call "%~dp0..\gclient.bat"
« no previous file with comments | « README ('k') | bootstrap/gclient.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698