merge new structure for alpha release #51

Merged
PlexSheep merged 5 commits from devel into master 2024-01-17 14:37:38 +01:00
14 changed files with 35 additions and 111 deletions
Showing only changes of commit df2c07573d - Show all commits

View File

@ -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-bintols = { version = "0.2.0-alpha.2", ath = "../libpt-bintols" }
libpt-core = { version = "0.2.0-alpha.2", path = "members/libpt-core", registry = "cscherr" }
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 = []
log = []
bintols = []
net = []
math = ["dep:libpt-math"]
log = ["dep:libpt-log"]
bintols = ["dep:libpt-bintols"]
net = ["dep:libpt-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 = { version = "0.2.0-alpha.2", path = "members/libpt-core", registry="cscherr" }
libpt-hedu = { version = "0.2.0-alpha.2", path = "members/libpt-hedu", registry="cscherr" }
libpt-log = { version = "0.2.0-alpha.2", path = "members/libpt-log", registry="cscherr" }
libpt-math = { version = "0.2.0-alpha.2", path = "members/libpt-math", registry="cscherr" }
libpt-ccc = { version = "0.2.0-alpha.2", path = "members/libpt-ccc", registry="cscherr" }
libpt-net = { version = "0.2.0-alpha.2", path = "members/libpt-net", registry="cscherr" }
libpt-core = { workspace = true }
libpt-bintols = { workspace = true }
libpt-hedu = { workspace = true }
libpt-log = { workspace = true }
libpt-math = { workspace = true }
libpt-ccc = { workspace = true }
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 }

View File

@ -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" }

View File

@ -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-log = { version = "0.2.0-alpha.2", path = "../libpt-log", registry="cscherr" }
libpt-core = { workspace = true }
libpt-log = { workspace = true }
anyhow = { workspace = true }
thiserror = { workspace = true }

View File

@ -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" }

View File

@ -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 }

View File

@ -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" }

View File

@ -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 }

View File

@ -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-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" }
libpt-core = { workspace = true }
libpt-log = { workspace = true }
libpt-math = { workspace = true }
reqwest = { version = "0.11.20", features = ["blocking"] }
serde = { version = "1.0.188", features = ["serde_derive"] }
serde_json = "1.0.107"