Skip to content

Commit

Permalink
Rollup merge of rust-lang#40225 - shepmaster:restore-build-date-file,…
Browse files Browse the repository at this point in the history
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
  • Loading branch information
alexcrichton authored Mar 10, 2017
2 parents 2e20ad8 + 3e2390f commit 5a89d0b
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,19 @@ impl Builder {
let mut manifest = BTreeMap::new();
manifest.insert("manifest-version".to_string(),
toml::Value::String(manifest_version));
manifest.insert("date".to_string(), toml::Value::String(date));
manifest.insert("date".to_string(), toml::Value::String(date.clone()));
manifest.insert("pkg".to_string(), toml::encode(&pkg));
let manifest = toml::Value::Table(manifest).to_string();

let filename = format!("channel-rust-{}.toml", self.rust_release);
self.write_manifest(&manifest, &filename);

let filename = format!("channel-rust-{}-date.txt", self.rust_release);
self.write_date_stamp(&date, &filename);

if self.rust_release != "beta" && self.rust_release != "nightly" {
self.write_manifest(&manifest, "channel-rust-stable.toml");
self.write_date_stamp(&date, "channel-rust-stable-date.txt");
}
}

Expand All @@ -218,7 +222,7 @@ impl Builder {
self.package("rust-docs", &mut manifest.pkg, TARGETS);
self.package("rust-src", &mut manifest.pkg, &["*"]);

if self.channel == "nightly" {
if self.rust_release == "nightly" {
self.package("rust-analysis", &mut manifest.pkg, TARGETS);
}

Expand Down Expand Up @@ -271,7 +275,7 @@ impl Builder {
target: target.to_string(),
});
}
if self.channel == "nightly" {
if self.rust_release == "nightly" {
extensions.push(Component {
pkg: "rust-analysis".to_string(),
target: target.to_string(),
Expand Down Expand Up @@ -411,4 +415,11 @@ impl Builder {
self.hash(&dst);
self.sign(&dst);
}

fn write_date_stamp(&self, date: &str, name: &str) {
let dst = self.output.join(name);
t!(t!(File::create(&dst)).write_all(date.as_bytes()));
self.hash(&dst);
self.sign(&dst);
}
}

0 comments on commit 5a89d0b

Please sign in to comment.