GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 06:52:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix Windows bundling

Browse source 
Missed in the Qt6.8 changes
This commit is contained in:
Damien Elmes 2025-01-10 18:10:36 +11:00
parent 1fb1cbbf85
commit 4c34a2d133
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qt/bundle/win/src/main.rs
View file

@ -23,7 +23,6 @@ struct Args {
version: String, version: String,
bundle_root: Utf8PathBuf, bundle_root: Utf8PathBuf,
qt6_setup_path: Utf8PathBuf, qt6_setup_path: Utf8PathBuf,
qt5_setup_path: Utf8PathBuf,
} }
fn main() -> Result<()> { fn main() -> Result<()> {
@ -31,12 +30,8 @@ fn main() -> Result<()> {
let src_win_folder = Utf8Path::new("qt/bundle/win"); let src_win_folder = Utf8Path::new("qt/bundle/win");
let std_dist_folder = args.bundle_root.join("std"); let std_dist_folder = args.bundle_root.join("std");
let alt_dist_folder = args.bundle_root.join("alt");
// folder->installer // folder->installer
let dists = [ let dists = [(&std_dist_folder, &args.qt6_setup_path)];
(&std_dist_folder, &args.qt6_setup_path),
(&alt_dist_folder, &args.qt5_setup_path),
];
for (folder, _) in dists { for (folder, _) in dists {
fs::copy( fs::copy(
@ -56,16 +51,12 @@ fn main() -> Result<()> {
) )
.context("uninstaller")?; .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"); println!("--- Sign binaries");
codesign([ codesign([
&std_dist_folder.join("anki.exe"), &std_dist_folder.join("anki.exe"),
&std_dist_folder.join("uninstall.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"); println!("--- Build manifest");
for (folder, _) in dists { for (folder, _) in dists {