mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #48013 - onur:use-time-in-bootstrap-dist, r=alexcrichton

Browse source 
Use time crate in bootstrap dist instead of date

`bootstrap dist` command is trying to run *NIX specific `date` command to get current month and year. This command keep failing when it's called on a Windows command prompt. This patch is making it use time crate.

Closes: #47908
This commit is contained in:
kennytm 2018-02-07 03:23:26 +08:00 • committed by GitHub
commit 3373f65682
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Cargo.lock generated
View file

@ -133,6 +133,7 @@ dependencies = [
"serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

1
src/bootstrap/Cargo.toml
View file

@ -41,3 +41,4 @@ serde_derive = "1.0.8"
serde_json = "1.0.2" serde_json = "1.0.2"
toml = "0.4" toml = "0.4"
lazy_static = "0.2" lazy_static = "0.2"
time = "0.1"

6
src/bootstrap/dist.rs
View file

@ -33,6 +33,7 @@ use builder::{Builder, RunConfig, ShouldRun, Step};
use compile; use compile;
use tool::{self, Tool}; use tool::{self, Tool};
use cache::{INTERNER, Interned}; use cache::{INTERNER, Interned};
use time;
pub fn pkgname(build: &Build, component: &str) -> String { pub fn pkgname(build: &Build, component: &str) -> String {
if component == "cargo" { if component == "cargo" {
@ -445,8 +446,7 @@ impl Step for Rustc {
t!(fs::create_dir_all(image.join("share/man/man1"))); t!(fs::create_dir_all(image.join("share/man/man1")));
let man_src = build.src.join("src/doc/man"); let man_src = build.src.join("src/doc/man");
let man_dst = image.join("share/man/man1"); let man_dst = image.join("share/man/man1");
let date_output = output(Command::new("date").arg("+%B %Y")); let month_year = t!(time::strftime("%B %Y", &time::now()));
let month_year = date_output.trim();
// don't use our `bootstrap::util::{copy, cp_r}`, because those try // don't use our `bootstrap::util::{copy, cp_r}`, because those try
// to hardlink, and we don't want to edit the source templates // to hardlink, and we don't want to edit the source templates
for entry_result in t!(fs::read_dir(man_src)) { for entry_result in t!(fs::read_dir(man_src)) {
@ -456,7 +456,7 @@ impl Step for Rustc {
t!(fs::copy(&page_src, &page_dst)); t!(fs::copy(&page_src, &page_dst));
// template in month/year and version number // template in month/year and version number
replace_in_file(&page_dst, replace_in_file(&page_dst,
&[("<INSERT DATE HERE>", month_year), &[("<INSERT DATE HERE>", &month_year),
("<INSERT VERSION HERE>", channel::CFG_RELEASE_NUM)]); ("<INSERT VERSION HERE>", channel::CFG_RELEASE_NUM)]);
} }

1
src/bootstrap/lib.rs
View file

@ -130,6 +130,7 @@ extern crate cc;
extern crate getopts; extern crate getopts;
extern crate num_cpus; extern crate num_cpus;
extern crate toml; extern crate toml;
extern crate time;
#[cfg(unix)] #[cfg(unix)]
extern crate libc; extern crate libc;