bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

tools: win: Use system installed Git version

Browse Source 
Chromium has stopped bundling Git with depot_tools on Windows.
See https://groups.google.com/a/chromium.org/g/chromium-dev/c/e4ftLlQ5GpE/m/ye0ezOLaAAAJ
This commit is contained in:
Marshall Greenblatt
2025-02-19 12:27:34 -05:00
parent 81d54830e9
commit bfd1110145
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/automate/automate-git.py
View File

@ -1020,15 +1020,15 @@ if not options.nodepottoolsupdate:
# Determine the executables to use. # Determine the executables to use.
if platform == 'windows': if platform == 'windows':
# Force use of the version bundled with depot_tools. # Force use of the system installed Git version.
git_exe = os.path.join(depot_tools_dir, 'git.bat') git_exe = 'git.exe'
# Force use of the Python version bundled with depot_tools.
python_bat = 'python.bat' if is_python2 else 'python3.bat' python_bat = 'python.bat' if is_python2 else 'python3.bat'
python_exe = os.path.join(depot_tools_dir, python_bat) python_exe = os.path.join(depot_tools_dir, python_bat)
if options.dryrun and not os.path.exists(git_exe): if options.dryrun and not os.path.exists(python_exe):
sys.stdout.write("WARNING: --dry-run assumes that depot_tools" \ sys.stdout.write("WARNING: --dry-run assumes that depot_tools" \
" is already in your PATH. If it isn't\nplease" \ " is already in your PATH. If it isn't\nplease" \
" specify a --depot-tools-dir value.\n") " specify a --depot-tools-dir value.\n")
git_exe = 'git.bat'
python_exe = python_bat python_exe = python_bat
else: else:
git_exe = 'git' git_exe = 'git'