Skip to content

Commit 93c50c9

Browse files
committed
chore: add tskit-c as a submodule
1 parent 158aa1c commit 93c50c9

23 files changed

+24
-31609
lines changed

.github/workflows/miri.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
runs-on: ubuntu-24.04
1616
steps:
1717
- uses: actions/[email protected]
18+
with:
19+
submodules: 'recursive'
1820
- uses: actions-rs/[email protected]
1921
with:
2022
profile: minimal

.github/workflows/semver.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
- stable
1616
steps:
1717
- uses: actions/[email protected]
18+
with:
19+
submodules: 'recursive'
1820
- uses: dtolnay/rust-toolchain@v1
1921
with:
2022
toolchain: ${{ matrix.rust }}

.github/workflows/tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ jobs:
6868
- stable
6969
steps:
7070
- uses: actions/[email protected]
71+
with:
72+
submodules: 'recursive'
7173
- uses: dtolnay/rust-toolchain@v1
7274
with:
7375
toolchain: ${{ matrix.rust }}
@@ -86,6 +88,8 @@ jobs:
8688
- 1.71.0
8789
steps:
8890
- uses: actions/[email protected]
91+
with:
92+
submodules: 'recursive'
8993
- uses: dtolnay/rust-toolchain@v1
9094
with:
9195
toolchain: ${{ matrix.rust }}
@@ -102,6 +106,8 @@ jobs:
102106
- stable
103107
steps:
104108
- uses: actions/[email protected]
109+
with:
110+
submodules: 'recursive'
105111
- uses: dtolnay/rust-toolchain@v1
106112
with:
107113
toolchain: ${{ matrix.rust }}

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "subprojects/tskit"]
2+
path = subprojects/tskit
3+
url = https://github.com/tskit-dev/tskit.git

build.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ fn main() {
55
pkg_config::Config::new().atleast_version("1.2");
66

77
let src = [
8-
"subprojects/tskit/tskit/convert.c",
9-
"subprojects/tskit/tskit/core.c",
10-
"subprojects/tskit/tskit/genotypes.c",
11-
"subprojects/tskit/tskit/haplotype_matching.c",
12-
"subprojects/tskit/tskit/stats.c",
13-
"subprojects/tskit/tskit/tables.c",
14-
"subprojects/tskit/tskit/trees.c",
8+
"subprojects/tskit/c/tskit/convert.c",
9+
"subprojects/tskit/c/tskit/core.c",
10+
"subprojects/tskit/c/tskit/genotypes.c",
11+
"subprojects/tskit/c/tskit/haplotype_matching.c",
12+
"subprojects/tskit/c/tskit/stats.c",
13+
"subprojects/tskit/c/tskit/tables.c",
14+
"subprojects/tskit/c/tskit/trees.c",
1515
"subprojects/kastore/kastore.c",
1616
];
1717

18-
let tskit_path = Path::new("subprojects/tskit/");
18+
let tskit_path = Path::new("subprojects/tskit/c");
1919
let kastore_path = Path::new("subprojects/kastore/");
2020
let mut builder = cc::Build::new();
2121
let build = builder
@@ -32,7 +32,7 @@ fn main() {
3232
// The input header we would like to generate
3333
// bindings for.
3434
.header("wrapper.h")
35-
.clang_arg("-Isubprojects/tskit")
35+
.clang_arg("-Isubprojects/tskit/c")
3636
.clang_arg("-Isubprojects/kastore")
3737
.allowlist_type("tsk.*")
3838
.allowlist_function("tsk.*")
@@ -56,3 +56,4 @@ fn main() {
5656
.write_to_file(out_path.join("auto_bindings.rs"))
5757
.expect("Couldn't write bindings!");
5858
}
59+

subprojects/tskit

Submodule tskit added at 4f532bd

subprojects/tskit/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

subprojects/tskit/VERSION.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

subprojects/tskit/tskit.h

Lines changed: 0 additions & 39 deletions
This file was deleted.

subprojects/tskit/tskit/convert.c

Lines changed: 0 additions & 196 deletions
This file was deleted.

subprojects/tskit/tskit/convert.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)