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

[win-bootstrap] Never add docs to Git

Browse Source 
Bug: b/360206460
Change-Id: Ic285b8e3dc38524a184c0e01dbfdaf9b403ce19a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6171043
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
Commit-Queue: Anne Redulla <aredulla@google.com>
This commit is contained in:
Anne Redulla
2025-01-14 15:46:23 -08:00
committed by LUCI CQ
parent 426728b6e2
commit a90906c74d
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bootstrap/bootstrap.py
View File

@@ -453,20 +453,7 @@ def _win_git_bootstrap_config():
[git_bat_path, 'config', '--unset', '--global', postprocess_key])
def git_postprocess(template, add_docs):
if add_docs:
# Update depot_tools files for "git help <command>".
mingw_dir = git_get_mingw_dir(template.GIT_BIN_ABSDIR)
if mingw_dir:
docsrc = os.path.join(ROOT_DIR, 'man', 'html')
git_docs_dir = os.path.join(mingw_dir, 'share', 'doc', 'git-doc')
for name in os.listdir(docsrc):
maybe_copy(os.path.join(docsrc, name),
os.path.join(git_docs_dir, name))
else:
logging.info('Could not find mingw directory for %r.',
template.GIT_BIN_ABSDIR)
def git_postprocess(template):
# Create Git templates and configure its base layout.
for stub_name, relpath in WIN_GIT_STUBS.items():
stub_template = template._replace(GIT_PROGRAM=relpath)
@@ -498,17 +485,14 @@ def main(argv):
clean_up_old_installations(bootstrap_dir)
if IS_WIN:
# Avoid messing with system git docs.
add_docs = False
git_dir = search_win_git_directory()
if not git_dir:
# Either using system git was not enabled
# or git was not found in PATH.
# Fall back to depot_tools bundled git.
git_dir = os.path.join(bootstrap_dir, 'git')
add_docs = True
template = template._replace(GIT_BIN_ABSDIR=git_dir)
git_postprocess(template, add_docs)
git_postprocess(template)
templates = [
('git-bash.template.sh', 'git-bash', ROOT_DIR),
('python3.bat', 'python3.bat', ROOT_DIR),