diff --git a/Cargo.lock b/Cargo.lock index 7d44b5b3..9097c8f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -991,7 +991,7 @@ dependencies = [ [[package]] name = "ffplayout-api" -version = "0.9.0-beta3" +version = "0.17.0-beta3" dependencies = [ "actix-files", "actix-multipart", @@ -2805,7 +2805,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.1.1" +version = "0.17.0-beta3" dependencies = [ "chrono", "crossbeam-channel", diff --git a/Cargo.toml b/Cargo.toml index 6a8f57cd..c04bd204 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,13 @@ members = ["ffplayout-api", "ffplayout-engine", "lib", "tests"] default-members = ["ffplayout-api", "ffplayout-engine", "tests"] +[workspace.package] +version = "0.17.0-beta3" +license = "GPL-3.0" +repository = "https://github.com/ffplayout/ffplayout" +authors = ["Jonathan Baecker "] +edition = "2021" + [profile.release] opt-level = 3 strip = true diff --git a/ffplayout-api/Cargo.toml b/ffplayout-api/Cargo.toml index 7f599097..fcd2c710 100644 --- a/ffplayout-api/Cargo.toml +++ b/ffplayout-api/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "ffplayout-api" description = "Rest API for ffplayout" -license = "GPL-3.0" -authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.9.0-beta3" -edition = "2021" +version.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true +edition.workspace = true [dependencies] ffplayout-lib = { path = "../lib" } @@ -33,10 +34,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.8" simplelog = { version = "^0.12", features = ["paris"] } -sqlx = { version = "0.6", features = [ - "runtime-actix-native-tls", - "sqlite" -] } +sqlx = { version = "0.6", features = ["runtime-actix-native-tls", "sqlite"] } [[bin]] name = "ffpapi" diff --git a/ffplayout-engine/Cargo.toml b/ffplayout-engine/Cargo.toml index d13cef90..ac9b43ea 100644 --- a/ffplayout-engine/Cargo.toml +++ b/ffplayout-engine/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "ffplayout" description = "24/7 playout based on rust and ffmpeg" -license = "GPL-3.0" -authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.17.0-beta3" -edition = "2021" +version.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true +edition.workspace = true + default-run = "ffplayout" [dependencies] @@ -23,7 +25,7 @@ serde_json = "1.0" simplelog = { version = "^0.12", features = ["paris"] } zeromq = { git = "https://github.com/zeromq/zmq.rs.git", default-features = false, features = [ "async-std-runtime", - "tcp-transport" + "tcp-transport", ] } [target.x86_64-unknown-linux-musl.dependencies] @@ -45,48 +47,152 @@ suggests = "ffmpeg" copyright = "Copyright (c) 2022, Jonathan Baecker. All rights reserved." conf-files = ["/etc/ffplayout/ffplayout.yml"] assets = [ - ["../target/x86_64-unknown-linux-musl/release/ffpapi", "/usr/bin/", "755"], + [ + "../target/x86_64-unknown-linux-musl/release/ffpapi", + "/usr/bin/", + "755", + ], [ "../target/x86_64-unknown-linux-musl/release/ffplayout", "/usr/bin/", - "755" + "755", + ], + [ + "../assets/ffpapi.service", + "/lib/systemd/system/", + "644", + ], + [ + "../assets/ffplayout.service", + "/lib/systemd/system/", + "644", + ], + [ + "../assets/ffplayout@.service", + "/lib/systemd/system/", + "644", + ], + [ + "../assets/11-ffplayout", + "/etc/sudoers.d/", + "644", + ], + [ + "../assets/ffplayout.yml", + "/etc/ffplayout/", + "644", + ], + [ + "../assets/logo.png", + "/usr/share/ffplayout/", + "644", + ], + [ + "../assets/ffplayout.yml", + "/usr/share/ffplayout/ffplayout.yml.orig", + "644", + ], + [ + "../assets/ffplayout.conf", + "/usr/share/ffplayout/ffplayout.conf.example", + "644", + ], + [ + "../README.md", + "/usr/share/doc/ffplayout/README", + "644", + ], + [ + "../assets/ffpapi.1.gz", + "/usr/share/man/man1/", + "644", + ], + [ + "../assets/ffplayout.1.gz", + "/usr/share/man/man1/", + "644", + ], + [ + "../public/**/*", + "/usr/share/ffplayout/public/", + "644", ], - ["../assets/ffpapi.service", "/lib/systemd/system/", "644"], - ["../assets/ffplayout.service", "/lib/systemd/system/", "644"], - ["../assets/ffplayout@.service", "/lib/systemd/system/", "644"], - ["../assets/11-ffplayout", "/etc/sudoers.d/", "644"], - ["../assets/ffplayout.yml", "/etc/ffplayout/", "644"], - ["../assets/logo.png", "/usr/share/ffplayout/", "644"], - ["../assets/ffplayout.yml", "/usr/share/ffplayout/ffplayout.yml.orig", "644"], - ["../assets/ffplayout.conf", "/usr/share/ffplayout/ffplayout.conf.example", "644"], - ["../README.md", "/usr/share/doc/ffplayout/README", "644"], - ["../assets/ffpapi.1.gz", "/usr/share/man/man1/", "644"], - ["../assets/ffplayout.1.gz", "/usr/share/man/man1/", "644"], - ["../public/**/*", "/usr/share/ffplayout/public/", "644"], ] maintainer-scripts = "../debian/" systemd-units = { enable = false, unit-scripts = "../assets" } [package.metadata.deb.variants.arm64] assets = [ - ["../target/aarch64-unknown-linux-gnu/release/ffpapi", "/usr/bin/", "755"], + [ + "../target/aarch64-unknown-linux-gnu/release/ffpapi", + "/usr/bin/", + "755", + ], [ "../target/aarch64-unknown-linux-gnu/release/ffplayout", "/usr/bin/", - "755" + "755", + ], + [ + "../assets/ffpapi.service", + "/lib/systemd/system/", + "644", + ], + [ + "../assets/ffplayout.service", + "/lib/systemd/system/", + "644", + ], + [ + "../assets/ffplayout@.service", + "/lib/systemd/system/", + "644", + ], + [ + "../assets/11-ffplayout", + "/etc/sudoers.d/", + "644", + ], + [ + "../assets/ffplayout.yml", + "/etc/ffplayout/", + "644", + ], + [ + "../assets/logo.png", + "/usr/share/ffplayout/", + "644", + ], + [ + "../assets/ffplayout.yml", + "/usr/share/ffplayout/ffplayout.yml.orig", + "644", + ], + [ + "../assets/ffplayout.conf", + "/usr/share/ffplayout/ffplayout.conf.example", + "644", + ], + [ + "../README.md", + "/usr/share/doc/ffplayout/README", + "644", + ], + [ + "../assets/ffpapi.1.gz", + "/usr/share/man/man1/", + "644", + ], + [ + "../assets/ffplayout.1.gz", + "/usr/share/man/man1/", + "644", + ], + [ + "../public/**/*", + "/usr/share/ffplayout/public/", + "644", ], - ["../assets/ffpapi.service", "/lib/systemd/system/", "644"], - ["../assets/ffplayout.service", "/lib/systemd/system/", "644"], - ["../assets/ffplayout@.service", "/lib/systemd/system/", "644"], - ["../assets/11-ffplayout", "/etc/sudoers.d/", "644"], - ["../assets/ffplayout.yml", "/etc/ffplayout/", "644"], - ["../assets/logo.png", "/usr/share/ffplayout/", "644"], - ["../assets/ffplayout.yml", "/usr/share/ffplayout/ffplayout.yml.orig", "644"], - ["../assets/ffplayout.conf", "/usr/share/ffplayout/ffplayout.conf.example", "644"], - ["../README.md", "/usr/share/doc/ffplayout/README", "644"], - ["../assets/ffpapi.1.gz", "/usr/share/man/man1/", "644"], - ["../assets/ffplayout.1.gz", "/usr/share/man/man1/", "644"], - ["../public/**/*", "/usr/share/ffplayout/public/", "644"], ] # REHL RPM PACKAGE diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 3462bf60..016b9eb7 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "ffplayout-lib" description = "Library for ffplayout" -license = "GPL-3.0" -authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.17.0-beta3" -edition = "2021" +version.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true +edition.workspace = true [dependencies] chrono = "0.4" @@ -29,11 +30,7 @@ walkdir = "2" [target."cfg(windows)".dependencies.winapi] version = "0.3" -features = [ - "shlobj", - "std", - "winerror", -] +features = ["shlobj", "std", "winerror"] [target.x86_64-unknown-linux-musl.dependencies] openssl = { version = "0.10", features = ["vendored"] } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index b504645c..64acd512 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "tests" -version = "0.1.1" -edition = "2021" +version.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true +edition.workspace = true publish = false [dev-dependencies] @@ -39,4 +42,3 @@ path = "src/engine_playlist.rs" [[test]] name = "engine_cmd" path = "src/engine_cmd.rs" -