Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split CLI tools into a separate package #1308

Merged
merged 2 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 2 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
[workspace]
members = []
members = [".", "tools"]
default-members = [".", "tools"]

[package]
name = "rav1d"
authors = ["C2Rust"]
version = "0.2.0"
publish = false
edition = "2021"
autobins = false
autotests = false
default-run = "dav1d"

[lib]
path = "lib.rs"
crate-type = ["staticlib", "rlib"]

[[bin]]
path = "tools/dav1d.rs"
name = "dav1d"

[[bin]]
path = "tests/seek_stress.rs"
name = "seek_stress"

[dependencies]
assert_matches = "1.5.0"
atomig = { version = "0.4.0", features = ["derive"] }
Expand Down
20 changes: 20 additions & 0 deletions tools/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[package]
name = "rav1d_cli"
authors = ["C2Rust"]
version = "0.2.0"
publish = false
edition = "2021"
default-run = "dav1d"

[[bin]]
path = "dav1d.rs"
rinon marked this conversation as resolved.
Show resolved Hide resolved
name = "dav1d"

[[bin]]
path = "seek_stress.rs"
name = "seek_stress"

[dependencies]
cfg-if = "1.0.0"
libc = "0.2"
rav1d = { path = "../", version = "0.2.0" }
4 changes: 0 additions & 4 deletions tests/seek_stress.rs → tools/seek_stress.rs
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
#![allow(non_upper_case_globals)]
#![allow(clippy::all)]

#[path = "../tools/compat"]
mod compat {
pub mod errno;
pub mod stdio;
} // mod compat
#[path = "../tools/input"]
mod input {
mod annexb;
pub mod input;
mod ivf;
mod section5;
} // mod input
#[path = "../tools/output"]
mod output {
mod md5;
mod null;
mod output;
mod y4m2;
mod yuv;
} // mod output
#[path = "../tools/dav1d_cli_parse.rs"]
mod dav1d_cli_parse;

use crate::compat::stdio::stderr;
Expand Down
Loading