aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert manifest files in bootstrap/ to unix line endings

Browse Source 
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: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
changes/12/2867312/2
Nico Weber 4 years ago committed by LUCI CQ
parent 13413d52d8
commit 4570dcf468
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File

58
bootstrap/manifest.txt
Unescape Escape View File

@ -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

54
bootstrap/manifest_bleeding_edge.txt
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save