Move download to openblas_build crate

Author: termoshtt

openblas-build/Cargo.toml

@@ -16,5 +16,9 @@ exclude = [
 ]
 
 [dependencies]
+anyhow = "1.0.68"
+flate2 = "1.0.25"
+tar = "0.4.38"
 thiserror = "1.0.22"
+ureq = "2.5.0"
 walkdir = "2.3.1"

openblas-build/src/build.rs

@@ -436,17 +436,7 @@ mod tests {
 
     fn get_openblas_source() -> PathBuf {
         let openblas_src_root = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../openblas-src");
-        let openblas_version = "0.3.21";
-        let source = openblas_src_root.join(format!("OpenBLAS-{}", openblas_version));
-        if !source.exists() {
-            Command::new("tar")
-                .arg("xf")
-                .arg(format!("OpenBLAS-{}.tar.gz", openblas_version))
-                .current_dir(openblas_src_root)
-                .status()
-                .expect("tar command not found");
-        }
-        source
+        crate::download(&openblas_src_root).unwrap()
     }
 
     #[ignore]

openblas-build/src/download.rs

@@ -0,0 +1,23 @@
+use anyhow::Result;
+use std::path::{Path, PathBuf};
+
+const OPENBLAS_VERSION: &str = "0.3.21";
+
+pub fn openblas_source_url() -> String {
+    format!(
+        "https://github.com/xianyi/OpenBLAS/releases/download/v{}/OpenBLAS-{}.tar.gz",
+        OPENBLAS_VERSION, OPENBLAS_VERSION
+    )
+}
+
+pub fn download(out_dir: &Path) -> Result<PathBuf> {
+    let dest = out_dir.join(format!("OpenBLAS-{}", OPENBLAS_VERSION));
+    if !dest.exists() {
+        let buf = ureq::get(&openblas_source_url()).call()?.into_reader();
+        let gz_stream = flate2::read::GzDecoder::new(buf);
+        let mut ar = tar::Archive::new(gz_stream);
+        ar.unpack(&out_dir)?;
+        assert!(dest.exists());
+    }
+    Ok(dest)
+}

openblas-build/src/lib.rs

@@ -14,6 +14,8 @@
 
 mod build;
 mod check;
+mod download;
 pub mod error;
 pub use build::*;
 pub use check::*;
+pub use download::*;

openblas-src/Cargo.toml

@@ -37,13 +37,9 @@ libc = "0.2"
 
 [build-dependencies]
 dirs = "3.0.1"
-flate2 = "1.0.25"
-tar = "0.4.38"
-ureq = "2.5.0"
+
+[target.'cfg(not(target_os="windows"))'.build-dependencies]
+openblas-build = { version = "0.10.6", path = "../openblas-build" }
 
 [target.'cfg(target_os="windows")'.build-dependencies]
 vcpkg = "0.2"
-
-[target.'cfg(target_os="linux")'.build-dependencies.openblas-build]
-version = "0.10.6"
-path = "../openblas-build"

openblas-src/build.rs

@@ -1,9 +1,5 @@
 use std::{env, path::*, process::Command};
 
-const OPENBLAS_SOURCE_URL: &str =
-    "https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21.tar.gz";
-const OPENBLAS_VERSION: &str = "0.3.21";
-
 #[allow(unused)]
 fn run(command: &mut Command) {
     println!("Running: `{:?}`", command);
@@ -177,13 +173,7 @@ fn build() {
         );
     }
 
-    let source = output.join(format!("OpenBLAS-{}", OPENBLAS_VERSION));
-    if !source.exists() {
-        let buf = ureq::get(OPENBLAS_SOURCE_URL).call().unwrap().into_reader();
-        let gz_stream = flate2::read::GzDecoder::new(buf);
-        let mut ar = tar::Archive::new(gz_stream);
-        ar.unpack(&output).unwrap();
-    }
+    let source = openblas_build::download(&output).unwrap();
     let deliv = cfg.build(&source, &output).unwrap();
 
     println!("cargo:rustc-link-search={}", output.display());
@@ -254,17 +244,7 @@ fn build() {
     };
 
     if !source.exists() {
-        let source_tmp = PathBuf::from(format!("{}_tmp", source.display()));
-        if source_tmp.exists() {
-            fs::remove_dir_all(&source_tmp).unwrap();
-        }
-        run(Command::new("tar")
-            .arg("xf")
-            .arg(format!("OpenBLAS-{}.tar.gz", OPENBLAS_VERSION)));
-        run(Command::new("cp")
-            .arg("-R")
-            .arg(format!("OpenBLAS-{}", OPENBLAS_VERSION))
-            .arg(&source_tmp));
+        let source_tmp = openblas_build::download(&output).unwrap();
         fs::rename(&source_tmp, &source).unwrap();
     }
     for name in &vec!["CC", "FC", "HOSTCC"] {