Change `embed-resource` dep to slimmer `winres` (#5630)

This commit is contained in:
Reilly Wood 2022-05-24 23:28:10 -04:00 committed by GitHub
parent 06cf3fa5ad
commit afcacda35f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 85 deletions

44
Cargo.lock generated
View File

@ -910,19 +910,6 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "embed-resource"
version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecc24ff8d764818e9ab17963b0593c535f077a513f565e75e4352d758bc4d8c0"
dependencies = [
"cc",
"rustc_version",
"toml",
"vswhom",
"winreg",
]
[[package]]
name = "eml-parser"
version = "0.1.3"
@ -2413,7 +2400,6 @@ dependencies = [
"chrono",
"crossterm",
"ctrlc",
"embed-resource",
"hamcrest2",
"is_executable",
"itertools",
@ -2443,6 +2429,7 @@ dependencies = [
"rstest",
"serial_test",
"tempfile",
"winres",
]
[[package]]
@ -4931,26 +4918,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
[[package]]
name = "vswhom"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
dependencies = [
"libc",
"vswhom-sys",
]
[[package]]
name = "vswhom-sys"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22025f6d8eb903ebf920ea6933b70b1e495be37e2cb4099e62c80454aaf57c39"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "vte"
version = "0.10.1"
@ -5295,6 +5262,15 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "winres"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
dependencies = [
"toml",
]
[[package]]
name = "ws2_32-sys"
version = "0.2.1"

View File

@ -69,7 +69,7 @@ rstest = "0.12.0"
itertools = "0.10.3"
[target.'cfg(windows)'.build-dependencies]
embed-resource = "1"
winres = "0.1"
[features]
plugin = ["nu-plugin", "nu-cli/plugin", "nu-parser/plugin", "nu-command/plugin", "nu-protocol/plugin", "nu-engine/plugin"]

View File

@ -1,49 +0,0 @@
#include <winver.h>
#define VER_FILEVERSION 0,62,1,0
#define VER_FILEVERSION_STR "0.62.1"
#define VER_PRODUCTVERSION 0,62,1,0
#define VER_PRODUCTVERSION_STR "0.62.1"
#ifdef RC_INVOKED
#ifdef DEBUG // TODO: Actually define DEBUG
#define VER_DEBUG VS_FF_DEBUG
#else
#define VER_DEBUG 0
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
PRODUCTVERSION VER_PRODUCTVERSION
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS VER_DEBUG
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "nushell"
VALUE "FileDescription", "Nushell"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "nu.exe"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "nu.exe"
VALUE "ProductName", "Nushell"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#define IDI_ICON 0x101
IDI_ICON ICON "assets/nu_logo.ico"
#endif

View File

@ -1,6 +1,12 @@
#[cfg(windows)]
fn main() {
embed_resource::compile_for("assets/nushell.rc", &["nu"])
let mut res = winres::WindowsResource::new();
res.set("ProductName", "Nushell");
res.set("FileDescription", "Nushell");
res.set("LegalCopyright", "Copyright (C) 2022");
res.set_icon("assets/nu_logo.ico");
res.compile()
.expect("Failed to run the Windows resource compiler (rc.exe)");
}
#[cfg(not(windows))]