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

Prepare package configurations for publishing. #478

Merged
merged 7 commits into from
Mar 1, 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
34 changes: 21 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[workspace]
resolver = "2"

members = [
"crates/encoding",
"crates/shaders",
Expand All @@ -17,23 +16,29 @@ members = [
]

[workspace.package]
# Vello version, also used by other packages which want to mimic Vello's version.
# Right now those packages include vello_encoding and vello_shaders.
#
# NOTE: When bumping this, remember to also bump the aforementioned other packages'
# version in the dependencies section at the bottom of this file.
xorgy marked this conversation as resolved.
Show resolved Hide resolved
# Additionally, bump the Vello dependency version in the 'simple' example.
version = "0.1.0"

edition = "2021"
version = "0.0.1"
xStrom marked this conversation as resolved.
Show resolved Hide resolved
license = "MIT OR Apache-2.0"
rust-version = "1.75"
xorgy marked this conversation as resolved.
Show resolved Hide resolved
license = "Apache-2.0 OR MIT"
repository = "https://github.com/linebender/vello"

[package]
name = "vello"
description = "An experimental GPU compute-centric 2D renderer"
version.workspace = true
description = "An experimental GPU compute-centric 2D renderer."
categories = ["rendering", "graphics"]
keywords = ["2d", "vector-graphics"]

# This crate is intended for publishing, but not ready yet
publish = false

version.workspace = true
license.workspace = true
exclude = ["/.github/", "/doc/", "/examples/", ".gitignore"]
edition.workspace = true
rust-version.workspace = true
license.workspace = true
repository.workspace = true

[features]
Expand All @@ -42,19 +47,22 @@ hot_reload = []
buffer_labels = []

[dependencies]
vello_encoding = { workspace = true }
bytemuck = { workspace = true }
skrifa = { workspace = true }
peniko = { workspace = true }
wgpu = { workspace = true, optional = true }
raw-window-handle = "0.6"
futures-intrusive = "0.5.0"
vello_encoding = { path = "crates/encoding" }
raw-window-handle = { workspace = true }
futures-intrusive = { workspace = true }
wgpu-profiler = { workspace = true, optional = true }

[workspace.dependencies]
vello_encoding = { version = "0.1.0", path = "crates/encoding" }
bytemuck = { version = "1.14.3", features = ["derive"] }
skrifa = "0.15.5"
peniko = "0.1.0"
futures-intrusive = "0.5.0"
raw-window-handle = "0.6"

# NOTE: Make sure to keep this in sync with the version badge in README.md
wgpu = { version = "0.19" }
Expand Down
4 changes: 3 additions & 1 deletion crates/encoding/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[package]
name = "vello_encoding"
version = "0.1.0"
version.workspace = true # We mimic Vello's version
description = "Vello types that represent the data that needs to be rendered."
edition.workspace = true
rust-version.workspace = true
license.workspace = true
repository.workspace = true

Expand Down
6 changes: 5 additions & 1 deletion crates/shaders/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
[package]
name = "vello_shaders"
version = "0.1.0"
version.workspace = true # We mimic Vello's version
description = "Vello infrastructure to preprocess and cross-compile shaders at compile time."
edition.workspace = true
rust-version.workspace = true
license.workspace = true
repository.workspace = true

publish = false # Remove this when the package is ready for publishing

[features]
default = ["compile", "wgsl", "msl"]
compile = ["naga", "thiserror"]
Expand Down
6 changes: 2 additions & 4 deletions crates/tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
[package]
name = "vello_tests"
description = "Integration tests for Vello."
edition.workspace = true
version.workspace = true
xStrom marked this conversation as resolved.
Show resolved Hide resolved
license.workspace = true
repository.workspace = true
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
vello = { path = "../.." }
image = "0.24.9"
Expand All @@ -16,4 +14,4 @@ anyhow = { workspace = true }
wgpu = { workspace = true }
pollster = { workspace = true }
png = "0.17.13"
futures-intrusive = "0.5.0"
futures-intrusive = { workspace = true }
16 changes: 6 additions & 10 deletions examples/headless/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
[package]
name = "headless"
description = "An example showing how to use `vello` to create raster images"
publish = false

version.workspace = true
license.workspace = true
description = "An example showing how to use Vello to create raster images."
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
publish = false

[dependencies]
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive"] }
vello = { path = "../../" }
scenes = { path = "../scenes" }
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive"] }

wgpu = { workspace = true }
pollster = { workspace = true }
env_logger = "0.11.2"
png = "0.17.13"
futures-intrusive = "0.5.0"
futures-intrusive = { workspace = true }
8 changes: 2 additions & 6 deletions examples/run_wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
[package]
name = "run_wasm"
publish = false

version.workspace = true
license.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
publish = false

[dependencies]
cargo-run-wasm = "0.3.2"
10 changes: 3 additions & 7 deletions examples/scenes/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
[package]
name = "scenes"
description = "Vello scenes used in the other examples"
publish = false

version.workspace = true
license.workspace = true
description = "Vello scenes used in the other examples."
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
publish = false

[dependencies]
vello = { path = "../../" }
Expand Down
7 changes: 3 additions & 4 deletions examples/simple/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[package]
name = "simple"
edition.workspace = true
version.workspace = true
license.workspace = true
repository.workspace = true
publish = false

# The dependencies here are independent from the workspace versions
[dependencies]
# When using this example outside of the original Vello workspace,
# remove the path property of the following Vello dependency requirement.
vello = { version = "0.1.0", path = "../../" }
anyhow = "1.0.80"
pollster = "0.3.0"
wgpu = "0.19.1"
winit = "0.29.11"
vello = { path = "../../" }
# When using, replace the above line with this:
#vello = { git = "https://github.com/linebender/vello" }
12 changes: 4 additions & 8 deletions examples/with_bevy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
[package]
name = "with_bevy"
description = "Example of using Vello in a Bevy application"

version.workspace = true
license.workspace = true
description = "Example of using Vello in a Bevy application."
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
publish = false

[dependencies]
vello = { path = "../../" }
bevy = { version = "0.13", features = [
"bevy_winit",
"bevy_core_pipeline",
Expand All @@ -19,5 +17,3 @@ bevy = { version = "0.13", features = [
"x11",
"tonemapping_luts",
], default-features = false }

vello = { path = "../../" }
9 changes: 3 additions & 6 deletions examples/with_winit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
[package]
name = "with_winit"
version = "0.0.0"
description = "An example using vello to render to a winit window"
publish = false

version.workspace = true
license.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
publish = false

[lib]
name = "with_winit"
Expand Down
7 changes: 2 additions & 5 deletions integrations/vello_svg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ name = "vello_svg"
description = "Render a usvg document to a Vello scene"
categories = ["rendering", "graphics"]
keywords = ["2d", "vector-graphics", "vello"]

version.workspace = true
license.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
publish = false

[dependencies]
vello = { path = "../../" }
Expand Down