back to xz2 (better build system)

Cargo.toml

@@ -49,14 +49,15 @@ webpki-roots = "0.25"
 thousands = "0.2"
 tar = { version = "0.4", default-features = false }
 ruzstd = "0.5"
+xz2 = { version = "0.1", features = ["static"] }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 raw-cpuid = "11"
 
 [build-dependencies]
 glob = "0.3"
 tar = { version = "0.4", default-features = false }
-zstd = { version = "0.13", default-features = false }
+xz2 = "0.1"
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"

build.rs

@@ -3,19 +3,17 @@
 use std::{env, fs, fs::File, io::Write, path::Path, process::Command};
 
 use glob::glob;
+use xz2::write::XzEncoder;
 
 const EVAL_FILE: &str = "nn-5af11540bbfe.nnue";
 
 fn main() {
     hooks();
 
-    let mut archive = tar::Builder::new(
-        zstd::Encoder::new(
-            File::create(Path::new(&env::var("OUT_DIR").unwrap()).join("assets.tar.zst")).unwrap(),
-            19,
-        )
-        .unwrap(),
-    );
+    let mut archive = tar::Builder::new(XzEncoder::new(
+        File::create(Path::new(&env::var("OUT_DIR").unwrap()).join("assets.tar.xz")).unwrap(),
+        6,
+    ));
     archive.mode(tar::HeaderMode::Deterministic);
     stockfish_build(&mut archive);
     stockfish_eval_file(EVAL_FILE, &mut archive);

src/assets.rs

@@ -3,8 +3,9 @@ use std::{fmt, io, path::PathBuf};
 use bitflags::bitflags;
 use serde::Serialize;
 use tempfile::TempDir;
+use xz2::read::XzDecoder;
 
-static ASSETS_TAR_ZST: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/assets.tar.zst"));
+static ASSETS_TAR_XZ: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/assets.tar.xz"));
 
 bitflags! {
     #[derive(Debug, Copy, Clone, Eq, PartialEq)]
@@ -181,8 +182,7 @@ impl Assets {
         let mut stockfish = ByEngineFlavor::<Option<PathBuf>>::default();
         let dir = tempfile::Builder::new().prefix("fishnet-").tempdir()?;
 
-        let mut archive =
-            tar::Archive::new(ruzstd::StreamingDecoder::new(ASSETS_TAR_ZST).expect("zst"));
+        let mut archive = tar::Archive::new(XzDecoder::new(ASSETS_TAR_XZ));
         for entry in archive.entries()? {
             let mut entry = entry?;
             let path = entry.path()?;