Dump pkg version & build date & commit hash if run with `--version` flag #308

tetsuharuohzeki · 2017-05-10T21:26:27Z

The output format is rls <version> (<commit hash> <build date>).
This embed approach is based on rustup.rs's code.
- rustup.rs is licensed under same licenses (Apache 2.0/MIT),
  so I think there is no license problem.

Related Issues

Implement ---version command line option #304

tetsuharuohzeki · 2017-05-10T21:27:09Z

How about this approach?

…lag. - The output format is `rls <version> (<commit hash> <build date>)` - This embed approach is based on [rustup.rs][rustup]'s code. - rustup.rs is licensed under same licenses (Apache 2.0/MIT), so I think there is no license problem. [rustup]: https://github.com/rust-lang-nursery/rustup.rs/tree/a1c6be19add9c99f8d8868ec384aa76057fe7f70

nrc

Looks good, there's a few comments to address, but all minor.

nrc · 2017-05-10T22:55:59Z

build.rs

+}
+
+fn main() {
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());


Sadly (and ironically), this means we will no longer be able to build the RLS inside the RLS (#290), but the fix is fairly straightforward

nrc · 2017-05-10T23:03:33Z

build.rs

+use std::path::PathBuf;
+use std::process::Command;
+
+struct Ignore;


This seems unnecessary - just use an Option rather than a Result (or Result<String, ()>)

Fixed by c3d99ad

nrc · 2017-05-10T23:06:06Z

src/main.rs

@@ -51,8 +51,13 @@ type Span = span::Span<span::ZeroIndexed>;
 pub fn main() {
    env_logger::init().unwrap();

-    let arg_count = ::std::env::args().count();
-    if arg_count > 1 {
+    let args: Vec<String> = ::std::env::args().collect();


nit: one could do this without collecting by using next on the args iterator. Not really necessary though.

Fixed by 0384629

nrc · 2017-05-10T23:06:47Z

src/version.rs

@@ -0,0 +1,6 @@
+use getopts::{Options, Matches};


I think this file is an orphan and should be removed

fixed by 4fde1ff

nrc · 2017-05-10T23:07:50Z

src/main.rs

@@ -62,3 +67,7 @@ pub fn main() {
        server::run_server(analysis, vfs, build_queue);
    }
 }
+
+fn version() -> &'static str {
+    concat!(env!("CARGO_PKG_VERSION"), include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt")))


Should use Path::join rather than string concatenation of the path so that this works on Windows

@nrc the argument for include_str! must be a string literal. So we cannot do it without const fn.

Hmm, we could just open the file and read it rather than using include_str, but this is certainly nicer. I guess we can wait and see if someone breaks

…sion` flag.

tetsuharuohzeki · 2017-05-11T00:29:33Z

@nrc I updated the changesets :)

nrc · 2017-05-11T00:56:24Z

Thank you for the changes!

nrc mentioned this pull request May 10, 2017

tracking issue: distribution #310

Closed

6 tasks

tetsuharuohzeki force-pushed the version-flag branch from 8be5005 to 123537b Compare May 10, 2017 23:00

nrc suggested changes May 10, 2017

View reviewed changes

tetsuharuohzeki added 3 commits May 11, 2017 08:23

fixup! Dump pkg version & build date & commit hash if run with `--ver…

4fde1ff

…sion` flag.

Remove Ignore in /build.rs

c3d99ad

fixup! Dump pkg version & build date & commit hash if run with `--ver…

0384629

…sion` flag.

nrc merged commit 5551c4e into rust-lang:master May 11, 2017

tetsuharuohzeki deleted the version-flag branch May 11, 2017 04:29

tetsuharuohzeki mentioned this pull request May 11, 2017

Implement ---version command line option #304

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dump pkg version & build date & commit hash if run with `--version` flag #308

Dump pkg version & build date & commit hash if run with `--version` flag #308

tetsuharuohzeki commented May 10, 2017

tetsuharuohzeki commented May 10, 2017

nrc left a comment

nrc May 10, 2017

nrc May 10, 2017

tetsuharuohzeki May 11, 2017

nrc May 10, 2017

tetsuharuohzeki May 11, 2017

nrc May 10, 2017

tetsuharuohzeki May 11, 2017

nrc May 10, 2017

tetsuharuohzeki May 11, 2017

nrc May 11, 2017

tetsuharuohzeki commented May 11, 2017

nrc commented May 11, 2017

Dump pkg version & build date & commit hash if run with --version flag #308

Dump pkg version & build date & commit hash if run with --version flag #308

Conversation

tetsuharuohzeki commented May 10, 2017

Related Issues

tetsuharuohzeki commented May 10, 2017

nrc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tetsuharuohzeki commented May 11, 2017

nrc commented May 11, 2017

Dump pkg version & build date & commit hash if run with `--version` flag #308

Dump pkg version & build date & commit hash if run with `--version` flag #308