InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now update git depot_tools checkouts, also add automatic update for git-cl-repo and git-try-repo.

Browse Source 
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/125259

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@18633 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
maruel@chromium.org
2009-06-17 17:59:38 +00:00
parent 6b3c20dbe0
commit 25a8081d37
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bootstrap/gclient.sh
View File

@@ -1,17 +0,0 @@
#!/bin/sh
# 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 script will try to sync the root and bootstrap directories.
base_dir=$(dirname "$0")
# Skip if $DEPOT_TOOLS_UPDATE==0 or ../.svn/. doesn't exist.
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/../.svn" ]
then
# Update the root directory.
svn -q up "$base_dir/.."
fi
exec python "$base_dir/../gclient.py" "$@"

29
gclient
View File

@@ -6,7 +6,24 @@
# This script will try to sync the bootstrap directories and then defer control.
base_dir=$(dirname "$0")
# Update git checkouts prior the cygwin check, we don't want to use msysgit.
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
then
(cd "$base_dir"; git svn fetch -q; git merge trunk -q)
fi
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]
then
(cd "$base_dir/git-cl-repo"; git pull -q)
fi
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-try-repo/.git" ]
then
(cd "$base_dir/git-try-repo"; git pull -q)
fi
# Use the batch file as an entry point if on cygwin.
if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then
${base_dir}/gclient.bat "$@"
@@ -14,14 +31,12 @@ if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then
fi
# We're on POSIX (not cygwin). We can now safely look for svn checkout.
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
then
# Update the bootstrap directory to stay up-to-date with the latest
# depot_tools.
svn -q up "$base_dir/bootstrap"
# Then defer the control to the bootstrapper.
exec "$base_dir/bootstrap/gclient.sh" "$@"
else
exec python "$base_dir/gclient.py" "$@"
svn -q up "$base_dir"
fi
exec python "$base_dir/gclient.py" "$@"