Skip to content

C
Chromium_Depot_tools
Commit 4570dcf4 authored by Nico Weber's avatar Nico Weber Committed by LUCI CQ
Browse files
Options

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 <thakis@chromium.org>
Reviewed-by: 's avatarRobbie Iannucci <iannucci@chromium.org>
Reviewed-by: 's avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
parent 13413d52
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
bootstrap/manifest.txt
View file @ 4570dcf4
# CIPD manifest for bootstrapping tools. # CIPD manifest for bootstrapping tools.
# #
# We must install anything that we want included on PATH to a different # 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 # subdirectory than Git, as Git's msys bash strips its root directory
# from PATH, hence the subdirs. # from PATH, hence the subdirs.
# #
# If any paths or package layouts change, updates will be required in # If any paths or package layouts change, updates will be required in
# "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates. # "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates.
# #
# "win_tools.bat" has a hard requirement that the Python packages contain the # "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 # strings "cpython/" for Python 2 and "cpython3/" for Python 3, and ends with
# the CIPD tag "version:VERSION". It uses this to extract VERSION. # the CIPD tag "version:VERSION". It uses this to extract VERSION.
# #
# "bootstrap_python3" has a hard requirement that the Python package contains # "bootstrap_python3" has a hard requirement that the Python package contains
# the string "cpython3/" and ends with the CIPD tag "version:VERSION". # the string "cpython3/" and ends with the CIPD tag "version:VERSION".
# It uses this to extract VERSION. # It uses this to extract VERSION.
$VerifiedPlatform windows-amd64 linux-amd64 mac-amd64 $VerifiedPlatform windows-amd64 linux-amd64 mac-amd64
# TODO(https://crbug.com/1184768): Remove `=amd64` once mac/arm64 python exists # TODO(https://crbug.com/1184768): Remove `=amd64` once mac/arm64 python exists
@Subdir python @Subdir python
infra/3pp/tools/cpython/${os}-${arch=amd64} version:2.7.17.chromium.22 infra/3pp/tools/cpython/${os}-${arch=amd64} version:2.7.17.chromium.22
@Subdir python3 @Subdir python3
infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14 infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14
# TODO(https://crbug.com/1184766): Remove `=amd64` once mac/arm64 git exists # TODO(https://crbug.com/1184766): Remove `=amd64` once mac/arm64 git exists
@Subdir git @Subdir git
infra/3pp/tools/git/${os}-${arch=amd64} version:2@2.30.2.chromium.6 infra/3pp/tools/git/${os}-${arch=amd64} version:2@2.30.2.chromium.6
bootstrap/manifest_bleeding_edge.txt
View file @ 4570dcf4
# CIPD manifest for bootstrapping tools. # CIPD manifest for bootstrapping tools.
# #
# We must install anything that we want included on PATH to a different # 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 # subdirectory than Git, as Git's msys bash strips its root directory
# from PATH, hence the subdirs. # from PATH, hence the subdirs.
# #
# If any paths or package layouts change, updates will be required in # If any paths or package layouts change, updates will be required in
# "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates. # "win_tools.bat", "bootstrap.py" and "../bootstrap_python3" templates.
# #
# "win_tools.bat" has a hard requirement that the Python packages contain the # "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 # strings "cpython/" for Python 2 and "cpython3/" for Python 3, and ends with
# the CIPD tag "version:VERSION". It uses this to extract VERSION. # the CIPD tag "version:VERSION". It uses this to extract VERSION.
# #
# "bootstrap_python3" has a hard requirement that the Python package contains # "bootstrap_python3" has a hard requirement that the Python package contains
# the string "cpython3/" and ends with the CIPD tag "version:VERSION". # the string "cpython3/" and ends with the CIPD tag "version:VERSION".
# It uses this to extract VERSION. # It uses this to extract VERSION.
$VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64 $VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64
@Subdir python @Subdir python
infra/3pp/tools/cpython/${platform} version:2@2.7.18.chromium.32 infra/3pp/tools/cpython/${platform} version:2@2.7.18.chromium.32
@Subdir python3 @Subdir python3
infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14 infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14
@Subdir git @Subdir git
infra/3pp/tools/git/${os}-${arch} version:2@2.30.2.chromium.6 infra/3pp/tools/git/${os}-${arch} version:2@2.30.2.chromium.6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment