From c1fc38c3d2e6314091734bac0bd6171a6e7de222 Mon Sep 17 00:00:00 2001 From: Shawn Wallace Date: Fri, 17 May 2024 23:01:57 -0400 Subject: [PATCH] Reorganize file layout Moves satellite to be the root package, also allowing it to be built by default. --- Cargo.lock | 59 +++++++++++++---------- Cargo.toml | 39 ++++++++++++--- satellite/Cargo.toml | 30 ------------ {satellite/src => src}/clientside.rs | 0 {satellite/src => src}/lib.rs | 0 {satellite/src => src}/main.rs | 0 {satellite/src => src}/server/dispatch.rs | 0 {satellite/src => src}/server/event.rs | 0 {satellite/src => src}/server/mod.rs | 0 {satellite/src => src}/server/tests.rs | 0 {satellite/src => src}/xstate.rs | 0 {satellite/tests => tests}/integration.rs | 0 testwl/Cargo.toml | 4 +- wl_drm/Cargo.toml | 6 +-- 14 files changed, 71 insertions(+), 67 deletions(-) delete mode 100644 satellite/Cargo.toml rename {satellite/src => src}/clientside.rs (100%) rename {satellite/src => src}/lib.rs (100%) rename {satellite/src => src}/main.rs (100%) rename {satellite/src => src}/server/dispatch.rs (100%) rename {satellite/src => src}/server/event.rs (100%) rename {satellite/src => src}/server/mod.rs (100%) rename {satellite/src => src}/server/tests.rs (100%) rename {satellite/src => src}/xstate.rs (100%) rename {satellite/tests => tests}/integration.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index b97d7e6..2d41835 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,47 +13,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys", @@ -95,9 +96,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "cc" -version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cexpr" @@ -127,9 +128,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "dlib" @@ -148,9 +149,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "env_filter" @@ -190,9 +191,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys", @@ -242,6 +243,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "lazy_static" version = "1.4.0" @@ -256,9 +263,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -272,9 +279,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" @@ -312,9 +319,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "peeking_take_while" @@ -340,9 +347,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] diff --git a/Cargo.toml b/Cargo.toml index 40a6ee2..4081330 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,37 @@ [workspace] +[workspace.dependencies] +wayland-client = "0.31.2" +wayland-protocols = "0.31.2" +wayland-scanner = "0.31.1" +wayland-server = "0.31.1" -members = [ - "satellite", - "testwl" , - "wl_drm" -] +[package] +name = "xwayland-satellite" +version = "0.1.0" +edition = "2021" -resolver = "2" +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +crate-type = ["lib"] + +[dependencies] +bitflags = "2.5.0" +paste = "1.0.14" +rustix = { version = "0.38.31", features = ["event"] } +wayland-client.workspace = true +wayland-protocols = { workspace = true, features = ["client", "server", "staging", "unstable"] } +wayland-scanner.workspace = true +wayland-server.workspace = true +xcb = { version = "1.3.0", features = ["composite"] } +wl_drm = { path = "wl_drm" } +libc = "0.2.153" +log = "0.4.21" +env_logger = "0.11.3" +pretty_env_logger = "0.5.0" +slotmap = "1.0.7" +xcb-util-cursor = "0.3.2" + +[dev-dependencies] +rustix = { version = "0.38.31", features = ["fs"] } +testwl = { path = "testwl" } diff --git a/satellite/Cargo.toml b/satellite/Cargo.toml deleted file mode 100644 index 9037770..0000000 --- a/satellite/Cargo.toml +++ /dev/null @@ -1,30 +0,0 @@ -[package] -name = "xwayland-satellite" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[lib] -crate-type = ["lib"] - -[dependencies] -bitflags = "2.5.0" -paste = "1.0.14" -rustix = { version = "0.38.31", features = ["event"] } -wayland-client = "0.31.2" -wayland-protocols = { version = "0.31.2", features = ["client", "server", "staging"] } -wayland-scanner = "0.31.1" -wayland-server = "0.31.1" -xcb = { version = "1.3.0", features = ["composite"] } -wl_drm = { path = "../wl_drm" } -libc = "0.2.153" -log = "0.4.21" -env_logger = "0.11.3" -pretty_env_logger = "0.5.0" -slotmap = "1.0.7" -xcb-util-cursor = "0.3.2" - -[dev-dependencies] -rustix = { version = "0.38.31", features = ["fs"] } -testwl = { path = "../testwl" } diff --git a/satellite/src/clientside.rs b/src/clientside.rs similarity index 100% rename from satellite/src/clientside.rs rename to src/clientside.rs diff --git a/satellite/src/lib.rs b/src/lib.rs similarity index 100% rename from satellite/src/lib.rs rename to src/lib.rs diff --git a/satellite/src/main.rs b/src/main.rs similarity index 100% rename from satellite/src/main.rs rename to src/main.rs diff --git a/satellite/src/server/dispatch.rs b/src/server/dispatch.rs similarity index 100% rename from satellite/src/server/dispatch.rs rename to src/server/dispatch.rs diff --git a/satellite/src/server/event.rs b/src/server/event.rs similarity index 100% rename from satellite/src/server/event.rs rename to src/server/event.rs diff --git a/satellite/src/server/mod.rs b/src/server/mod.rs similarity index 100% rename from satellite/src/server/mod.rs rename to src/server/mod.rs diff --git a/satellite/src/server/tests.rs b/src/server/tests.rs similarity index 100% rename from satellite/src/server/tests.rs rename to src/server/tests.rs diff --git a/satellite/src/xstate.rs b/src/xstate.rs similarity index 100% rename from satellite/src/xstate.rs rename to src/xstate.rs diff --git a/satellite/tests/integration.rs b/tests/integration.rs similarity index 100% rename from satellite/tests/integration.rs rename to tests/integration.rs diff --git a/testwl/Cargo.toml b/testwl/Cargo.toml index bd97ce6..eee00de 100644 --- a/testwl/Cargo.toml +++ b/testwl/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -wayland-protocols = { version = "0.31.2", features = ["server", "unstable"] } -wayland-server = "0.31.1" +wayland-protocols = { workspace = true, features = ["server", "unstable"] } +wayland-server.workspace = true wl_drm = { path = "../wl_drm" } diff --git a/wl_drm/Cargo.toml b/wl_drm/Cargo.toml index 5addbf5..c91c0d6 100644 --- a/wl_drm/Cargo.toml +++ b/wl_drm/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -wayland-client = "0.31.2" -wayland-scanner = "0.31.1" -wayland-server = "0.31.1" +wayland-client.workspace = true +wayland-scanner.workspace = true +wayland-server.workspace = true