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

Make Python 3 default on Windows

Browse Source 
Users can still set GCLIENT_PY3=0 to use Python 2.

R=ehmaldonado@chromium.org

Change-Id: Ic7657a091bfe3b9c426ab36063b106aadf2d1c84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2161266
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
This commit is contained in:
Josip Sokcevic
2020-04-22 21:08:10 +00:00
committed by LUCI CQ
parent 64c1faf0fb
commit c621315d17
7 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fetch
View File

@@ -15,9 +15,6 @@ if [[ $GCLIENT_PY3 == 1 ]]; then
elif [[ $GCLIENT_PY3 == 0 ]]; then elif [[ $GCLIENT_PY3 == 0 ]]; then
# Explicitly run on Python 2 # Explicitly run on Python 2
PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@"
elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then
# Run on Python 2 on Windows for now, allows default to be flipped.
PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@"
else else
# Run on Python 3, allows default to be flipped. # Run on Python 3, allows default to be flipped.
PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/fetch.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/fetch.py" "$@"

4
fetch.bat
View File

@@ -19,6 +19,6 @@ IF "%GCLIENT_PY3%" == "1" (
:: Explicitly run on Python 2 :: Explicitly run on Python 2
call vpython "%~dp0\fetch.py" %* call vpython "%~dp0\fetch.py" %*
) ELSE ( ) ELSE (
:: Run on Python 2, allows default to be flipped. :: Run on Python 3, allows default to be flipped.
call vpython "%~dp0\fetch.py" %* call vpython3 "%~dp0\fetch.py" %*
) )

3
gclient
View File

@@ -32,9 +32,6 @@ if [[ $GCLIENT_PY3 == 1 ]]; then
elif [[ $GCLIENT_PY3 == 0 ]]; then elif [[ $GCLIENT_PY3 == 0 ]]; then
# Explicitly run on Python 2 # Explicitly run on Python 2
PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@"
elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then
# Run on Python 2 on Windows for now, allows default to be flipped.
PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@"
else else
# Run on Python 3, allows default to be flipped. # Run on Python 3, allows default to be flipped.
PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@"

4
gclient.bat
View File

@@ -23,6 +23,6 @@ IF "%GCLIENT_PY3%" == "1" (
:: Explicitly run on Python 2 :: Explicitly run on Python 2
call vpython "%~dp0gclient.py" %* call vpython "%~dp0gclient.py" %*
) ELSE ( ) ELSE (
:: Run on Python 2, allows default to be flipped. :: Run on Python 3, allows default to be flipped.
call vpython "%~dp0gclient.py" %* call vpython3 "%~dp0gclient.py" %*
) )

3
python_runner.sh
View File

@@ -54,9 +54,6 @@ if [[ $GCLIENT_PY3 = 1 ]]; then
elif [[ $GCLIENT_PY3 = 0 ]]; then elif [[ $GCLIENT_PY3 = 0 ]]; then
# Explicitly run on Python 2 # Explicitly run on Python 2
vpython "$DEPOT_TOOLS/$SCRIPT" "$@" vpython "$DEPOT_TOOLS/$SCRIPT" "$@"
elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then
# Run on Python 2 on Windows for now, allows default to be flipped.
vpython "$DEPOT_TOOLS/$SCRIPT" "$@"
else else
# Run on Python 3, allows default to be flipped. # Run on Python 3, allows default to be flipped.
vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@" vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@"

3
roll-dep
View File

@@ -15,9 +15,6 @@ if [[ $GCLIENT_PY3 = 1 ]]; then
elif [[ $GCLIENT_PY3 = 0 ]]; then elif [[ $GCLIENT_PY3 = 0 ]]; then
# Explicitly run on Python 2 # Explicitly run on Python 2
PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/roll_dep.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/roll_dep.py" "$@"
elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then
# Run on Python 2 on Windows for now, allows default to be flipped.
PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/roll_dep.py" "$@"
else else
# Run on Python 2 for now, allows default to be flipped. # Run on Python 2 for now, allows default to be flipped.
PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/roll_dep.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/roll_dep.py" "$@"

4
roll-dep.bat
View File

@@ -16,6 +16,6 @@ IF "%GCLIENT_PY3%" == "1" (
:: Explicitly run on Python 2 :: Explicitly run on Python 2
call vpython "%~dp0\roll_dep.py" %* call vpython "%~dp0\roll_dep.py" %*
) ELSE ( ) ELSE (
:: Run on Python 2, allows default to be flipped. :: Run on Python 3, allows default to be flipped.
call vpython "%~dp0\roll_dep.py" %* call vpython3 "%~dp0\roll_dep.py" %*
) )