pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 13:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added commit hash to --version (#489)

Browse Source 
* Update config.rs

* Update lib.rs
This commit is contained in:
Simon Littlejohns
2018-08-03 11:29:09 +01:00
committed by Gav Wood
parent d50d6b302a
commit a51622c3fb
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/substrate/cli/src/lib.rs
+4 -2
View File
@@ -44,7 +44,6 @@ extern crate exit_future;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
#[macro_use]
extern crate clap; extern crate clap;
#[macro_use] #[macro_use]
extern crate error_chain; extern crate error_chain;
@@ -164,6 +163,9 @@ where
{ {
panic_hook::set(); panic_hook::set();
let full_version = service::Configuration::<<F>::Configuration, <F>::Genesis>
::full_version_from_strs(version.version, version.commit);
let yaml = format!(include_str!("./cli.yml"), let yaml = format!(include_str!("./cli.yml"),
name = version.executable_name, name = version.executable_name,
description = version.description, description = version.description,
@@ -171,7 +173,7 @@ where
); );
let yaml = &clap::YamlLoader::load_from_str(&yaml).expect("Invalid yml file")[0]; let yaml = &clap::YamlLoader::load_from_str(&yaml).expect("Invalid yml file")[0];
let matches = match clap::App::from_yaml(yaml) let matches = match clap::App::from_yaml(yaml)
.version(&(crate_version!().to_owned() + "\n")[..]) .version(&(full_version + "\n")[..])
.get_matches_from_safe(args) { .get_matches_from_safe(args) {
Ok(m) => m, Ok(m) => m,
Err(e) => e.exit(), Err(e) => e.exit(),
substrate/substrate/service/src/config.rs
+8 -3
View File
@@ -105,10 +105,15 @@ impl<C: Default, G: Serialize + DeserializeOwned + BuildStorage> Configuration<C
format!("{}-{}{}{}", Target::arch(), Target::os(), env_dash, env) format!("{}-{}{}{}", Target::arch(), Target::os(), env_dash, env)
} }
/// Returns full version string. /// Returns full version string of this configuration.
pub fn full_version(&self) -> String { pub fn full_version(&self) -> String {
let commit_dash = if self.impl_commit.is_empty() { "" } else { "-" }; Self::full_version_from_strs(self.impl_version, self.impl_commit)
format!("{}{}{}-{}", self.impl_version, commit_dash, self.impl_commit, Self::platform()) }
/// Returns full version string, using supplied version and commit.
pub fn full_version_from_strs(impl_version: &str, impl_commit: &str) -> String {
let commit_dash = if impl_commit.is_empty() { "" } else { "-" };
format!("{}{}{}-{}", impl_version, commit_dash, impl_commit, Self::platform())
} }
/// Implementation id and version. /// Implementation id and version.