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

Unified Diff: 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 | « bootstrap/update_depot_tools.bat ('k') | update_depot_tools » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient.bat
diff --git a/gclient.bat b/gclient.bat
index 6860903962b65e0e1ae629cb50b2431e2f9b6f8b..0afd517236758d4eeb400251500411dcf7bb9a40 100755
--- a/gclient.bat
+++ b/gclient.bat
@@ -1,43 +1,10 @@
-@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.
-
-:: This file is a stub to sync .\bootstrap first and defer control to
-:: .\bootstrap\gclient.bat, which will sync back '.'. This is unless auto
-:: update is disabled, were gclient.py is directly called.
-setlocal
-
-:: This is required with cygwin only.
-PATH=%~dp0;%PATH%
-
-:: Will download svn and python.
-:: If you don't want to install the depot_tools version of these tools, remove
-:: the 'force' option on the next command. The tools won't be installed only if
-:: not already in the PATH environment variable.
-call "%~dp0bootstrap\win\win_tools.bat" force
-if errorlevel 1 goto :EOF
-
-:: Shall skip automatic update?
-IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :SKIP_UPDATE
-:: We can't sync if .\.svn\. doesn't exist.
-IF NOT EXIST "%~dp0.svn\." GOTO :SKIP_UPDATE
-
-:: Sync the bootstrap directory.
-call svn up -q "%~dp0bootstrap"
-:: still continue even in case of error.
-goto :UPDATE
-
-
-:SKIP_UPDATE
-:: Don't bother to try to update any thing.
-python "%~dp0\gclient.py" %*
-goto :EOF
-
-
-:UPDATE
-:: Transfer control to ease the update process. The following lines won't be
-:: executed so don't add any! Specifically, don't use 'call' in the following
-:: line.
-"%~dp0bootstrap\gclient.bat" %*
-goto :EOF
+@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.
+
+:: Synchronize the root directory before deferring control back to gclient.py.
+call "%~dp0\update_depot_tools.bat"
+
+:: Defer control.
+python "%~dp0\gclient.py" %*
« no previous file with comments | « bootstrap/update_depot_tools.bat ('k') | update_depot_tools » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698