From e430906e51d4fa34b764c3a98ef2558527ead28f Mon Sep 17 00:00:00 2001 From: mario Date: Thu, 19 Jan 2017 19:21:02 +0100 Subject: [PATCH 1/5] Re-add Cargo.toml with workspace members --- Cargo.toml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 Cargo.toml diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 00000000..74ac16a8 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,53 @@ +[package] +name = "imag-root" +version = "0.2.0" +authors = ["Matthias Beyer "] + +description = "Personal information management (PIM) suite" +keywords = ["pim", "personal", "information", "management", "suite"] +readme = "./README.md" +license = "LGPL-2.1" + +website = "http://imag-pim.org" +documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +repository = "https://github.com/matthiasbeyer/imag" + +[workspace] +members = [ + "bin", + "imag-bookmark", + "imag-counter", + "imag-diary", + "imag-link", + "imag-mail", + "imag-notes", + "imag-ref", + "imag-store", + "imag-tag", + "imag-todo", + "imag-view", + "libimagbookmark", + "libimagcounter", + "libimagdiary", + "libimagentryfilter", + "libimagentrylink", + "libimagentrylist", + "libimagentrymarkdown", + "libimagentrytag", + "libimagentryview", + "libimagerror", + "libimaginteraction", + "libimagnotes", + "libimagref", + "libimagrt", + "libimagstore", + "libimagstorestdhook", + "libimagtimeui", + "libimagtodo", + "libimagutil", +] + +[[bin]] +name = "imag-bin" +path = "bin/src/main.rs" + From 4cdbfb62dab9655d5a1d7ecb3e2173237cb8e940 Mon Sep 17 00:00:00 2001 From: mario Date: Thu, 19 Jan 2017 19:23:11 +0100 Subject: [PATCH 2/5] Adjust imag-*/tests/utils.sh to new `target` directory --- imag-link/tests/utils.sh | 2 +- imag-store/tests/utils.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/imag-link/tests/utils.sh b/imag-link/tests/utils.sh index ff9e9975..ec6c42a9 100644 --- a/imag-link/tests/utils.sh +++ b/imag-link/tests/utils.sh @@ -1,6 +1,6 @@ source $(dirname ${BASH_SOURCE[0]})/../../tests/utils.sh imag-link() { - imag-call-binary "$(dirname ${BASH_SOURCE[0]})/../target/debug/" imag-link $* + imag-call-binary "$(dirname ${BASH_SOURCE[0]})/../../target/debug/" imag-link $* } diff --git a/imag-store/tests/utils.sh b/imag-store/tests/utils.sh index 34e92600..60be71aa 100644 --- a/imag-store/tests/utils.sh +++ b/imag-store/tests/utils.sh @@ -1,6 +1,6 @@ source $(dirname ${BASH_SOURCE[0]})/../../tests/utils.sh imag-store() { - imag-call-binary "$(dirname ${BASH_SOURCE[0]})/../target/debug/" imag-store $* + imag-call-binary "$(dirname ${BASH_SOURCE[0]})/../../target/debug/" imag-store $* } From 8df5519f341dc47f9350e054db2a5df6f44dbb24 Mon Sep 17 00:00:00 2001 From: mario Date: Thu, 19 Jan 2017 20:08:51 +0100 Subject: [PATCH 3/5] Move `[profile.dev] codegen-units = 2` to top-level Cargo.toml lower level (=package/crate level) definitions for profiles are ignored --- .imag-documentation/Cargo.toml | 3 --- Cargo.toml | 3 +++ bin/Cargo.toml | 3 --- imag-bookmark/Cargo.toml | 3 --- imag-counter/Cargo.toml | 3 --- imag-diary/Cargo.toml | 3 --- imag-link/Cargo.toml | 3 --- imag-notes/Cargo.toml | 3 --- imag-ref/Cargo.toml | 3 --- imag-store/Cargo.toml | 3 --- imag-tag/Cargo.toml | 3 --- imag-todo/Cargo.toml | 3 --- imag-view/Cargo.toml | 3 --- libimagbookmark/Cargo.toml | 3 --- libimagcounter/Cargo.toml | 3 --- libimagdiary/Cargo.toml | 3 --- libimagentryfilter/Cargo.toml | 3 --- libimagentrylink/Cargo.toml | 3 --- libimagentrylist/Cargo.toml | 3 --- libimagentrymarkdown/Cargo.toml | 3 --- libimagentrytag/Cargo.toml | 3 --- libimagentryview/Cargo.toml | 3 --- libimagerror/Cargo.toml | 3 --- libimaginteraction/Cargo.toml | 3 --- libimagnotes/Cargo.toml | 3 --- libimagref/Cargo.toml | 3 --- libimagrt/Cargo.toml | 3 --- libimagstore/Cargo.toml | 3 --- libimagstorestdhook/Cargo.toml | 3 --- libimagtimeui/Cargo.toml | 3 --- libimagtodo/Cargo.toml | 3 --- libimagutil/Cargo.toml | 3 --- 32 files changed, 3 insertions(+), 93 deletions(-) diff --git a/.imag-documentation/Cargo.toml b/.imag-documentation/Cargo.toml index 217538f8..58070181 100644 --- a/.imag-documentation/Cargo.toml +++ b/.imag-documentation/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] [dependencies.libimagbookmark] diff --git a/Cargo.toml b/Cargo.toml index 74ac16a8..1d0d89b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,9 @@ website = "http://imag-pim.org" documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" repository = "https://github.com/matthiasbeyer/imag" +[profile.dev] +codegen-units = 2 + [workspace] members = [ "bin", diff --git a/bin/Cargo.toml b/bin/Cargo.toml index 76cc0636..8514a7fc 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -22,9 +22,6 @@ libimagrt = { path = "../libimagrt" } libimagentrytag = { path = "../libimagentrytag" } libimagutil = { path = "../libimagutil" } -[profile.dev] -codegen-units = 2 - [dependencies] version = "2.0" walkdir = "0.1" diff --git a/imag-bookmark/Cargo.toml b/imag-bookmark/Cargo.toml index c1b4e55c..61b54528 100644 --- a/imag-bookmark/Cargo.toml +++ b/imag-bookmark/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" log = "0.3" diff --git a/imag-counter/Cargo.toml b/imag-counter/Cargo.toml index 80fdedad..016eadf5 100644 --- a/imag-counter/Cargo.toml +++ b/imag-counter/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" log = "0.3" diff --git a/imag-diary/Cargo.toml b/imag-diary/Cargo.toml index f0a75688..0ec869af 100644 --- a/imag-diary/Cargo.toml +++ b/imag-diary/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] chrono = "0.2" version = "2.0" diff --git a/imag-link/Cargo.toml b/imag-link/Cargo.toml index ffe57ed5..c40a7d3c 100644 --- a/imag-link/Cargo.toml +++ b/imag-link/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] semver = "0.5.1" clap = ">=2.17" diff --git a/imag-notes/Cargo.toml b/imag-notes/Cargo.toml index c7ef71a3..59f4a802 100644 --- a/imag-notes/Cargo.toml +++ b/imag-notes/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] semver = "0.2.1" clap = ">=2.17" diff --git a/imag-ref/Cargo.toml b/imag-ref/Cargo.toml index eae86734..730d966f 100644 --- a/imag-ref/Cargo.toml +++ b/imag-ref/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] semver = "0.5.1" clap = ">=2.17" diff --git a/imag-store/Cargo.toml b/imag-store/Cargo.toml index e2a58339..66648cb1 100644 --- a/imag-store/Cargo.toml +++ b/imag-store/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" log = "0.3" diff --git a/imag-tag/Cargo.toml b/imag-tag/Cargo.toml index 88a97b9d..7330e2e1 100644 --- a/imag-tag/Cargo.toml +++ b/imag-tag/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = "2.*" log = "0.3" diff --git a/imag-todo/Cargo.toml b/imag-todo/Cargo.toml index bb75c577..7a3cbbe9 100644 --- a/imag-todo/Cargo.toml +++ b/imag-todo/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" glob = "0.2.11" diff --git a/imag-view/Cargo.toml b/imag-view/Cargo.toml index f4826f51..c93d8f24 100644 --- a/imag-view/Cargo.toml +++ b/imag-view/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" log = "0.3" diff --git a/libimagbookmark/Cargo.toml b/libimagbookmark/Cargo.toml index d30bcc0c..0c50403c 100644 --- a/libimagbookmark/Cargo.toml +++ b/libimagbookmark/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] log = "0.3" semver = "0.5" diff --git a/libimagcounter/Cargo.toml b/libimagcounter/Cargo.toml index 7478540a..0551b42e 100644 --- a/libimagcounter/Cargo.toml +++ b/libimagcounter/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] log = "0.3" toml = "0.2.*" diff --git a/libimagdiary/Cargo.toml b/libimagdiary/Cargo.toml index db238f06..ec9f02a7 100644 --- a/libimagdiary/Cargo.toml +++ b/libimagdiary/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] chrono = "0.2" log = "0.3" diff --git a/libimagentryfilter/Cargo.toml b/libimagentryfilter/Cargo.toml index 8fc6f6f7..fd5562ed 100644 --- a/libimagentryfilter/Cargo.toml +++ b/libimagentryfilter/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" filters = "0.1.*" diff --git a/libimagentrylink/Cargo.toml b/libimagentrylink/Cargo.toml index 7ce7a0e9..463149b6 100644 --- a/libimagentrylink/Cargo.toml +++ b/libimagentrylink/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] itertools = "0.5" log = "0.3" diff --git a/libimagentrylist/Cargo.toml b/libimagentrylist/Cargo.toml index 0f7a73d1..794cd814 100644 --- a/libimagentrylist/Cargo.toml +++ b/libimagentrylist/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = "2.*" log = "0.3" diff --git a/libimagentrymarkdown/Cargo.toml b/libimagentrymarkdown/Cargo.toml index 914dcfe4..6893a113 100644 --- a/libimagentrymarkdown/Cargo.toml +++ b/libimagentrymarkdown/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] log = "0.3" hoedown = "5.0.0" diff --git a/libimagentrytag/Cargo.toml b/libimagentrytag/Cargo.toml index a03b2a53..0ac821ad 100644 --- a/libimagentrytag/Cargo.toml +++ b/libimagentrytag/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" log = "0.3" diff --git a/libimagentryview/Cargo.toml b/libimagentryview/Cargo.toml index 8bf7e59e..f29d6119 100644 --- a/libimagentryview/Cargo.toml +++ b/libimagentryview/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] log = "0.3" toml = "0.2.*" diff --git a/libimagerror/Cargo.toml b/libimagerror/Cargo.toml index 2930f5c0..d1394bd1 100644 --- a/libimagerror/Cargo.toml +++ b/libimagerror/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] log = "0.3" ansi_term = "0.9" diff --git a/libimaginteraction/Cargo.toml b/libimaginteraction/Cargo.toml index e9333af3..cde39f26 100644 --- a/libimaginteraction/Cargo.toml +++ b/libimaginteraction/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] ansi_term = "0.9.*" clap = ">=2.17" diff --git a/libimagnotes/Cargo.toml b/libimagnotes/Cargo.toml index 357d5530..36d8e13e 100644 --- a/libimagnotes/Cargo.toml +++ b/libimagnotes/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] semver = "0.5" log = "0.3" diff --git a/libimagref/Cargo.toml b/libimagref/Cargo.toml index b6f21abe..825f80ee 100644 --- a/libimagref/Cargo.toml +++ b/libimagref/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] itertools = "0.5" log = "0.3" diff --git a/libimagrt/Cargo.toml b/libimagrt/Cargo.toml index 68f24208..8655bccd 100644 --- a/libimagrt/Cargo.toml +++ b/libimagrt/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" env_logger = "0.3" diff --git a/libimagstore/Cargo.toml b/libimagstore/Cargo.toml index ae240d01..5b050f6b 100644 --- a/libimagstore/Cargo.toml +++ b/libimagstore/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] fs2 = "0.4" glob = "0.2.11" diff --git a/libimagstorestdhook/Cargo.toml b/libimagstorestdhook/Cargo.toml index 82c286c3..483fa1cf 100644 --- a/libimagstorestdhook/Cargo.toml +++ b/libimagstorestdhook/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] toml = "0.2.*" log = "0.3" diff --git a/libimagtimeui/Cargo.toml b/libimagtimeui/Cargo.toml index fcf5686e..32509fda 100644 --- a/libimagtimeui/Cargo.toml +++ b/libimagtimeui/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] clap = ">=2.17" lazy_static = "0.2" diff --git a/libimagtodo/Cargo.toml b/libimagtodo/Cargo.toml index d46edd3f..7b2c9138 100644 --- a/libimagtodo/Cargo.toml +++ b/libimagtodo/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] semver = "0.2" task-hookrs = "0.2.2" diff --git a/libimagutil/Cargo.toml b/libimagutil/Cargo.toml index 2f7c392a..7b37d19e 100644 --- a/libimagutil/Cargo.toml +++ b/libimagutil/Cargo.toml @@ -13,9 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" -[profile.dev] -codegen-units = 2 - [dependencies] url = "1.2" boolinator = "2.4.0" From aee50ac05f39dda2af3cbab4a0248ac75a3d2e1e Mon Sep 17 00:00:00 2001 From: mario Date: Thu, 19 Jan 2017 20:20:05 +0100 Subject: [PATCH 4/5] Add missing members to workspace --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 1d0d89b3..3c59dde6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,7 @@ members = [ "libimagbookmark", "libimagcounter", "libimagdiary", + "libimagentryedit", "libimagentryfilter", "libimagentrylink", "libimagentrylist", @@ -40,6 +41,7 @@ members = [ "libimagentryview", "libimagerror", "libimaginteraction", + "libimagmail", "libimagnotes", "libimagref", "libimagrt", From 099f3231e50206e35b528be8b1e8fa2bae58947c Mon Sep 17 00:00:00 2001 From: mario Date: Thu, 19 Jan 2017 20:20:57 +0100 Subject: [PATCH 5/5] Change lowest rust version in .travis.yml to 1.13.0 from 1.11.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bdcb1968..f1b08921 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: rust rust: -- 1.11.0 +- 1.13.0 - beta - stable cache: cargo