diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-11-01 10:59:01 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-11-01 14:25:07 +0100 |
| commit | 0ca3c30eb8ee456376ba400592848e1cd0da82c3 (patch) | |
| tree | 51e2ab4f514031ee477c738170662c56054079a8 /mullvad-cli | |
| parent | 01fb1a4cd46c2dcd6c90c23b1ab0bb56a6fe8992 (diff) | |
| download | mullvadvpn-0ca3c30eb8ee456376ba400592848e1cd0da82c3.tar.xz mullvadvpn-0ca3c30eb8ee456376ba400592848e1cd0da82c3.zip | |
Make all binaries use same version format
Diffstat (limited to 'mullvad-cli')
| -rw-r--r-- | mullvad-cli/build.rs | 7 | ||||
| -rw-r--r-- | mullvad-cli/src/main.rs | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/mullvad-cli/build.rs b/mullvad-cli/build.rs index 126fbafc03..3c59e07c65 100644 --- a/mullvad-cli/build.rs +++ b/mullvad-cli/build.rs @@ -3,10 +3,15 @@ extern crate winapi; #[cfg(windows)] extern crate winres; +use std::{env, fs, path::PathBuf}; + fn main() { + let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap()); + let product_version = env!("CARGO_PKG_VERSION").replacen(".0", "", 1); + fs::write(out_dir.join("product-version.txt"), &product_version).unwrap(); + #[cfg(windows)] { - let product_version = env!("CARGO_PKG_VERSION").replacen(".0", "", 1); let mut res = winres::WindowsResource::new(); res.set("ProductVersion", &product_version); res.set_icon("../dist-assets/icon.ico"); diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs index 68d4bf7194..5d0bd921ed 100644 --- a/mullvad-cli/src/main.rs +++ b/mullvad-cli/src/main.rs @@ -19,7 +19,7 @@ extern crate talpid_types; mod cmds; -use clap::{crate_authors, crate_description, crate_name, crate_version}; +use clap::{crate_authors, crate_description, crate_name}; use mullvad_ipc_client::{new_standalone_ipc_client, DaemonRpcClient}; use std::alloc::System; @@ -29,6 +29,8 @@ use std::io; #[global_allocator] static GLOBAL: System = System; +pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt")); + error_chain! { foreign_links { @@ -53,7 +55,7 @@ fn run() -> Result<()> { let commands = cmds::get_commands(); let app = clap::App::new(crate_name!()) - .version(crate_version!()) + .version(PRODUCT_VERSION) .author(crate_authors!()) .about(crate_description!()) .setting(clap::AppSettings::SubcommandRequired) |