From a5cd3f32f425e1ff98252a0391f1630a2486b69a Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 20 Nov 2023 12:01:34 +1000 Subject: [PATCH] Fix broken bundling on Windows 11 When Windows notices "install" in the filename it triggers a UAC elevation, causing 'cargo run' to fail. --- Cargo.lock | 2 +- build/configure/src/bundle.rs | 2 +- qt/bundle/win/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 464a43e39..0b7146634 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2338,7 +2338,7 @@ dependencies = [ ] [[package]] -name = "makeinstall" +name = "makeexe" version = "0.0.0" dependencies = [ "anyhow", diff --git a/build/configure/src/bundle.rs b/build/configure/src/bundle.rs index dbb542e1a..4b2552160 100644 --- a/build/configure/src/bundle.rs +++ b/build/configure/src/bundle.rs @@ -424,7 +424,7 @@ struct BuildWindowsInstallers {} impl BuildAction for BuildWindowsInstallers { fn command(&self) -> &str { - "cargo run -p makeinstall --target-dir=out/rust -- $version $src_root $bundle_root $out" + "cargo run -p makeexe --target-dir=out/rust -- $version $src_root $bundle_root $out" } fn files(&mut self, build: &mut impl ninja_gen::build::FilesHandle) { diff --git a/qt/bundle/win/Cargo.toml b/qt/bundle/win/Cargo.toml index 841a2a265..9c091b55f 100644 --- a/qt/bundle/win/Cargo.toml +++ b/qt/bundle/win/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "makeinstall" +name = "makeexe" version.workspace = true authors.workspace = true edition.workspace = true