Skip to content
This repository has been archived by the owner on Nov 21, 2018. It is now read-only.

Add rust-analysis manifest #150

Merged
merged 1 commit into from
Feb 1, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion master/build-rust-manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def build_manifest(rustc_date, rustc_version, rustc_short_version,

packages = {}

# Build all the non-rust packages. All the artifects here are
# Build all the non-rust packages. All the artifacts here are
# already in the archives and will be verified.
rustc_pkg = build_package_def_from_archive("rustc", "dist", rustc_date,
rustc_version, rustc_short_version,
Expand All @@ -359,6 +359,13 @@ def build_manifest(rustc_date, rustc_version, rustc_short_version,
packages["rust-mingw"] = mingw_pkg
packages["rust-src"] = src_pkg

if channel == "nightly":
analysis_pkg = build_package_def_from_archive("rust-analysis", "dist", rustc_date,
rustc_version, rustc_short_version,
target_list)
packages["rust-analysis"] = analysis_pkg


# Build the rust package. It is the only one with subcomponents
rust_target_pkgs = {}
for host in host_list:
Expand Down Expand Up @@ -404,6 +411,12 @@ def build_manifest(rustc_date, rustc_version, rustc_short_version,
"target": "*",
}]

if channel == "nightly":
extensions += [{
"pkg": "rust-analysis",
"target": target,
}]

# The binaries of the 'rust' package are on the local disk.
# url_and_hash_of_rust_package will try to locate them
# and tell us where they are going to live on static.rust-lang.org
Expand Down