Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rustc version info (git hash + date) to dist tarball #36213

Merged
merged 1 commit into from
Sep 16, 2016

Conversation

josephDunne
Copy link
Contributor

a fix for #32444

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@josephDunne
Copy link
Contributor Author

+r @brson

@ranma42
Copy link
Contributor

ranma42 commented Sep 2, 2016

I think you meant r? @brson

@nikomatsakis
Copy link
Contributor

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned nikomatsakis Sep 2, 2016
@brson
Copy link
Contributor

brson commented Sep 2, 2016

@bors r+ Thanks @josephDunne !

@bors
Copy link
Contributor

bors commented Sep 2, 2016

📌 Commit 15a8fc2 has been approved by brson

@josephDunne
Copy link
Contributor Author

Thanks @brson in #32444 you mentioned something needs to change in src/rustbuild but im not sure what (and I cant see a folder with that name). Is that still relevant.

Also I cant see why the Travis build fail. It said all tests passed.

@brson
Copy link
Contributor

brson commented Sep 2, 2016

@bors r-

Oh you are right @josephDunne. Thanks for fixing my review :)

Here's where rustbuild creates the same source tarball. That plain_dst_src directory needs to contain the version file, the value of which is build.version.

@josephDunne
Copy link
Contributor Author

Am I correct in saying that the other Tarballs have a version file created by the gen_installer.sh script?
How to I exercise this code to test it? You can just point me at the docs if they exist

@josephDunne
Copy link
Contributor Author

r? @brson

I have updated the rustbuild files. I just don't know how to drive the process to confirm it works :-/

@brson
Copy link
Contributor

brson commented Sep 7, 2016

Am I correct in saying that the other Tarballs have a version file created by the gen_installer.sh script?
How to I exercise this code to test it? You can just point me at the docs if they exist

No, the version file is only created for the rustc installer and the source tarball, by the build script, and the one in the rustc tarball is later copied into the rust tarball by rust-packaging. The gen_installer.sh script doesn't care about the program version.

You can test with ./configure --enable-rustbuild && make dist

@josephDunne
Copy link
Contributor Author

ok I am happy with this commit. Both the rustc-1.13.0-dev-src.tar.gz and rustc-1.13.0-dev-x86_64-apple-darwin.tar.gz on my computer have a version file in them with the following content:

1.13.0-dev (8bb856cbf 2016-09-03)

@josephDunne
Copy link
Contributor Author

r? @brson

@brson
Copy link
Contributor

brson commented Sep 16, 2016

@bors r+ Thanks @josephDunne !

@bors
Copy link
Contributor

bors commented Sep 16, 2016

📌 Commit 72da8b8 has been approved by brson

@bors
Copy link
Contributor

bors commented Sep 16, 2016

⌛ Testing commit 72da8b8 with merge a36e069...

bors added a commit that referenced this pull request Sep 16, 2016
Add rustc version info (git hash + date) to dist tarball

a fix for #32444
@bors bors merged commit 72da8b8 into rust-lang:master Sep 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants