diff options
46 files changed, 174 insertions, 44 deletions
diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml index c8251657..b07ecd60 100644 --- a/bin/core/imag-annotate/Cargo.toml +++ b/bin/core/imag-annotate/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-annotate/src/main.rs b/bin/core/imag-annotate/src/main.rs index 4bdd9443..609deaef 100644 --- a/bin/core/imag-annotate/src/main.rs +++ b/bin/core/imag-annotate/src/main.rs @@ -39,7 +39,7 @@ extern crate log; extern crate libimagentryannotation; extern crate libimagentryedit; extern crate libimagerror; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagstore; extern crate libimagutil; @@ -59,8 +59,9 @@ use libimagutil::warn_exit::warn_exit; mod ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-annotation", - env!("CARGO_PKG_VERSION"), + &version, "Add annotations to entries", ui::build_ui); diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml index df2bb9fe..bf33f9ee 100644 --- a/bin/core/imag-diagnostics/Cargo.toml +++ b/bin/core/imag-diagnostics/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [dependencies] toml = "0.4" toml-query = "0.6" diff --git a/bin/core/imag-diagnostics/src/main.rs b/bin/core/imag-diagnostics/src/main.rs index 371b1bcf..24426e68 100644 --- a/bin/core/imag-diagnostics/src/main.rs +++ b/bin/core/imag-diagnostics/src/main.rs @@ -36,7 +36,7 @@ extern crate clap; extern crate toml; extern crate toml_query; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagerror; extern crate libimagentrylink; extern crate libimagstore; @@ -92,8 +92,9 @@ impl<'a> From<FileLockEntry<'a>> for Diagnostic { } fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-diagnostics", - &env!("CARGO_PKG_VERSION")[..], + &version, "Print diagnostics about imag and the imag store", ui::build_ui); diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml index e125a273..b498c42d 100644 --- a/bin/core/imag-edit/Cargo.toml +++ b/bin/core/imag-edit/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-edit/src/main.rs b/bin/core/imag-edit/src/main.rs index bf05e8eb..c69c341a 100644 --- a/bin/core/imag-edit/src/main.rs +++ b/bin/core/imag-edit/src/main.rs @@ -37,7 +37,7 @@ extern crate clap; extern crate libimagentryedit; extern crate libimagerror; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagstore; extern crate libimagutil; @@ -52,8 +52,9 @@ use libimagstore::storeid::IntoStoreId; mod ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-edit", - env!("CARGO_PKG_VERSION"), + &version, "Edit store entries with $EDITOR", ui::build_ui); diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml index f5347412..119b4c6c 100644 --- a/bin/core/imag-gps/Cargo.toml +++ b/bin/core/imag-gps/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-gps/src/main.rs b/bin/core/imag-gps/src/main.rs index 26253e38..0a1dafa8 100644 --- a/bin/core/imag-gps/src/main.rs +++ b/bin/core/imag-gps/src/main.rs @@ -37,7 +37,7 @@ extern crate clap; extern crate log; extern crate libimagentrygps; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagutil; extern crate libimagerror; extern crate libimagstore; @@ -59,8 +59,9 @@ use libimagstore::storeid::IntoStoreId; mod ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-gps", - env!("CARGO_PKG_VERSION"), + &version, "Add GPS coordinates to entries", ui::build_ui); diff --git a/bin/core/imag-grep/Cargo.toml b/bin/core/imag-grep/Cargo.toml index 745dca99..d59516d0 100644 --- a/bin/core/imag-grep/Cargo.toml +++ b/bin/core/imag-grep/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-grep/src/main.rs b/bin/core/imag-grep/src/main.rs index f3868808..aba22190 100644 --- a/bin/core/imag-grep/src/main.rs +++ b/bin/core/imag-grep/src/main.rs @@ -37,7 +37,7 @@ extern crate clap; extern crate regex; extern crate libimagstore; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagerror; use regex::Regex; @@ -54,8 +54,9 @@ struct Options { } fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-grep", - env!("CARGO_PKG_VERSION"), + &version, "grep through entries text", ui::build_ui); diff --git a/bin/core/imag-init/Cargo.toml b/bin/core/imag-init/Cargo.toml index da9e24d9..7eaf6f0b 100644 --- a/bin/core/imag-init/Cargo.toml +++ b/bin/core/imag-init/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index 60f74568..c05fe184 100644 --- a/bin/core/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-link/src/main.rs b/bin/core/imag-link/src/main.rs index 28a10775..2266e06b 100644 --- a/bin/core/imag-link/src/main.rs +++ b/bin/core/imag-link/src/main.rs @@ -39,7 +39,7 @@ extern crate url; #[cfg(test)] extern crate toml_query; extern crate libimagentrylink; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagstore; extern crate libimagerror; @@ -72,8 +72,9 @@ mod ui; use ui::build_ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-link", - env!("CARGO_PKG_VERSION"), + &version, "Link entries", build_ui); if rt.cli().is_present("check-consistency") { diff --git a/bin/core/imag-mv/Cargo.toml b/bin/core/imag-mv/Cargo.toml index faa0db92..7c38f937 100644 --- a/bin/core/imag-mv/Cargo.toml +++ b/bin/core/imag-mv/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-mv/src/main.rs b/bin/core/imag-mv/src/main.rs index 4de0186e..fbb5021e 100644 --- a/bin/core/imag-mv/src/main.rs +++ b/bin/core/imag-mv/src/main.rs @@ -35,7 +35,7 @@ #[macro_use] extern crate log; extern crate clap; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagstore; extern crate libimagerror; extern crate libimagentrylink; @@ -56,8 +56,9 @@ use libimagentrylink::internal::InternalLinker; use libimagstore::iter::get::StoreIdGetIteratorExtension; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-mv", - env!("CARGO_PKG_VERSION"), + &version, "Move things around in the store", build_ui); diff --git a/bin/core/imag-ref/Cargo.toml b/bin/core/imag-ref/Cargo.toml index 29af8fea..b0fb814a 100644 --- a/bin/core/imag-ref/Cargo.toml +++ b/bin/core/imag-ref/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-ref/src/main.rs b/bin/core/imag-ref/src/main.rs index 3235d1ce..3d1339e7 100644 --- a/bin/core/imag-ref/src/main.rs +++ b/bin/core/imag-ref/src/main.rs @@ -35,7 +35,7 @@ #[macro_use] extern crate log; extern crate clap; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagentryref; extern crate libimagerror; extern crate libimagentrylist; @@ -56,8 +56,9 @@ use libimagrt::setup::generate_runtime_setup; use libimagrt::runtime::Runtime; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-ref", - env!("CARGO_PKG_VERSION"), + &version, "Reference files outside of the store", build_ui); rt.cli() diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index 39d3db4b..db746943 100644 --- a/bin/core/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-store/src/main.rs b/bin/core/imag-store/src/main.rs index bbcb3260..2b16b047 100644 --- a/bin/core/imag-store/src/main.rs +++ b/bin/core/imag-store/src/main.rs @@ -38,7 +38,7 @@ extern crate toml; #[cfg(test)] extern crate toml_query; #[macro_use] extern crate error_chain; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagstore; extern crate libimagerror; @@ -76,8 +76,9 @@ use verify::verify; use ids::ids; fn main() { + let version = make_imag_version!(); let mut rt = generate_runtime_setup("imag-store", - env!("CARGO_PKG_VERSION"), + &version, "Direct interface to the store. Use with great care!", build_ui); diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml index f5059c71..1da7b182 100644 --- a/bin/core/imag-tag/Cargo.toml +++ b/bin/core/imag-tag/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-tag/src/main.rs b/bin/core/imag-tag/src/main.rs index 98b1ebdd..ea7ca324 100644 --- a/bin/core/imag-tag/src/main.rs +++ b/bin/core/imag-tag/src/main.rs @@ -23,7 +23,7 @@ extern crate clap; #[cfg(test)] extern crate toml; extern crate libimagstore; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagentrytag; extern crate libimagerror; @@ -58,8 +58,9 @@ mod ui; use ui::build_ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-store", - env!("CARGO_PKG_VERSION"), + &version, "Direct interface to the store. Use with great care!", build_ui); diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 6a98a301..6f3452bc 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag-view/src/main.rs b/bin/core/imag-view/src/main.rs index ea55c9a7..37a02d0c 100644 --- a/bin/core/imag-view/src/main.rs +++ b/bin/core/imag-view/src/main.rs @@ -41,7 +41,7 @@ extern crate toml_query; extern crate libimagentryview; extern crate libimagerror; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagstore; use std::collections::BTreeMap; @@ -64,8 +64,9 @@ mod ui; use ui::build_ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup( "imag-view", - env!("CARGO_PKG_VERSION"), + &version, "View entries (readonly)", build_ui); diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index 729d033d..fcdfb968 100644 --- a/bin/core/imag/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/core/imag/src/main.rs b/bin/core/imag/src/main.rs index 19f5308b..9addf820 100644 --- a/bin/core/imag/src/main.rs +++ b/bin/core/imag/src/main.rs @@ -23,7 +23,7 @@ extern crate walkdir; extern crate toml; extern crate toml_query; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagerror; use std::env; @@ -120,11 +120,11 @@ fn get_commands() -> Vec<String> { fn main() { // Initialize the Runtime and build the CLI let appname = "imag"; - let version = env!("CARGO_PKG_VERSION"); + let version = make_imag_version!(); let about = "imag - the PIM suite for the commandline"; let commands = get_commands(); let helptext = help_text(commands.clone()); - let mut app = Runtime::get_default_cli_builder(appname, version, about) + let mut app = Runtime::get_default_cli_builder(appname, &version, about) .settings(&[AppSettings::AllowExternalSubcommands, AppSettings::ArgRequiredElseHelp]) .arg(Arg::with_name("version") .long("version") diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index 7a4f97e4..4b4ee6ad 100644 --- a/bin/domain/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/domain/imag-bookmark/src/main.rs b/bin/domain/imag-bookmark/src/main.rs index e046cf08..d630baca 100644 --- a/bin/domain/imag-bookmark/src/main.rs +++ b/bin/domain/imag-bookmark/src/main.rs @@ -38,7 +38,7 @@ extern crate toml; extern crate toml_query; extern crate libimagbookmark; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagerror; extern crate libimagutil; @@ -59,8 +59,9 @@ mod ui; use ui::build_ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-bookmark", - env!("CARGO_PKG_VERSION"), + &version, "Bookmark collection tool", build_ui); diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index c3cbf9b4..71a4b1c9 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/domain/imag-contact/src/main.rs b/bin/domain/imag-contact/src/main.rs index 3f2a0e6e..502b41b0 100644 --- a/bin/domain/imag-contact/src/main.rs +++ b/bin/domain/imag-contact/src/main.rs @@ -43,7 +43,7 @@ extern crate uuid; extern crate libimagcontact; extern crate libimagstore; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagerror; extern crate libimagutil; extern crate libimaginteraction; @@ -79,8 +79,9 @@ use util::build_data_object_for_handlebars; use create::create; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-contact", - env!("CARGO_PKG_VERSION"), + &version, "Contact management tool", build_ui); diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index 1cbb642d..35f81803 100644 --- a/bin/domain/imag-diary/Cargo.toml +++ b/bin/domain/imag-diary/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/domain/imag-diary/src/main.rs b/bin/domain/imag-diary/src/main.rs index 935630a9..1ed42666 100644 --- a/bin/domain/imag-diary/src/main.rs +++ b/bin/domain/imag-diary/src/main.rs @@ -43,7 +43,7 @@ extern crate libimagentryedit; extern crate libimagentrylist; extern crate libimagerror; extern crate libimaginteraction; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagstore; extern crate libimagtimeui; extern crate libimagutil; @@ -68,10 +68,10 @@ use ui::build_ui; use view::view; fn main() { + let version = make_imag_version!(); let name = "imag-diary"; - let version = env!("CARGO_PKG_VERSION"); let about = "Personal Diary/Diaries"; - let ui = build_ui(Runtime::get_default_cli_builder(name, version, about)); + let ui = build_ui(Runtime::get_default_cli_builder(name, &version, about)); let rt = { let rt = Runtime::new(ui); if rt.is_ok() { diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 3748e47b..56bf6622 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -13,6 +13,8 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" +build = "../../../build.rs" + [badges] travis-ci = { repository = "matthiasbeyer/imag" } is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" } diff --git a/bin/domain/imag-habit/src/main.rs b/bin/domain/imag-habit/src/main.rs index f8fd12e3..a3ef5652 100644 --- a/bin/domain/imag-habit/src/main.rs +++ b/bin/domain/imag-habit/src/main.rs @@ -41,7 +41,7 @@ extern crate chrono; extern crate libimaghabit; extern crate libimagstore; -extern crate libimagrt; +#[macro_use] extern crate libimagrt; extern crate libimagerror; extern crate libimagutil; extern crate libimagentrylist; @@ -65,8 +65,9 @@ use libimaginteraction::ask::ask_bool; mod ui; fn main() { + let version = make_imag_version!(); let rt = generate_runtime_setup("imag-habit", - env!("CARGO_PKG_VERSION"), + &version, "Habit tracking tool", |