From 4570dcf468ca11d56a9ca89131e20c42248e7b3b Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 3 May 2021 22:27:09 +0000 Subject: [PATCH] Convert manifest files in bootstrap/ to unix line endings Hopefully no behavior change :) Bug: none Change-Id: I62710ce8c07c4df4cb0fd8cb916127616f47ee8b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2867312 Auto-Submit: Nico Weber Reviewed-by: Robbie Iannucci Reviewed-by: Dirk Pranke Commit-Queue: Dirk Pranke --- bootstrap/manifest.txt | 58 ++++++++++++++-------------- bootstrap/manifest_bleeding_edge.txt | 54 +++++++++++++------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/bootstrap/manifest.txt b/bootstrap/manifest.txt index 21669608c..a0739d593 100644 --- a/bootstrap/manifest.txt +++ b/bootstrap/manifest.txt @@ -1,29 +1,29 @@ -# CIPD manifest for bootstrapping tools. -# -# We must install anything that we want included on PATH to a different -# subdirectory than Git, as Git's msys bash strips its root directory -# from PATH, hence the subdirs. -# -# If any paths or package layouts change, updates will be required in -# "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates. -# -# "win_tools.bat" has a hard requirement that the Python packages contain the -# strings "cpython/" for Python 2 and "cpython3/" for Python 3, and ends with -# the CIPD tag "version:VERSION". It uses this to extract VERSION. -# -# "bootstrap_python3" has a hard requirement that the Python package contains -# the string "cpython3/" and ends with the CIPD tag "version:VERSION". -# It uses this to extract VERSION. - -$VerifiedPlatform windows-amd64 linux-amd64 mac-amd64 - -# TODO(https://crbug.com/1184768): Remove `=amd64` once mac/arm64 python exists -@Subdir python -infra/3pp/tools/cpython/${os}-${arch=amd64} version:2.7.17.chromium.22 - -@Subdir python3 -infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14 - -# TODO(https://crbug.com/1184766): Remove `=amd64` once mac/arm64 git exists -@Subdir git -infra/3pp/tools/git/${os}-${arch=amd64} version:2@2.30.2.chromium.6 +# CIPD manifest for bootstrapping tools. +# +# We must install anything that we want included on PATH to a different +# subdirectory than Git, as Git's msys bash strips its root directory +# from PATH, hence the subdirs. +# +# If any paths or package layouts change, updates will be required in +# "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates. +# +# "win_tools.bat" has a hard requirement that the Python packages contain the +# strings "cpython/" for Python 2 and "cpython3/" for Python 3, and ends with +# the CIPD tag "version:VERSION". It uses this to extract VERSION. +# +# "bootstrap_python3" has a hard requirement that the Python package contains +# the string "cpython3/" and ends with the CIPD tag "version:VERSION". +# It uses this to extract VERSION. + +$VerifiedPlatform windows-amd64 linux-amd64 mac-amd64 + +# TODO(https://crbug.com/1184768): Remove `=amd64` once mac/arm64 python exists +@Subdir python +infra/3pp/tools/cpython/${os}-${arch=amd64} version:2.7.17.chromium.22 + +@Subdir python3 +infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14 + +# TODO(https://crbug.com/1184766): Remove `=amd64` once mac/arm64 git exists +@Subdir git +infra/3pp/tools/git/${os}-${arch=amd64} version:2@2.30.2.chromium.6 diff --git a/bootstrap/manifest_bleeding_edge.txt b/bootstrap/manifest_bleeding_edge.txt index 38dbae7e0..2eeabfcbb 100644 --- a/bootstrap/manifest_bleeding_edge.txt +++ b/bootstrap/manifest_bleeding_edge.txt @@ -1,27 +1,27 @@ -# CIPD manifest for bootstrapping tools. -# -# We must install anything that we want included on PATH to a different -# subdirectory than Git, as Git's msys bash strips its root directory -# from PATH, hence the subdirs. -# -# If any paths or package layouts change, updates will be required in -# "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates. -# -# "win_tools.bat" has a hard requirement that the Python packages contain the -# strings "cpython/" for Python 2 and "cpython3/" for Python 3, and ends with -# the CIPD tag "version:VERSION". It uses this to extract VERSION. -# -# "bootstrap_python3" has a hard requirement that the Python package contains -# the string "cpython3/" and ends with the CIPD tag "version:VERSION". -# It uses this to extract VERSION. - -$VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64 - -@Subdir python -infra/3pp/tools/cpython/${platform} version:2@2.7.18.chromium.32 - -@Subdir python3 -infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14 - -@Subdir git -infra/3pp/tools/git/${os}-${arch} version:2@2.30.2.chromium.6 +# CIPD manifest for bootstrapping tools. +# +# We must install anything that we want included on PATH to a different +# subdirectory than Git, as Git's msys bash strips its root directory +# from PATH, hence the subdirs. +# +# If any paths or package layouts change, updates will be required in +# "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates. +# +# "win_tools.bat" has a hard requirement that the Python packages contain the +# strings "cpython/" for Python 2 and "cpython3/" for Python 3, and ends with +# the CIPD tag "version:VERSION". It uses this to extract VERSION. +# +# "bootstrap_python3" has a hard requirement that the Python package contains +# the string "cpython3/" and ends with the CIPD tag "version:VERSION". +# It uses this to extract VERSION. + +$VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64 + +@Subdir python +infra/3pp/tools/cpython/${platform} version:2@2.7.18.chromium.32 + +@Subdir python3 +infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14 + +@Subdir git +infra/3pp/tools/git/${os}-${arch} version:2@2.30.2.chromium.6