mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-26 00:19:46 +00:00
Use winresource instead of embed-manifest (#10810)
use winresource for crates/zed and crates/storybook. tested on `x86_64-pc-windows-gnu`. on `x86_64-pc-windows-msvc` I receive a error message, that looks like a problem with my machine Release Notes: - N/A
This commit is contained in:
parent
048fc7ad09
commit
9e88155a48
5 changed files with 12 additions and 15 deletions
9
Cargo.lock
generated
9
Cargo.lock
generated
|
@ -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",
|
||||
|
|
|
@ -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"] }
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue