Git commit in --version string

Closes #7
SEL4PROJ · May 10, 2019 · e912193 · e912193
1 parent 44f5ab1
commit e912193
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,3 +10,5 @@ tera = "0.11"
 structopt = "0.2"
 log = "0.4.6"
 env_logger = "0.6.1"
+git-version = "0.3.1"
+clap = "*"
diff --git a/src/cli.rs b/src/cli.rs
@@ -1,8 +1,14 @@
+use git_version::git_version;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
 #[derive(Debug, Clone, StructOpt)]
-#[structopt(rename_all = "kebab-case")]
+#[structopt(
+    rename_all = "kebab-case",
+    raw(
+        version = "&*Box::leak(format!(\"{}-{}\", crate_version!(), git_version!()).into_boxed_str())"
+    )
+)]
 pub struct Opts {
     /// Names of the modules to build
     #[structopt(long)]
@@ -11,7 +17,7 @@ pub struct Opts {
     #[structopt(long)]
     pub search_dirs: Vec<PathBuf>,
     /// Directory to build in
-    #[structopt(long)]
+    #[structopt(long, default_value = "build")]
     pub build_dir: PathBuf,
     /// Top-level CakeML function to run when the program executes
     #[structopt(long, default_value = "main")]

diff --git a/src/main.rs b/src/main.rs
@@ -1,5 +1,7 @@
 #[macro_use]
 extern crate log;
+#[macro_use]
+extern crate clap;
 
 use self::binary_compiler::BinaryCompiler;
 use self::cli::Opts;