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

[bootstraps] Sync at gclient, suppress output.

Browse Source 
Have the "update_depot_tools" script also do a CIPD tool sync. This will
ensure that users and systems have access to tooling at sync-time rather
than just-in-time loading them at execution time.

Update the tool boostraps to suppress any sort of syncing logic, if it
does happen. This will ensure that users who execute the tools don't se
unexpected output.

BUG=None
TEST=local
  - Tested on Mac and Windows.

R=dpranke@chromium.org, iannucci@chromium.org

Change-Id: I8efce8c73cc4e82ffdf5067ba9b917119a81e843
Reviewed-on: https://chromium-review.googlesource.com/581494
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
This commit is contained in:
Dan Jacques
2017-07-24 18:29:02 +02:00
committed by Commit Bot
parent 357415cb11
commit 4d92fe4300
8 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -9,7 +9,7 @@
/*.py recipes /*.py recipes
/*.sh recipes /*.sh recipes
# Extensionless tools we want # Extensionless tools we want and support scripts.
/apply_issue recipes /apply_issue recipes
/clang* recipes /clang* recipes
/depot-tools-auth recipes /depot-tools-auth recipes

2
led
View File

@@ -7,6 +7,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup cipd_bin_setup &> /dev/null
exec "$MYPATH/.cipd_bin/led" "$@" exec "$MYPATH/.cipd_bin/led" "$@"

2
led.bat
View File

@@ -3,5 +3,5 @@
:: Use of this source code is governed by a BSD-style license that can be :: Use of this source code is governed by a BSD-style license that can be
:: found in the LICENSE file. :: found in the LICENSE file.
call "%~dp0\cipd_bin_setup.bat" call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
"%~dp0\.cipd_bin\led.exe" %* "%~dp0\.cipd_bin\led.exe" %*

4
tests/gclient_smoketest.py
View File

@@ -179,6 +179,10 @@ class GClientSmoke(GClientSmokeBase):
self.check(res, self.gclient(['update'])) self.check(res, self.gclient(['update']))
def testConfig(self): def testConfig(self):
# Get anhy bootstrapping out of the way.
results = self.gclient(['version'])
self.assertEquals(results[2], 0)
p = join(self.root_dir, '.gclient') p = join(self.root_dir, '.gclient')
def test(cmd, expected): def test(cmd, expected):
if os.path.exists(p): if os.path.exists(p):

18
update_depot_tools
View File

@@ -112,11 +112,17 @@ function update_git_repo {
} }
# Update git checkouts. # Update git checkouts.
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ] if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
then if [ -e "$base_dir/.git" ]; then
cd $base_dir cd $base_dir
update_git_repo update_git_repo
cd - > /dev/null cd - > /dev/null
fi
# Sync CIPD and CIPD client tools.
source "$base_dir/cipd_bin_setup.sh"
cipd_bin_setup
find "$base_dir" -iname "*.pyc" -exec rm -f {} \;
fi fi
find "$base_dir" -iname "*.pyc" -exec rm -f {} \;

9
update_depot_tools.bat
View File

@@ -52,5 +52,10 @@ for /F %%x in ('git config --get remote.origin.url') DO (
) )
call git fetch -q origin > NUL call git fetch -q origin > NUL
call git rebase -q origin/master > NUL call git rebase -q origin/master > NUL
if errorlevel 1 echo Failed to update depot_tools. if errorlevel 1 (
goto :EOF echo Failed to update depot_tools.
goto :EOF
)
:: Sync CIPD and CIPD client tools.
call "%~dp0\cipd_bin_setup.bat"

2
vpython
View File

@@ -7,6 +7,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup cipd_bin_setup &> /dev/null
exec "$MYPATH/.cipd_bin/vpython" "$@" exec "$MYPATH/.cipd_bin/vpython" "$@"

2
vpython.bat
View File

@@ -3,5 +3,5 @@
:: Use of this source code is governed by a BSD-style license that can be :: Use of this source code is governed by a BSD-style license that can be
:: found in the LICENSE file. :: found in the LICENSE file.
call "%~dp0\cipd_bin_setup.bat" call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
"%~dp0\.cipd_bin\vpython.exe" %* "%~dp0\.cipd_bin\vpython.exe" %*