diff options
author | Daniel Schadt <kingdread@gmx.de> | 2021-11-09 12:46:43 +0100 |
---|---|---|
committer | Daniel Schadt <kingdread@gmx.de> | 2021-11-09 12:50:33 +0100 |
commit | d21c5dc9c53b02620fce916ffc1a2695e9d3f698 (patch) | |
tree | fb17ba6ee4e0a1ed532ab6e570418abff5264616 | |
parent | 919796ec954414ae16f113896bdf212381c96437 (diff) | |
download | modderbaas-d21c5dc9c53b02620fce916ffc1a2695e9d3f698.tar.gz modderbaas-d21c5dc9c53b02620fce916ffc1a2695e9d3f698.tar.bz2 modderbaas-d21c5dc9c53b02620fce916ffc1a2695e9d3f698.zip |
Separate the binary and library
This uses the workspace feature of cargo, with the benefit that
1) We can more cleanly group the binary (user facing) code from the
library
2) We can have dependencies that apply to the binary only
The first point could've been achieved without workspaces (Cargo
supports both binaries and libraries in a crate), but the second point
is what really makes this approach a lot better.
-rw-r--r-- | Cargo.lock | 28 | ||||
-rw-r--r-- | Cargo.toml | 21 | ||||
-rw-r--r-- | modderbaas/Cargo.toml | 25 | ||||
-rw-r--r-- | modderbaas/src/baas.rs (renamed from src/baas.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/contentdb.rs (renamed from src/contentdb.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/download.rs (renamed from src/download.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/error.rs (renamed from src/error.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/game.rs (renamed from src/game.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/kvstore.rs (renamed from src/kvstore.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/lib.rs (renamed from src/lib.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/minemod.rs (renamed from src/minemod.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/util.rs (renamed from src/util.rs) | 0 | ||||
-rw-r--r-- | modderbaas/src/world.rs (renamed from src/world.rs) | 0 |
13 files changed, 47 insertions, 27 deletions
@@ -472,8 +472,6 @@ dependencies = [ name = "modderbaas" version = "0.1.0" dependencies = [ - "anyhow", - "clap", "dirs", "itertools", "log", @@ -482,11 +480,8 @@ dependencies = [ "regex", "scraper", "serde", - "stderrlog", "tempdir", - "termcolor", "thiserror", - "toml", "ureq", "url", "uuid", @@ -494,6 +489,20 @@ dependencies = [ ] [[package]] +name = "modderbaas-cli" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "itertools", + "log", + "modderbaas", + "nix", + "stderrlog", + "termcolor", +] + +[[package]] name = "new_debug_unreachable" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1146,15 +1155,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] name = "ucd-trie" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1,30 +1,25 @@ [package] -name = "modderbaas" +name = "modderbaas-cli" version = "0.1.0" authors = ["Daniel Schadt <kingdread@gmx.de>"] edition = "2018" +[[bin]] +name = "modderbaas" +path = "src/main.rs" + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[workspace] + [dependencies] anyhow = "1.0.45" clap = "2.33.3" -dirs = "4.0.0" itertools = "0.10.1" log = "0.4.14" -once_cell = "1.8.0" -regex = "1.5.4" -scraper = "0.12.0" -serde = { version = "1.0.130", features = ["derive"] } +modderbaas = { path = "modderbaas" } stderrlog = "0.5.1" -tempdir = "0.3.7" termcolor = "1.1.2" -thiserror = "1.0.30" -toml = "0.5.8" -ureq = { version = "2.3.0", features = ["json"] } -url = { version = "2.2.2", features = ["serde"] } -uuid = { version = "0.8.2", features = ["v4"] } -zip = "0.5.13" [target.'cfg(unix)'.dependencies] nix = "0.23.0" diff --git a/modderbaas/Cargo.toml b/modderbaas/Cargo.toml new file mode 100644 index 0000000..c07ba82 --- /dev/null +++ b/modderbaas/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "modderbaas" +version = "0.1.0" +authors = ["Daniel Schadt <kingdread@gmx.de>"] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +dirs = "4.0.0" +itertools = "0.10.1" +log = "0.4.14" +once_cell = "1.8.0" +regex = "1.5.4" +scraper = "0.12.0" +serde = { version = "1.0.130", features = ["derive"] } +tempdir = "0.3.7" +thiserror = "1.0.30" +ureq = { version = "2.3.0", features = ["json"] } +url = { version = "2.2.2", features = ["serde"] } +uuid = { version = "0.8.2", features = ["v4"] } +zip = "0.5.13" + +[target.'cfg(unix)'.dependencies] +nix = "0.23.0" diff --git a/src/baas.rs b/modderbaas/src/baas.rs index 938b4c4..938b4c4 100644 --- a/src/baas.rs +++ b/modderbaas/src/baas.rs diff --git a/src/contentdb.rs b/modderbaas/src/contentdb.rs index d9c4688..d9c4688 100644 --- a/src/contentdb.rs +++ b/modderbaas/src/contentdb.rs diff --git a/src/download.rs b/modderbaas/src/download.rs index b9507b7..b9507b7 100644 --- a/src/download.rs +++ b/modderbaas/src/download.rs diff --git a/src/error.rs b/modderbaas/src/error.rs index 5dbd6b6..5dbd6b6 100644 --- a/src/error.rs +++ b/modderbaas/src/error.rs diff --git a/src/game.rs b/modderbaas/src/game.rs index 0d2405d..0d2405d 100644 --- a/src/game.rs +++ b/modderbaas/src/game.rs diff --git a/src/kvstore.rs b/modderbaas/src/kvstore.rs index 006bb94..006bb94 100644 --- a/src/kvstore.rs +++ b/modderbaas/src/kvstore.rs diff --git a/src/lib.rs b/modderbaas/src/lib.rs index f9b1c8b..f9b1c8b 100644 --- a/src/lib.rs +++ b/modderbaas/src/lib.rs diff --git a/src/minemod.rs b/modderbaas/src/minemod.rs index 456d1c6..456d1c6 100644 --- a/src/minemod.rs +++ b/modderbaas/src/minemod.rs diff --git a/src/util.rs b/modderbaas/src/util.rs index ea401ba..ea401ba 100644 --- a/src/util.rs +++ b/modderbaas/src/util.rs diff --git a/src/world.rs b/modderbaas/src/world.rs index 5dce6d0..5dce6d0 100644 --- a/src/world.rs +++ b/modderbaas/src/world.rs |