From 4c34a2d133432df0d5fbaea7f82b88c188dff681 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Fri, 10 Jan 2025 18:10:36 +1100 Subject: [PATCH] Fix Windows bundling Missed in the Qt6.8 changes --- qt/bundle/win/src/main.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/qt/bundle/win/src/main.rs b/qt/bundle/win/src/main.rs index f43ff6064..2091f6a51 100644 --- a/qt/bundle/win/src/main.rs +++ b/qt/bundle/win/src/main.rs @@ -23,7 +23,6 @@ struct Args { version: String, bundle_root: Utf8PathBuf, qt6_setup_path: Utf8PathBuf, - qt5_setup_path: Utf8PathBuf, } fn main() -> Result<()> { @@ -31,12 +30,8 @@ fn main() -> Result<()> { let src_win_folder = Utf8Path::new("qt/bundle/win"); let std_dist_folder = args.bundle_root.join("std"); - let alt_dist_folder = args.bundle_root.join("alt"); // folder->installer - let dists = [ - (&std_dist_folder, &args.qt6_setup_path), - (&alt_dist_folder, &args.qt5_setup_path), - ]; + let dists = [(&std_dist_folder, &args.qt6_setup_path)]; for (folder, _) in dists { fs::copy( @@ -56,16 +51,12 @@ fn main() -> Result<()> { ) .context("uninstaller")?; - // sign the anki.exe and uninstaller.exe in std, then copy into alt + // sign the anki.exe and uninstaller.exe in std println!("--- Sign binaries"); codesign([ &std_dist_folder.join("anki.exe"), &std_dist_folder.join("uninstall.exe"), ])?; - for fname in &["anki.exe", "uninstall.exe"] { - fs::copy(std_dist_folder.join(fname), alt_dist_folder.join(fname)) - .with_context(|| format!("copy {fname}"))?; - } println!("--- Build manifest"); for (folder, _) in dists {