diff --git a/Cargo.lock b/Cargo.lock index b28d6fd4a0eee569207348669d1ec670dc5c233f..f980ce11fc2e5ae5446bf50a2e33d462abcff577 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3433,12 +3433,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "embed-manifest" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cd446c890d6bed1d8b53acef5f240069ebef91d6fae7c5f52efe61fe8b5eae" - [[package]] name = "emojis" version = "0.6.1" @@ -9489,7 +9483,6 @@ dependencies = [ "ctrlc", "dialoguer", "editor", - "embed-manifest", "fuzzy", "gpui", "indoc", @@ -9505,6 +9498,7 @@ dependencies = [ "strum", "theme", "ui", + "winresource", ] [[package]] @@ -12634,7 +12628,6 @@ dependencies = [ "db", "diagnostics", "editor", - "embed-manifest", "env_logger", "extension", "extensions_ui", diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml index 5b19171349e7921388a40aafa8787c0b87bf1430..b7fae8ebbcff9ce04338643914ea176430bbd0f2 100644 --- a/crates/storybook/Cargo.toml +++ b/crates/storybook/Cargo.toml @@ -36,7 +36,7 @@ theme.workspace = true ui = { workspace = true, features = ["stories"] } [target.'cfg(target_os = "windows")'.build-dependencies] -embed-manifest = "1.4.0" +winresource = "0.1" [dev-dependencies] gpui = { workspace = true, features = ["test-support"] } diff --git a/crates/storybook/build.rs b/crates/storybook/build.rs index fcb9db5cb7a52508b58f00202f14d235116eabf4..d165aee5d5d2a58a8cc27390945e423e4715cf47 100644 --- a/crates/storybook/build.rs +++ b/crates/storybook/build.rs @@ -12,7 +12,13 @@ fn main() { let manifest = std::path::Path::new("../zed/resources/windows/manifest.xml"); println!("cargo:rerun-if-changed={}", manifest.display()); - embed_manifest::embed_manifest(embed_manifest::new_manifest(manifest.to_str().unwrap())) - .unwrap(); + + let mut res = winresource::WindowsResource::new(); + res.set_manifest_file(manifest.to_str().unwrap()); + + if let Err(e) = res.compile() { + eprintln!("{}", e); + std::process::exit(1); + } } } diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 6f039a77a59ec63bc4bcf75aabdca8a13c657bea..248b9488d4f03b3fc69c3c2db59553deddd5ca2b 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -96,7 +96,6 @@ workspace.workspace = true zed_actions.workspace = true [target.'cfg(target_os = "windows")'.build-dependencies] -embed-manifest = "1.4.0" winresource = "0.1" [dev-dependencies] diff --git a/crates/zed/build.rs b/crates/zed/build.rs index 8def598fd4ffcdbce5856519fd3cbf1a089b3802..a1126afed765b2040d9cfe25448968cdf8994967 100644 --- a/crates/zed/build.rs +++ b/crates/zed/build.rs @@ -57,11 +57,10 @@ fn main() { println!("cargo:rerun-if-changed={}", manifest.display()); println!("cargo:rerun-if-changed={}", icon.display()); - embed_manifest::embed_manifest(embed_manifest::new_manifest(manifest.to_str().unwrap())) - .unwrap(); - let mut res = winresource::WindowsResource::new(); res.set_icon(icon.to_str().unwrap()); + res.set_manifest_file(manifest.to_str().unwrap()); + if let Err(e) = res.compile() { eprintln!("{}", e); std::process::exit(1);