Merge pull request #488 from ethcore/shortversio

Remove "unknown" from version string.
openethereum · Feb 22, 2016 · 38ccc24 · 38ccc24
2 parents aedc65d + e63aba7
commit 38ccc24
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -34,6 +34,7 @@ igd = "0.4.2"
 ethcore-devtools = { path = "../devtools" }
 libc = "0.2.7"
 vergen = "0.1"
+target_info = "0.1"
 
 [features]
 default = []

diff --git a/util/src/lib.rs b/util/src/lib.rs
@@ -108,6 +108,7 @@ extern crate igd;
 extern crate ethcore_devtools as devtools;
 extern crate libc;
 extern crate rustc_version;
+extern crate target_info;
 extern crate vergen;
 
 pub mod standard;

diff --git a/util/src/misc.rs b/util/src/misc.rs
@@ -18,6 +18,7 @@
 
 use std::fs::File;
 use common::*;
+use target_info::Target;
 use rustc_version;
 
 include!(concat!(env!("OUT_DIR"), "/version.rs"));
@@ -68,5 +69,5 @@ pub fn contents(name: &str) -> Result<Bytes, UtilError> {
 
 /// Get the standard version string for this software.
 pub fn version() -> String {
-	format!("Parity//{}/{}-{}/{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date(), target(), rustc_version::version())
+	format!("Parity//{}-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
 }