StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

fix(packaging): use workspace deps

Browse Source
This commit is contained in:
Nova
2024-11-01 15:10:00 -04:00
parent e8e485b472
commit c830becbff
4 changed files with 17 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
Cargo.lock generated
View File

@@ -2727,31 +2727,12 @@ dependencies = [
"rustc-hash",
"serde",
"shiva-color-rs",
"stardust-xr-schemas 1.5.3 (git+https://github.com/StardustXR/core.git)",
"stardust-xr-schemas",
"thiserror",
"tokio",
"tracing",
]
[[package]]
name = "stardust-xr-schemas"
version = "1.5.3"
source = "git+https://github.com/StardustXR/core.git?branch=dev#b68343a67f93e95ac5bec138c8ee0e082189a489"
dependencies = [
"flatbuffers",
"flexbuffers",
"fnv",
"futures-util",
"kdl",
"manifest-dir-macros",
"nanoid",
"serde",
"serde_repr",
"thiserror",
"tokio",
"zbus 5.0.1",
]
[[package]]
name = "stardust-xr-schemas"
version = "1.5.3"
@@ -2768,7 +2749,7 @@ dependencies = [
"serde_repr",
"thiserror",
"tokio",
"zbus 4.4.0",
"zbus",
]
[[package]]
@@ -2809,7 +2790,7 @@ dependencies = [
"wayland-backend",
"wayland-scanner",
"xkbcommon-rs",
"zbus 4.4.0",
"zbus",
]
[[package]]
@@ -2821,7 +2802,7 @@ dependencies = [
"proc-macro2",
"quote",
"split-iter",
"stardust-xr-schemas 1.5.3 (git+https://github.com/StardustXR/core.git?branch=dev)",
"stardust-xr",
]
[[package]]
@@ -3860,45 +3841,9 @@ dependencies = [
"uds_windows",
"windows-sys 0.52.0",
"xdg-home",
"zbus_macros 4.4.0",
"zbus_names 3.0.0",
"zvariant 4.2.0",
]
[[package]]
name = "zbus"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "333be40ef37976542e10832ba961e3e44ea215a6b1e2673066b303ee3e0ede10"
dependencies = [
"async-broadcast",
"async-executor",
"async-fs",
"async-io",
"async-lock",
"async-process",
"async-recursion",
"async-task",
"async-trait",
"blocking",
"enumflags2",
"event-listener",
"futures-core",
"futures-util",
"hex",
"nix 0.29.0",
"ordered-stream",
"serde",
"serde_repr",
"static_assertions",
"tokio",
"tracing",
"uds_windows",
"windows-sys 0.59.0",
"xdg-home",
"zbus_macros 5.0.1",
"zbus_names 4.0.0",
"zvariant 5.0.1",
"zbus_macros",
"zbus_names",
"zvariant",
]
[[package]]
@@ -3911,20 +3856,7 @@ dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"zvariant_utils 2.1.0",
]
[[package]]
name = "zbus_macros"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "381be624000c82e716c2a45d9213fabacf82177591fa8a6ff655d2825450601a"
dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.77",
"zvariant_utils 3.0.1",
"zvariant_utils",
]
[[package]]
@@ -3935,18 +3867,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
dependencies = [
"serde",
"static_assertions",
"zvariant 4.2.0",
]
[[package]]
name = "zbus_names"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdc27fbd3593ff015cef906527a2ec4115e2e3dbf6204a24d952ac4975c80614"
dependencies = [
"serde",
"static_assertions",
"zvariant 5.0.1",
"zvariant",
]
[[package]]
@@ -3980,21 +3901,7 @@ dependencies = [
"enumflags2",
"serde",
"static_assertions",
"zvariant_derive 4.2.0",
]
[[package]]
name = "zvariant"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c690a1da8858fd4377b8cc3134a753b0bea1d8ebd78ad6e5897fab821c5e184e"
dependencies = [
"endi",
"enumflags2",
"serde",
"static_assertions",
"zvariant_derive 5.0.1",
"zvariant_utils 3.0.1",
"zvariant_derive",
]
[[package]]
@@ -4007,20 +3914,7 @@ dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"zvariant_utils 2.1.0",
]
[[package]]
name = "zvariant_derive"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83b6ddc1fed08493e4f2bd9350e7d00a3383467228735f3f169a9f8820fde755"
dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.77",
"zvariant_utils 3.0.1",
"zvariant_utils",
]
[[package]]
@@ -4033,17 +3927,3 @@ dependencies = [
"quote",
"syn 2.0.77",
]
[[package]]
name = "zvariant_utils"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f8d85190ba70bc7b9540430df078bb529620b1464ed4a606010de584e27094d"
dependencies = [
"proc-macro2",
"quote",
"serde",
"static_assertions",
"syn 2.0.77",
"winnow 0.6.18",
]

5
Cargo.toml
View File

@@ -12,6 +12,9 @@ homepage = "https://stardustxr.org"
[workspace]
members = ["codegen"]
[workspace.dependencies.stardust-xr]
git = "https://github.com/StardustXR/core.git"
[[bin]]
name = "stardust-xr-server"
path = "src/main.rs"
@@ -110,7 +113,7 @@ features = ["no-event-loop"]
default-features = false
[dependencies.stardust-xr]
git = "https://github.com/StardustXR/core.git"
workspace = true
[dependencies.stardust-xr-server-codegen]
path = "codegen"

4
codegen/Cargo.toml
View File

@@ -13,6 +13,4 @@ mint = "0.5.9"
proc-macro2 = "1.0.71"
split-iter = "0.1.0"
[dependencies.stardust-xr-schemas]
git = "https://github.com/StardustXR/core.git"
branch = "dev"
stardust-xr = { workspace = true }

2
codegen/src/lib.rs
View File

@@ -2,7 +2,7 @@ use convert_case::{Case, Casing};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote, ToTokens};
use split_iter::Splittable;
use stardust_xr_schemas::protocol::*;
use stardust_xr::schemas::protocol::*;
fn fold_tokens(a: TokenStream, b: TokenStream) -> TokenStream {
quote!(#a #b)