holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move from winres to better-maintained winresource fork (#9001)

Browse Source 
This MR closes #8986; big thanks to @WindSoilder for investigating this
and making the MR very easy.

I did manual testing to confirm that the icon etc. are still being set
correctly after this change. Also skimmed the `winresource` code, no
issues jumped out at me.
This commit is contained in:
Reilly Wood 2023-04-26 05:14:55 -07:00 committed by GitHub
parent 66b5931438
commit f9049c4c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Cargo.lock generated
View File

@ -2753,7 +2753,7 @@ dependencies = [
"simplelog", "simplelog",
"tempfile", "tempfile",
"time 0.3.20", "time 0.3.20",
"winres", "winresource",
] ]
[[package]] [[package]]
@ -2914,7 +2914,7 @@ dependencies = [
"terminal_size 0.2.6", "terminal_size 0.2.6",
"thiserror", "thiserror",
"titlecase", "titlecase",
"toml 0.7.3", "toml",
"trash", "trash",
"umask", "umask",
"unicode-segmentation", "unicode-segmentation",
@ -5385,15 +5385,6 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "toml"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.7.3" version = "0.7.3"
@ -6100,12 +6091,13 @@ dependencies = [
] ]
[[package]] [[package]]
name = "winres" name = "winresource"
version = "0.1.12" version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" checksum = "5cd38cf1ae6704c0bd03ee663068b8303b9c4bb069f83143c21ef25b19d1bc30"
dependencies = [ dependencies = [
"toml 0.5.11", "toml",
"version_check",
] ]
[[package]] [[package]]

2
Cargo.toml
View File

@ -80,7 +80,7 @@ signal-hook = { version = "0.3.14", default-features = false }
[target.'cfg(windows)'.build-dependencies] [target.'cfg(windows)'.build-dependencies]
winres = "0.1" winresource = "0.1"
[target.'cfg(target_family = "unix")'.dependencies] [target.'cfg(target_family = "unix")'.dependencies]
nix = { version = "0.26", default-features = false, features = [ nix = { version = "0.26", default-features = false, features = [

2
build.rs
View File

@ -1,6 +1,6 @@
#[cfg(windows)] #[cfg(windows)]
fn main() { fn main() {
let mut res = winres::WindowsResource::new(); let mut res = winresource::WindowsResource::new();
res.set("ProductName", "Nushell"); res.set("ProductName", "Nushell");
res.set("FileDescription", "Nushell"); res.set("FileDescription", "Nushell");
res.set("LegalCopyright", "Copyright (C) 2022"); res.set("LegalCopyright", "Copyright (C) 2022");