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

Fix bundling

Browse source 
PyOxidizer binary is now going into a platform folder, and our Qt
deps moved.
This commit is contained in:
Damien Elmes 2023-07-02 15:07:31 +10:00
parent b4bfc1a80d
commit 56a1046ff8
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/configure/src/bundle.rs
View file

@ -7,6 +7,7 @@ use ninja_gen::archives::download_and_extract;
use ninja_gen::archives::empty_manifest; use ninja_gen::archives::empty_manifest;
use ninja_gen::archives::with_exe; use ninja_gen::archives::with_exe;
use ninja_gen::archives::OnlineArchive; use ninja_gen::archives::OnlineArchive;
use ninja_gen::archives::Platform;
use ninja_gen::cargo::CargoBuild; use ninja_gen::cargo::CargoBuild;
use ninja_gen::cargo::RustOutput; use ninja_gen::cargo::RustOutput;
use ninja_gen::git::SyncSubmodule; use ninja_gen::git::SyncSubmodule;
@ -181,9 +182,11 @@ fn setup_primary_venv(build: &mut Build) -> Result<()> {
let mut qt6_reqs = inputs![ let mut qt6_reqs = inputs![
"python/requirements.bundle.txt", "python/requirements.bundle.txt",
if cfg!(windows) { if cfg!(windows) {
"python/requirements.qt6_4.txt" "python/requirements.qt6_win.txt"
} else if cfg!(target_os = "darwin") {
"python/requirements.qt6_mac.txt"
} else { } else {
"python/requirements.qt6_5.txt" "python/requirements.qt6_lin.txt"
} }
]; ];
if cfg!(windows) { if cfg!(windows) {
@ -313,7 +316,10 @@ impl BuildAction for BuildBundle {
"", "",
vec![RustOutput::Binary("anki").path( vec![RustOutput::Binary("anki").path(
Utf8Path::new("$builddir/bundle/rust"), Utf8Path::new("$builddir/bundle/rust"),
overriden_rust_target_triple(), Some(
overriden_rust_target_triple()
.unwrap_or_else(|| Platform::current().as_rust_triple()),
),
true, true,
)], )],
); );

5
build/ninja_gen/src/archives.rs
View file

@ -57,8 +57,11 @@ impl Platform {
pub fn as_rust_triple(&self) -> &'static str { pub fn as_rust_triple(&self) -> &'static str {
match self { match self {
Platform::LinuxX64 => "x86_64-unknown-linux-gnu",
Platform::LinuxArm => "aarch64-unknown-linux-gnu",
Platform::MacX64 => "x86_64-apple-darwin", Platform::MacX64 => "x86_64-apple-darwin",
_ => unimplemented!(), Platform::MacArm => "aarch64-apple-darwin",
Platform::WindowsX64 => "x86_64-pc-windows-msvc",
} }
} }
} }