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

gclient: Add a GCLIENT_PY3 env var to allow users to execute gclient using Python 3.

Browse Source 
Bug: 1008202
Change-Id: I23dd70b72089a09c2a7cdc74e2a63c135a924ebe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1825996
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
This commit is contained in:
Edward Lemur
2019-09-26 21:08:13 +00:00
committed by Commit Bot
parent e4174f483e
commit e656e98831
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gclient
View File

@@ -19,4 +19,12 @@ if [[ "#grep#fetch#cleanup#diff#setdep#" != *"#$1#"* ]]; then
esac
fi
PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"
# Ensure that "depot_tools" is somewhere in PATH so this tool can be used
# standalone, but allow other PATH manipulations to take priority.
PATH=$PATH:$base_dir
if [[ $GCLIENT_PY3 != 1 ]]; then
PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"
else
PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@"
fi

7
gclient.bat
View File

@@ -12,4 +12,9 @@ call "%~dp0update_depot_tools.bat" %*
set PATH=%PATH%;%~dp0
:: Defer control.
python "%~dp0gclient.py" %*
IF "%GCLIENT_PY3%" == "1" (
python "%~dp0gclient.py" %*
) ELSE (
:: TODO(1003139): Use vpython3 once vpython3 works on Windows.
python3 "%~dp0gclient.py" %*
)