better deps and move things

Cargo.toml

@@ -3,14 +3,11 @@ resolver = "2"
 members = [
   ".",
   "members/libpt-core",
-  "members/libpt-bintols",
   "members/libpt-math",
-  "members/libpt-bin",
   "members/libpt-log",
   "members/libpt-net",
-  "members/libpt-hedu",
 ]
-default-members = [".", "members/libpt-bin", "members/libpt-core"]
+default-members = [".", "members/libpt-core"]
 [workspace.package]
 publish = true
 version = "0.2.0-alpha.3"
@@ -31,8 +28,13 @@ categories = [
 [workspace.dependencies]
 anyhow = "1.0.79"
 thiserror = "1.0.56"
-libpt-log = { version = "0.2.0-alpha.2", path = "../libpt-log" }
+libpt-core = { version = "0.2.0-alpha.2", path = "members/libpt-core", registry = "cscherr" }
-libpt-bintols = { version = "0.2.0-alpha.2", ath = "../libpt-bintols" }
+libpt-bintols = { version = "0.2.0-alpha.2", path = "members/libpt-bintols", registry = "cscherr", optional = true }
+libpt-hedu = { version = "0.2.0-alpha.2", path = "members/libpt-hedu", registry = "cscherr", optional = true }
+libpt-log = { version = "0.2.0-alpha.2", path = "members/libpt-log", registry = "cscherr", optional = true }
+libpt-math = { version = "0.2.0-alpha.2", path = "members/libpt-math", registry = "cscherr", optional = true }
+libpt-ccc = { version = "0.2.0-alpha.2", path = "members/libpt-ccc", registry = "cscherr", optional = true }
+libpt-net = { version = "0.2.0-alpha.2", path = "members/libpt-net", registry = "cscherr", optional = true }
 
 [package]
 name = "libpt"
@@ -52,13 +54,12 @@ categories.workspace = true
 default = ["log", "core"]
 all = ["default", "math", "log", "bintols", "net", "ccc", "hedu", "core"]
 core = []
-fw = []
+math = ["dep:libpt-math"]
-math = []
+log = ["dep:libpt-log"]
-log = []
+bintols = ["dep:libpt-bintols"]
-bintols = []
+net = ["dep:libpt-net"]
-net = []
 ccc = ["math"]
-hedu = ["bintols"]
+bin = ["bintols", "math", "dep:clap", "dep:clap-num", "dep:clap-verbosity-flag"]
 
 [lib]
 name = "libpt"
@@ -68,13 +69,14 @@ crate-type = [
   "rlib",
 ]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-libpt-bintols = { version = "0.2.0-alpha.2", path = "members/libpt-bintols", registry="cscherr"}
+libpt-core = { workspace = true }
-libpt-core = { version = "0.2.0-alpha.2", path = "members/libpt-core", registry="cscherr" }
+libpt-bintols = { workspace = true }
-libpt-hedu = { version = "0.2.0-alpha.2", path = "members/libpt-hedu", registry="cscherr" }
+libpt-hedu = { workspace = true }
-libpt-log = { version = "0.2.0-alpha.2", path = "members/libpt-log", registry="cscherr" }
+libpt-log = { workspace = true }
-libpt-math = { version = "0.2.0-alpha.2", path = "members/libpt-math", registry="cscherr" }
+libpt-math = { workspace = true }
-libpt-ccc = { version = "0.2.0-alpha.2", path = "members/libpt-ccc", registry="cscherr" }
+libpt-ccc = { workspace = true }
-libpt-net = { version = "0.2.0-alpha.2", path = "members/libpt-net", registry="cscherr" }
+libpt-net = { workspace = true }
+clap = { version = "4.4.4", features = ["derive"], optional = true }
+clap-num = { version = "1.0.2", optional = true }
+clap-verbosity-flag = { version = "2.0.1", optional = true }

members/libpt-bin/Cargo.toml

@@ -1,41 +0,0 @@
-[package]
-autobins = true
-name = "libpt-bin"
-publish.workspace = true
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-description.workspace = true
-readme.workspace = true
-homepage.workspace = true
-repository.workspace = true
-keywords.workspace = true
-categories.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bin]]
-name = "ccc"
-path = "src/ccc/mod.rs"
-
-[[bin]]
-name = "hedu"
-path = "src/hedu/mod.rs"
-
-[[bin]]
-name = "libpt"
-path = "src/main/mod.rs"
-
-[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
-clap-num = "1.0.2"
-clap-verbosity-flag = "2.0.1"
-libpt = { version = "0.2.0-alpha.2", path = "../..", features = [
-  "default",
-  "ccc",
-  "math",
-  "hedu",
-  "net",
-  "log",
-], registry = "cscherr" }

members/libpt-bintols/Cargo.toml

@@ -16,5 +16,7 @@ categories.workspace = true
 
 [dependencies]
 num-traits = "0.2.16"
-libpt-core = { version = "0.2.0-alpha.2", path = "../libpt-core", registry="cscherr" }
+libpt-core = { workspace = true }
-libpt-log = { version = "0.2.0-alpha.2", path = "../libpt-log", registry="cscherr" }
+libpt-log = { workspace = true }
+anyhow = { workspace = true }
+thiserror = { workspace = true }

members/libpt-ccc/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "libpt-ccc"
-publish.workspace = true
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-description.workspace = true
-readme.workspace = true
-homepage.workspace = true
-repository.workspace = true
-keywords.workspace = true
-categories.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-num = "0.4.1"
-num-traits = "0.2.16"
-libpt-core = { version = "0.2.0-alpha.2", path = "../libpt-core", registry="cscherr" }
-libpt-log = { version = "0.2.0-alpha.2", path = "../libpt-log", registry="cscherr" }
-libpt-math = { version = "0.2.0-alpha.2", path = "../libpt-math", registry="cscherr" }

members/libpt-core/Cargo.toml

@@ -15,4 +15,4 @@ categories.workspace = true
 [dependencies]
 anyhow = "1.0.79"
 cucumber = "0.20.2"
-libpt-log = { version = "0.2.0-alpha.2", path = "../libpt-log", registry="cscherr" }
+libpt-log = { workspace = true }

members/libpt-hedu/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "libpt-hedu"
-publish.workspace = true
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-description.workspace = true
-readme.workspace = true
-homepage.workspace = true
-repository.workspace = true
-keywords.workspace = true
-categories.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = { workspace = true }
-thiserror = { workspace = true }
-libpt-log = { version = "0.2.0-alpha.2", path = "../libpt-log", registry="cscherr" }
-libpt-bintols = { version = "0.2.0-alpha.2", path = "../libpt-bintols", registry="cscherr" }

members/libpt-math/Cargo.toml

@@ -15,3 +15,7 @@ categories.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+num = "0.4.1"
+num-traits = "0.2.16"
+libpt-core = { workspace = true }
+libpt-log = { workspace = true }

members/libpt-net/Cargo.toml

@@ -16,9 +16,9 @@ categories.workspace = true
 
 [dependencies]
 humantime = "2.1.0"
-libpt-core = { version = "0.2.0-alpha.2", path = "../libpt-core", registry="cscherr" }
+libpt-core = { workspace = true }
-libpt-log = { version = "0.2.0-alpha.2", path = "../libpt-log", registry="cscherr" }
+libpt-log = { workspace = true }
-libpt-math = { version = "0.2.0-alpha.2", path = "../libpt-math", registry="cscherr" }
+libpt-math = { workspace = true }
 reqwest = { version = "0.11.20", features = ["blocking"] }
 serde = { version = "1.0.188", features = ["serde_derive"] }
 serde_json = "1.0.107"