diff --git a/Cargo.lock b/Cargo.lock index 9690b44..e98fe4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -396,7 +396,7 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "piscem" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "clap", diff --git a/Cargo.toml b/Cargo.toml index d706e61..0f7e844 100644 --- a/Cargo.toml +++ b/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"] } diff --git a/build.rs b/build.rs index 9a5b4c1..e53d76f 100644 --- a/build.rs +++ b/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"); - } } diff --git a/cuttlefish b/cuttlefish index 43b6cca..550de1a 160000 --- a/cuttlefish +++ b/cuttlefish @@ -1 +1 @@ -Subproject commit 43b6cca07ced131e51f15686419cf956df095b80 +Subproject commit 550de1a221b6ec9453da85662ac4308b585cbab1 diff --git a/piscem-cpp b/piscem-cpp index f15f388..2ae91fe 160000 --- a/piscem-cpp +++ b/piscem-cpp @@ -1 +1 @@ -Subproject commit f15f388a3d5bd83d1c458557f17d2907e9f80f19 +Subproject commit 2ae91fe4462a0d1c441926e81485dea57f5ccc41