Dev

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "piscem"
-version = "0.9.0"
+version = "0.10.0"
 edition = "2021"
 build = "build.rs"
 repository = "https://github.com/COMBINE-lab/piscem"
@@ -49,9 +49,15 @@ install-updater = true
 # debug = true
 # split-debuginfo = "packed"
 
+[[workspace.metadata.dist.extra-artifacts]]
+artifacts = ["source_recursive.tar.gz"]
+build = ["bash", "scripts/git-archive-all.sh", "--format", "tar.gz", "--prefix", "piscem/", "source_recursive.tar.gz"]
+
 [workspace.metadata.dist.github-custom-runners]
 aarch64-apple-darwin = "macos-14"
 
 [workspace.metadata.dist.dependencies.homebrew]
 autoconf = { version="2.72", stage = ["build", "run"], targets = ["aarch64-apple-darwin"] }
 automake = { version="1.16.5", stage = ["build", "run"], targets = ["aarch64-apple-darwin"] }
+coreutils = { stage = ["build"] }
+gnu-tar = { stage = ["build"] }

build.rs

@@ -67,6 +67,22 @@ fn main() {
         dst_piscem_cpp.join("lib").display()
     );
 
+    if is_conda_build {
+        // For some reason, if we are using
+        // conda and we are building for the
+        // linux target; things get put in the
+        // lib64 directory rather than lib...
+        // So, we add that here
+        println!(
+            "cargo:rustc-link-search=native={}",
+            dst_cf.join("lib64").display()
+        );
+        println!(
+            "cargo:rustc-link-search=native={}",
+            dst_piscem_cpp.join("lib64").display()
+        );
+    }
+
     println!("cargo:rustc-link-lib=static=kmc_core");
     //println!("cargo:rustc-link-lib=static=pesc_static");
     //println!("cargo:rustc-link-lib=static=build_static");
@@ -79,12 +95,4 @@ fn main() {
 
     #[cfg(target_os = "macos")]
     println!("cargo:rustc-link-lib=dylib=c++");
-
-    if is_conda_build {
-        // if we are on OSX, building on conda
-        // the filesystem support is borked and
-        // we have to jump through some hoops.
-        // #[cfg(target_os = "macos")]
-        // println!("cargo:rustc-link-lib=static=c++fs");
-    }
 }