Skip to content

Commit

Permalink
Remove the ffi-headers feature
Browse files Browse the repository at this point in the history
Rely on a separate cbindgen instance instead, which is less self-contained but more practical.
  • Loading branch information
Ortham committed Apr 30, 2024
1 parent 832c872 commit 78d6526
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 200 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ jobs:
# Need to rebuild the FFI wrapper so that its binary is given a filename
# without a hash.
- name: Build FFI wrapper
run: cargo build --manifest-path ffi/Cargo.toml --features ffi-headers
run: |
cargo build --manifest-path ffi/Cargo.toml
cbindgen ffi/ -o ffi/include/libloadorder.h
# Use bash because PowerShell doesn't fail if one command fails.
- name: Build and run C++ tests
Expand Down Expand Up @@ -87,7 +89,9 @@ jobs:
# Need to rebuild the FFI wrapper so that its binary is given a filename
# without a hash.
- name: Build FFI wrapper
run: cargo build --manifest-path ffi/Cargo.toml --features ffi-headers
run: |
cargo build --manifest-path ffi/Cargo.toml
cbindgen ffi/ -o ffi/include/libloadorder.h
# Use bash because PowerShell doesn't fail if one command fails.
- name: Build and run C++ tests
Expand Down
177 changes: 11 additions & 166 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name = "libloadorder-ffi"
version = "15.0.2"
authors = ["Oliver Hamlet <oliver@ortham.io>"]
build = "build.rs"
description = "A wrapper library providing a C FFI for libloadorder."
documentation = "https://docs.rs/libloadorder-ffi"
repository = "https://github.com/Ortham/libloadorder.git"
Expand All @@ -26,10 +25,3 @@ tempfile = "3.0.0"
[lib]
name = "loadorder_ffi"
crate-type = ["staticlib"]

[features]
default = []
ffi-headers = ["cbindgen"]

[build-dependencies]
cbindgen = { version = "0.26", optional = true }
Loading

0 comments on commit 78d6526

Please sign in to comment.