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.

Sign up for GitHub

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

native_viewer is now an opt-in feature of the rerun library #2064

Merged
merged 1 commit into from
May 9, 2023
Merged

native_viewer is now an opt-in feature of the rerun library #2064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion crates/rerun/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,20 @@ all-features = true
targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]


[[bin]]
# For the `rerun` binary, always add the `native_viewer` feature.
# See https://github.com/rerun-io/rerun/issues/1997
name = "rerun"
required-features = ["native_viewer"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we maybe also put the web-viewer for this one...? that would avoid the dreaded cargo install rerun -F web_viewer...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also slow down our own cargo r -p rerun a lot 😭



[features]
default = [
# We omit `native_viewer` to improve the default compile times.
"analytics",
"demo",
"glam",
"image",
"native_viewer",
"server",
"sdk",
]
Expand Down Expand Up @@ -76,6 +83,7 @@ web_viewer = [
"re_ws_comms/server",
]


[dependencies]
re_build_info.workspace = true
re_data_store.workspace = true
Expand Down
5 changes: 4 additions & 1 deletion examples/rust/api_demo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
5 changes: 4 additions & 1 deletion examples/rust/clock/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/dna/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }
rerun = { path = "../../../crates/rerun", features = ["native_viewer"] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did this one lose the web?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dna always uses native_viewer::spawn, never web


itertools = "0.10"
rand = "0.8"
2 changes: 1 addition & 1 deletion examples/rust/minimal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun" }
rerun = { path = "../../../crates/rerun", features = ["native_viewer"] }
5 changes: 4 additions & 1 deletion examples/rust/minimal_options/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
5 changes: 4 additions & 1 deletion examples/rust/objectron/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ publish = false


[dependencies]
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
5 changes: 4 additions & 1 deletion examples/rust/raw_mesh/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }

anyhow = "1.0"
bytes = "1.3"
Expand Down