Skip to content

chore: add tskit-c as a submodule #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/miri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/[email protected]
with:
submodules: recursive
- uses: actions-rs/[email protected]
with:
profile: minimal
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/semver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
- stable
steps:
- uses: actions/[email protected]
with:
submodules: recursive
- uses: dtolnay/rust-toolchain@v1
with:
toolchain: ${{ matrix.rust }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ jobs:
- stable
steps:
- uses: actions/[email protected]
with:
submodules: recursive
- uses: dtolnay/rust-toolchain@v1
with:
toolchain: ${{ matrix.rust }}
Expand All @@ -86,6 +88,8 @@ jobs:
- 1.71.0
steps:
- uses: actions/[email protected]
with:
submodules: recursive
- uses: dtolnay/rust-toolchain@v1
with:
toolchain: ${{ matrix.rust }}
Expand All @@ -102,6 +106,8 @@ jobs:
- stable
steps:
- uses: actions/[email protected]
with:
submodules: recursive
- uses: dtolnay/rust-toolchain@v1
with:
toolchain: ${{ matrix.rust }}
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "subprojects/tskit"]
path = subprojects/tskit
url = https://github.com/tskit-dev/tskit.git
19 changes: 10 additions & 9 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ fn main() {
pkg_config::Config::new().atleast_version("1.2");

let src = [
"subprojects/tskit/tskit/convert.c",
"subprojects/tskit/tskit/core.c",
"subprojects/tskit/tskit/genotypes.c",
"subprojects/tskit/tskit/haplotype_matching.c",
"subprojects/tskit/tskit/stats.c",
"subprojects/tskit/tskit/tables.c",
"subprojects/tskit/tskit/trees.c",
"subprojects/tskit/c/tskit/convert.c",
"subprojects/tskit/c/tskit/core.c",
"subprojects/tskit/c/tskit/genotypes.c",
"subprojects/tskit/c/tskit/haplotype_matching.c",
"subprojects/tskit/c/tskit/stats.c",
"subprojects/tskit/c/tskit/tables.c",
"subprojects/tskit/c/tskit/trees.c",
"subprojects/kastore/kastore.c",
];

let tskit_path = Path::new("subprojects/tskit/");
let tskit_path = Path::new("subprojects/tskit/c");
let kastore_path = Path::new("subprojects/kastore/");
let mut builder = cc::Build::new();
let build = builder
Expand All @@ -32,7 +32,7 @@ fn main() {
// The input header we would like to generate
// bindings for.
.header("wrapper.h")
.clang_arg("-Isubprojects/tskit")
.clang_arg("-Isubprojects/tskit/c")
.clang_arg("-Isubprojects/kastore")
.allowlist_type("tsk.*")
.allowlist_function("tsk.*")
Expand All @@ -56,3 +56,4 @@ fn main() {
.write_to_file(out_path.join("auto_bindings.rs"))
.expect("Couldn't write bindings!");
}

1 change: 1 addition & 0 deletions subprojects/tskit
Submodule tskit added at 4f532b
21 changes: 0 additions & 21 deletions subprojects/tskit/LICENSE

This file was deleted.

1 change: 0 additions & 1 deletion subprojects/tskit/VERSION.txt

This file was deleted.

39 changes: 0 additions & 39 deletions subprojects/tskit/tskit.h

This file was deleted.

196 changes: 0 additions & 196 deletions subprojects/tskit/tskit/convert.c

This file was deleted.

43 changes: 0 additions & 43 deletions subprojects/tskit/tskit/convert.h

This file was deleted.

Loading