diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-09-21 13:13:56 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-09-24 16:36:49 +0200 |
| commit | 3ce466bb2388e951a66ca9edea1d3e84a704a2ee (patch) | |
| tree | 54cb07daf2396b5aa7f9033c76ba65d0ff8c8c40 /mullvad-cli | |
| parent | e0619be7d66bd3db2136d640e15131685d6084b9 (diff) | |
| download | mullvadvpn-3ce466bb2388e951a66ca9edea1d3e84a704a2ee.tar.xz mullvadvpn-3ce466bb2388e951a66ca9edea1d3e84a704a2ee.zip | |
Use winres in all binary crates to set Windows resource metadata
Diffstat (limited to 'mullvad-cli')
| -rw-r--r-- | mullvad-cli/Cargo.toml | 10 | ||||
| -rw-r--r-- | mullvad-cli/build.rs | 14 | ||||
| -rw-r--r-- | mullvad-cli/version.rc | 27 |
3 files changed, 21 insertions, 30 deletions
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index 1aadd558f5..69ad5a33a3 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -23,4 +23,12 @@ talpid-types = { path = "../talpid-types" } talpid-ipc = { path = "../talpid-ipc" } [target.'cfg(windows)'.build-dependencies] -windres = "0.2" +winres = "0.1" +winapi = "0.3" + +[package.metadata.winres] +ProductName = "Mullvad VPN" +CompanyName = "Amagicom AB" +LegalCopyright = "(c) 2018 Amagicom AB" +InternalName = "mullvad-cli" +OriginalFilename = "mullvad.exe" diff --git a/mullvad-cli/build.rs b/mullvad-cli/build.rs index b64f22f208..126fbafc03 100644 --- a/mullvad-cli/build.rs +++ b/mullvad-cli/build.rs @@ -1,9 +1,19 @@ #[cfg(windows)] -extern crate windres; +extern crate winapi; +#[cfg(windows)] +extern crate winres; fn main() { #[cfg(windows)] { - windres::Build::new().compile("version.rc").unwrap(); + let product_version = env!("CARGO_PKG_VERSION").replacen(".0", "", 1); + let mut res = winres::WindowsResource::new(); + res.set("ProductVersion", &product_version); + res.set_icon("../dist-assets/icon.ico"); + res.set_language(winapi::um::winnt::MAKELANGID( + winapi::um::winnt::LANG_ENGLISH, + winapi::um::winnt::SUBLANG_ENGLISH_US, + )); + res.compile().expect("Unable to generate windows resources"); } } diff --git a/mullvad-cli/version.rc b/mullvad-cli/version.rc deleted file mode 100644 index 8f9db10b4d..0000000000 --- a/mullvad-cli/version.rc +++ /dev/null @@ -1,27 +0,0 @@ -#include "../dist-assets/windows/version.h" - -IDI_MAIN ICON "../dist-assets/icon.ico" - -1 VERSIONINFO -FILEVERSION MAJOR_VERSION,MINOR_VERSION,PATCH_VERSION,0 -PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,PATCH_VERSION,0 -BEGIN -BLOCK "StringFileInfo" -BEGIN - BLOCK "040904E4" - BEGIN - VALUE "CompanyName", "Amagicom AB" - VALUE "FileDescription", "CLI for Mullvad VPN" - VALUE "FileVersion", PRODUCT_VERSION - VALUE "InternalName", "mullvad-cli" - VALUE "LegalCopyright", "(c) 2018 Amagicom AB" - VALUE "OriginalFilename", "mullvad.exe" - VALUE "ProductName", "Mullvad VPN" - VALUE "ProductVersion", PRODUCT_VERSION - END -END -BLOCK "VarFileInfo" -BEGIN - VALUE "Translation", 0x409, 1252 -END -END |