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

depot_tools: Execute commands using Python 2 on Windows when GCLIENT_PY3=0.

Browse Source 
Change-Id: Ib51acc5671c7b60219f64bcb73a70f85a51779a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2140817
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
This commit is contained in:
Edward Lesmes
2020-04-07 23:12:55 +00:00
committed by LUCI CQ
parent 48c5c9c504
commit c440b23d50
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fetch.bat
View File

@@ -13,7 +13,12 @@ set PATH=%PATH%;%~dp0
:: Defer control.
IF "%GCLIENT_PY3%" == "1" (
vpython3 "%~dp0\fetch.py" %*
:: Explicitly run on Python 3
call vpython3 "%~dp0\fetch.py" %*
) ELSE IF "%GCLIENT_PY3%" == "0" (
:: Explicitly run on Python 2
call vpython "%~dp0\fetch.py" %*
) ELSE (
vpython "%~dp0\fetch.py" %*
:: Run on Python 2, allows default to be flipped.
call vpython "%~dp0\fetch.py" %*
)

10
gclient.bat
View File

@@ -17,8 +17,12 @@ set PATH=%PATH%;%~dp0
:: Defer control.
IF "%GCLIENT_PY3%" == "1" (
:: TODO(1003139): Use vpython3 once vpython3 works on Windows.
call python3 "%~dp0gclient.py" %*
:: Explicitly run on Python 3
call vpython3 "%~dp0gclient.py" %*
) ELSE IF "%GCLIENT_PY3%" == "0" (
:: Explicitly run on Python 2
call vpython "%~dp0gclient.py" %*
) ELSE (
call python "%~dp0gclient.py" %*
:: Run on Python 2, allows default to be flipped.
call vpython "%~dp0gclient.py" %*
)

11
roll-dep.bat
View File

@@ -9,4 +9,13 @@ setlocal
set PATH=%PATH%;%~dp0
:: Defer control.
python "%~dp0\roll_dep.py" %*
IF "%GCLIENT_PY3%" == "1" (
:: Explicitly run on Python 3
call vpython3 "%~dp0\roll_dep.py" %*
) ELSE IF "%GCLIENT_PY3%" == "0" (
:: Explicitly run on Python 2
call vpython "%~dp0\roll_dep.py" %*
) ELSE (
:: Run on Python 2, allows default to be flipped.
call vpython "%~dp0\roll_dep.py" %*
)