matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove dependency "version"

Browse source 
Because the "version" crate is licensed as GPL, which would us require
to release imag as GPL, we remove the crate now.
This commit is contained in:
Matthias Beyer 2018-01-11 22:22:26 +01:00
parent 7fdc71230e
commit bfc35e0517
48 changed files with 29 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/core/imag-annotate/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
url = "1.2"
toml = "0.4"
toml-query = "0.4"

4
bin/core/imag-annotate/src/main.rs
View file

@ -35,8 +35,6 @@
extern crate clap;
#[macro_use]
extern crate log;
#[macro_use]
extern crate version;
extern crate libimagentryannotation;
extern crate libimagentryedit;
@ -62,7 +60,7 @@ mod ui;
fn main() {
let rt = generate_runtime_setup("imag-annotation",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Add annotations to entries",
ui::build_ui);

1
bin/core/imag-diagnostics/Cargo.toml
View file

@ -15,7 +15,6 @@ homepage = "http://imag-pim.org"
[dependencies]
clap = ">=2.17"
version = "2.0.1"
toml = "0.4"
toml-query = "0.4"

5
bin/core/imag-diagnostics/src/main.rs
View file

@ -35,7 +35,6 @@
extern crate clap;
extern crate toml;
extern crate toml_query;
#[macro_use] extern crate version;
extern crate libimagrt;
extern crate libimagerror;
@ -95,7 +94,7 @@ impl<'a> From<FileLockEntry<'a>> for Diagnostic {
fn main() {
let rt = generate_runtime_setup("imag-diagnostics",
&version!()[..],
&env!("CARGO_PKG_VERSION")[..],
"Print diagnostics about imag and the imag store",
ui::build_ui);
@ -153,7 +152,7 @@ fn main() {
let n = diags.len();
println!("imag version {}", version!());
println!("imag version {}", env!("CARGO_PKG_VERSION"));
println!("");
println!("{} entries", n);
for (k, v) in version_counts {

3
bin/core/imag-edit/src/main.rs
View file

@ -34,7 +34,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate libimagentryedit;
extern crate libimagerror;
@ -54,7 +53,7 @@ mod ui;
fn main() {
let rt = generate_runtime_setup("imag-edit",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Edit store entries with $EDITOR",
ui::build_ui);

1
bin/core/imag-gps/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
url = "1.2"
toml = "0.4"
toml-query = "^0.4"

4
bin/core/imag-gps/src/main.rs
View file

@ -35,8 +35,6 @@
extern crate clap;
#[macro_use]
extern crate log;
#[macro_use]
extern crate version;
extern crate libimagentrygps;
extern crate libimagrt;
@ -60,7 +58,7 @@ mod ui;
fn main() {
let rt = generate_runtime_setup("imag-gps",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Add GPS coordinates to entries",
ui::build_ui);

1
bin/core/imag-grep/Cargo.toml
View file

@ -21,7 +21,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
version = "2.0.1"
regex = "0.2"
libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }

3
bin/core/imag-grep/src/main.rs
View file

@ -34,7 +34,6 @@
extern crate clap;
extern crate regex;
#[macro_use] extern crate version;
extern crate libimagstore;
extern crate libimagrt;
@ -56,7 +55,7 @@ struct Options {
fn main() {
let rt = generate_runtime_setup("imag-grep",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"grep through entries text",
ui::build_ui);

1
bin/core/imag-init/Cargo.toml
View file

@ -21,7 +21,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
version = "2.0.1"
[dev-dependencies]
toml = "0.4"

1
bin/core/imag-init/src/main.rs
View file

@ -33,7 +33,6 @@
)]
extern crate clap;
#[macro_use] extern crate version;
#[cfg(test)]
extern crate toml;

2
bin/core/imag-init/src/ui.rs
View file

@ -21,7 +21,7 @@ use clap::{Arg, App};
pub fn build_ui<'a>() -> App<'a, 'a> {
App::new("imag-init")
.version(&version!()[..])
.version(env!("CARGO_PKG_VERSION"))
.author("Matthias Beyer <mail@beyermatthias.de>")
.about("Initialize a ~/.imag repository. Optionally with git")

1
bin/core/imag-link/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
url = "1.5"
toml = "0.4"
toml-query = "^0.4"

3
bin/core/imag-link/src/main.rs
View file

@ -35,7 +35,6 @@
#[macro_use] extern crate log;
extern crate clap;
extern crate url;
#[macro_use] extern crate version;
#[cfg(test)] extern crate toml;
#[cfg(test)] extern crate toml_query;
@ -73,7 +72,7 @@ use ui::build_ui;
fn main() {
let rt = generate_runtime_setup("imag-link",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Link entries",
build_ui);
if rt.cli().is_present("check-consistency") {

1
bin/core/imag-mv/Cargo.toml
View file

@ -20,7 +20,6 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" }
maintenance = { status = "actively-developed" }
[dependencies]
version = "2.0"
clap = ">=2.17"
log = "0.3"

3
bin/core/imag-mv/src/main.rs
View file

@ -33,7 +33,6 @@
)]
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate clap;
extern crate libimagrt;
@ -51,7 +50,7 @@ use libimagstore::storeid::StoreId;
fn main() {
let rt = generate_runtime_setup("imag-mv",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Move things around in the store",
build_ui);

1
bin/core/imag-ref/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
libimagrt = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }

3
bin/core/imag-ref/src/main.rs
View file

@ -33,7 +33,6 @@
)]
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate clap;
extern crate libimagrt;
@ -58,7 +57,7 @@ use libimagrt::runtime::Runtime;
fn main() {
let rt = generate_runtime_setup("imag-ref",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Reference files outside of the store",
build_ui);
rt.cli()

1
bin/core/imag-store/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
toml = "0.4"
error-chain = "0.11"

3
bin/core/imag-store/src/main.rs
View file

@ -36,7 +36,6 @@ extern crate clap;
#[macro_use] extern crate log;
extern crate toml;
#[cfg(test)] extern crate toml_query;
#[macro_use] extern crate version;
#[macro_use] extern crate error_chain;
extern crate libimagrt;
@ -78,7 +77,7 @@ use ids::ids;
fn main() {
let mut rt = generate_runtime_setup("imag-store",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Direct interface to the store. Use with great care!",
build_ui);

1
bin/core/imag-tag/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
toml = "0.4"
libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }

3
bin/core/imag-tag/src/main.rs
View file

@ -19,7 +19,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
#[cfg(test)] extern crate toml;
@ -59,7 +58,7 @@ use ui::build_ui;
fn main() {
let rt = generate_runtime_setup("imag-store",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Direct interface to the store. Use with great care!",
build_ui);

1
bin/core/imag-view/Cargo.toml
View file

@ -24,7 +24,6 @@ clap = ">=2.17"
log = "0.3"
toml = "0.4"
toml-query = "^0.4"
version = "2.0.1"
handlebars = "0.29.0"
tempfile = "2.1"

3
bin/core/imag-view/src/main.rs
View file

@ -34,7 +34,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate handlebars;
extern crate tempfile;
extern crate toml;
@ -67,7 +66,7 @@ use ui::build_ui;
fn main() {
let rt = generate_runtime_setup( "imag-view",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"View entries (readonly)",
build_ui);

1
bin/core/imag/Cargo.toml
View file

@ -20,7 +20,6 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" }
maintenance = { status = "actively-developed" }
[dependencies]
version = "2.0"
walkdir = "1"
clap = ">=2.17"
log = "0.3"

5
bin/core/imag/src/main.rs
View file

@ -18,7 +18,6 @@
//
extern crate clap;
#[macro_use] extern crate version;
#[macro_use] extern crate log;
extern crate walkdir;
extern crate toml;
@ -118,7 +117,7 @@ fn get_commands() -> Vec<String> {
fn main() {
// Initialize the Runtime and build the CLI
let appname = "imag";
let version = &version!();
let version = env!("CARGO_PKG_VERSION");
let about = "imag - the PIM suite for the commandline";
let commands = get_commands();
let helptext = help_text(commands.clone());
@ -152,7 +151,7 @@ fn main() {
if matches.is_present("version") {
debug!("Showing version");
println!("imag {}", &version!()[..]);
println!("imag {}", env!("CARGO_PKG_VERSION"));
exit(0);
}

1
bin/domain/imag-bookmark/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
toml = "0.4"
toml-query = "^0.4"

3
bin/domain/imag-bookmark/src/main.rs
View file

@ -34,7 +34,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate toml;
extern crate toml_query;
@ -62,7 +61,7 @@ use ui::build_ui;
fn main() {
let rt = generate_runtime_setup("imag-bookmark",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Bookmark collection tool",
build_ui);

1
bin/domain/imag-contact/Cargo.toml
View file

@ -16,7 +16,6 @@ homepage = "http://imag-pim.org"
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
toml = "0.4"
toml-query = "^0.3.1"
handlebars = "0.29"

3
bin/domain/imag-contact/src/main.rs
View file

@ -34,7 +34,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
#[macro_use] extern crate vobject;
extern crate toml;
extern crate toml_query;
@ -81,7 +80,7 @@ use create::create;
fn main() {
let rt = generate_runtime_setup("imag-contact",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Contact management tool",
build_ui);

1
bin/domain/imag-diary/Cargo.toml
View file

@ -21,7 +21,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
chrono = "0.4"
version = "2.0"
clap = ">=2.17"
log = "0.3"
toml = "0.4"

3
bin/domain/imag-diary/src/main.rs
View file

@ -33,7 +33,6 @@
)]
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate clap;
extern crate chrono;
extern crate toml;
@ -70,7 +69,7 @@ use view::view;
fn main() {
let name = "imag-diary";
let version = &version!()[..];
let version = env!("CARGO_PKG_VERSION");
let about = "Personal Diary/Diaries";
let ui = build_ui(Runtime::get_default_cli_builder(name, version, about));
let rt = {

1
bin/domain/imag-habit/Cargo.toml
View file

@ -15,7 +15,6 @@ homepage = "http://imag-pim.org"
[dependencies]
chrono = "0.4"
version = "2.0"
clap = ">=2.17"
log = "0.3"
toml = "0.4"

3
bin/domain/imag-habit/src/main.rs
View file

@ -34,7 +34,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate toml;
extern crate toml_query;
extern crate kairos;
@ -67,7 +66,7 @@ mod ui;
fn main() {
let rt = generate_runtime_setup("imag-habit",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Habit tracking tool",
ui::build_ui);

1
bin/domain/imag-log/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
toml = "0.4"
toml-query = "^0.4"
is-match = "0.1"

3
bin/domain/imag-log/src/main.rs
View file

@ -35,7 +35,6 @@
extern crate clap;
#[macro_use] extern crate is_match;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate toml;
extern crate toml_query;
@ -58,7 +57,7 @@ use toml::Value;
fn main() {
let rt = generate_runtime_setup("imag-log",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Overlay to imag-diary to 'log' single lines of text",
build_ui);

1
bin/domain/imag-mail/Cargo.toml
View file

@ -18,7 +18,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
libimagrt = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }

3
bin/domain/imag-mail/src/main.rs
View file

@ -19,7 +19,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate libimagrt;
extern crate libimagmail;
@ -38,7 +37,7 @@ use ui::build_ui;
fn main() {
let rt = generate_runtime_setup("imag-mail",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Mail collection tool",
build_ui);

1
bin/domain/imag-notes/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
itertools = "0.7"
libimagrt = { version = "0.6.0", path = "../../../lib/core/libimagrt" }

3
bin/domain/imag-notes/src/main.rs
View file

@ -19,7 +19,6 @@
extern crate clap;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate itertools;
extern crate libimagnotes;
@ -45,7 +44,7 @@ use ui::build_ui;
fn main() {
let rt = generate_runtime_setup("imag-notes",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Note taking helper",
build_ui);

1
bin/domain/imag-timetrack/Cargo.toml
View file

@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" }
[dependencies]
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
chrono = "0.4"
filters = "0.2"
itertools = "0.7"

3
bin/domain/imag-timetrack/src/main.rs
View file

@ -21,7 +21,6 @@
extern crate log;
#[macro_use]
extern crate version;
extern crate clap;
extern crate chrono;
@ -59,7 +58,7 @@ use libimagrt::setup::generate_runtime_setup;
fn main() {
let rt = generate_runtime_setup("imag-timetrack",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Time tracking module",
build_ui);

1
bin/domain/imag-todo/Cargo.toml
View file

@ -25,7 +25,6 @@ log = "0.3"
toml = "0.4"
toml-query = "^0.4"
is-match = "0.1"
version = "2.0.1"
libimagrt = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }

3
bin/domain/imag-todo/src/main.rs
View file

@ -22,7 +22,6 @@ extern crate clap;
extern crate toml;
extern crate toml_query;
#[macro_use] extern crate is_match;
#[macro_use] extern crate version;
extern crate libimagrt;
extern crate libimagerror;
@ -43,7 +42,7 @@ mod ui;
use ui::build_ui;
fn main() {
let rt = generate_runtime_setup("imag-todo",
&version!()[..],
env!("CARGO_PKG_VERSION"),
"Interface with taskwarrior",
build_ui);

1
lib/core/libimagstore/Cargo.toml
View file

@ -26,7 +26,6 @@ log = "0.3"
regex = "0.2"
semver = "0.8"
toml = "0.4"
version = "2.0.1"
walkdir = "1"
is-match = "0.1"
serde = "1"

4
lib/core/libimagstore/src/file_abstraction/stdio/mapper/json.rs
View file

@ -85,7 +85,7 @@ impl Mapper for JsonMapper {
.chain_err(|| SEK::VersionError)
.and_then(|doc_vers| {
// safe because cargo does not compile if crate version is not valid
let crate_version = ::semver::Version::parse(version!()).unwrap();
let crate_version = ::semver::Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
debug!("Document version vs. own version: {doc_vers} > {crate_vers}",
doc_vers = doc_vers,
@ -144,7 +144,7 @@ impl Mapper for JsonMapper {
}
let doc = OutDocument {
version: String::from(version!()),
version: String::from(env!("CARGO_PKG_VERSION")),
store: store,
};

1
lib/core/libimagstore/src/lib.rs
View file

@ -36,7 +36,6 @@
)]
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate glob;
#[macro_use] extern crate lazy_static;
extern crate regex;

5
lib/core/libimagstore/src/store.rs
View file

@ -1076,7 +1076,8 @@ impl Header for Value {
m.insert(String::from("imag"), {
let mut imag_map = BTreeMap::<String, Value>::new();
imag_map.insert(String::from("version"), Value::String(String::from(version!())));
imag_map.insert(String::from("version"),
Value::String(String::from(env!("CARGO_PKG_VERSION"))));
Value::Table(imag_map)
});
@ -1203,7 +1204,7 @@ mod test {
let mut header = BTreeMap::new();
let sub = {
let mut sub = BTreeMap::new();
sub.insert("version".into(), Value::String(String::from(version!())));
sub.insert("version".into(), Value::String(String::from(env!("CARGO_PKG_VERSION"))));
Value::Table(sub)
};