diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2017-01-20 10:00:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-20 10:00:44 +0100 |
commit | 0cf564091ece3c12ab83b1c5bb8555b1149c3d21 (patch) | |
tree | fbc7fe2d305e4910118ab2c0d37edca1560fb24b | |
parent | 4a821d7b196a4d478cdf51520c4c2939aaa06a81 (diff) | |
parent | 099f3231e50206e35b528be8b1e8fa2bae58947c (diff) | |
download | imag-0cf564091ece3c12ab83b1c5bb8555b1149c3d21.zip imag-0cf564091ece3c12ab83b1c5bb8555b1149c3d21.tar.gz |
Merge pull request #852 from mario-kr/add_workspace-support
Add workspace support
35 files changed, 61 insertions, 96 deletions
diff --git a/.imag-documentation/Cargo.toml b/.imag-documentation/Cargo.toml index 217538f..5807018 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/.travis.yml b/.travis.yml index bdcb196..f1b0892 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 diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..3c59dde --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,58 @@ +[package] +name = "imag-root" +version = "0.2.0" +authors = ["Matthias Beyer <mail@beyermatthias.de>"] + +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" + +[profile.dev] +codegen-units = 2 + +[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", + "libimagentryedit", + "libimagentryfilter", + "libimagentrylink", + "libimagentrylist", + "libimagentrymarkdown", + "libimagentrytag", + "libimagentryview", + "libimagerror", + "libimaginteraction", + "libimagmail", + "libimagnotes", + "libimagref", + "libimagrt", + "libimagstore", + "libimagstorestdhook", + "libimagtimeui", + "libimagtodo", + "libimagutil", +] + +[[bin]] +name = "imag-bin" +path = "bin/src/main.rs" + diff --git a/bin/Cargo.toml b/bin/Cargo.toml index 76cc063..8514a7f 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 c1b4e55..61b5452 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 80fdeda..016eadf 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 f0a7568..0ec869a 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 ffe57ed..c40a7d3 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-link/tests/utils.sh b/imag-link/tests/utils.sh index ff9e997..ec6c42a 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-notes/Cargo.toml b/imag-notes/Cargo.toml index c7ef71a..59f4a80 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 eae8673..730d966 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 e2a5833..66648cb 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-store/tests/utils.sh b/imag-store/tests/utils.sh index 34e9260..60be71a 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 $* } diff --git a/imag-tag/Cargo.toml b/imag-tag/Cargo.toml index 88a97b9..7330e2e 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 bb75c57..7a3cbbe 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 f4826f5..c93d8f2 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 d30bcc0..0c50403 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 7478540..0551b42 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 db238f0..ec9f02a 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 8fc6f6f..fd5562e 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 7ce7a0e..463149b 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 0f7a73d..794cd81 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 914dcfe..6893a11 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 a03b2a5..0ac821a 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 8bf7e59..f29d611 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 2930f5c..d1394bd 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 e9333af..cde39f2 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 357d553..36d8e13 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 b6f21ab..825f80e 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 68f2420..8655bcc 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 ae240d0..5b050f6 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 82c286c..483fa1c 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 fcf5686..32509fd 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 d46edd3..7b2c913 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 2f7c392..7b37d19 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" |