diff options
| author | bors <bors@rust-lang.org> | 2016-09-15 20:48:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 20:48:58 -0700 |
| commit | a36e069288141a8bb2d090f65e8c5cd415fb37e9 (patch) | |
| tree | 01bcd6bc47b53e7e2e3b2b32c90a974bdec1beed | |
| parent | 5511a93c8af5a2ee4ed1e4c55b19635b00938cdb (diff) | |
| parent | 72da8b82c14772980956a808e93ed6258c5691ba (diff) | |
| download | rust-a36e069288141a8bb2d090f65e8c5cd415fb37e9.tar.gz rust-a36e069288141a8bb2d090f65e8c5cd415fb37e9.zip | |
Auto merge of #36213 - josephDunne:dist_version, r=brson
Add rustc version info (git hash + date) to dist tarball a fix for #32444
| -rw-r--r-- | mk/dist.mk | 1 | ||||
| -rw-r--r-- | src/bootstrap/dist.rs | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index e81371037ac..cb0bca01e6c 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -76,6 +76,7 @@ tmp/dist/$$(SRC_PKG_NAME)-image: $(PKG_FILES) @$(call E, making src image) $(Q)rm -Rf tmp/dist/$(SRC_PKG_NAME)-image $(Q)mkdir -p tmp/dist/$(SRC_PKG_NAME)-image/lib/rustlib/src/rust + $(Q)echo "$(CFG_VERSION)" > tmp/dist/$(SRC_PKG_NAME)-image/lib/rustlib/src/rust/version $(Q)tar \ -C $(S) \ -f - \ diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 9d18901eb00..31b7db168b4 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -388,6 +388,9 @@ pub fn rust_src(build: &Build) { // Rename directory, so that root folder of tarball has the correct name t!(fs::rename(&dst_src, &plain_dst_src)); + // Create the version file + write_file(&plain_dst_src.join("version"), build.version.as_bytes()); + // Create plain source tarball let mut cmd = Command::new("tar"); cmd.arg("-czf").arg(sanitize_sh(&distdir(build).join(&format!("{}.tar.gz", plain_name)))) @@ -431,3 +434,8 @@ fn sanitize_sh(path: &Path) -> String { Some(format!("/{}/{}", drive, &s[drive.len_utf8() + 2..])) } } + +fn write_file(path: &Path, data: &[u8]) { + let mut vf = t!(fs::File::create(path)); + t!(vf.write_all(data)); +} |