fix capi build

Cargo.toml

@@ -1,2 +1,2 @@
 [workspace]
-members = ["biscuit-auth", "biscuit-quote", "biscuit-parser"]
+members = ["biscuit-auth", "biscuit-quote", "biscuit-parser", "biscuit-capi"]

biscuit-auth/Cargo.toml

@@ -10,11 +10,21 @@ documentation = "https://docs.rs/biscuit-auth"
 homepage = "https://github.com/biscuit-auth/biscuit"
 repository = "https://github.com/biscuit-auth/biscuit-rust"
 
+include = [
+  "Cargo.toml",
+  "cbindgen.toml",
+  "build.rs",
+  "examples/*.rs",
+  "LICENSE",
+  "README.md",
+  "src/*.rs",
+  "src/*/*.rs",
+  "tests/*.rs"
+]
+
 [features]
 default = ["regex-full", "datalog-macro"]
 regex-full = [ "regex/perf", "regex/unicode"]
-# used by cargo-c to signal the compilation of C bindings
-capi = ["inline-c"]
 wasm = ["wasm-bindgen", "getrandom/wasm-bindgen"]
 # used by biscuit-wasm to serialize errors to JSON
 serde-error = ["serde", "biscuit-parser/serde-error"]
@@ -38,7 +48,6 @@ hex = "0.4"
 zeroize = { version = "1", default-features = false }
 thiserror = "1"
 rand = { version = "0.8" }
-inline-c = { version = "0.1", optional = true }
 wasm-bindgen = { version = "0.2", optional = true }
 base64 = "0.13.0"
 ed25519-dalek = { version = "2.0.0", features = ["rand_core", "zeroize"] }
@@ -50,7 +59,6 @@ biscuit-parser = { version = "0.1.2", path = "../biscuit-parser" }
 biscuit-quote = { version = "0.2.2", optional = true, path = "../biscuit-quote" }
 chrono = { version = "0.4.26", optional = true, default-features = false, features = ["serde"] }
 
-
 [dev-dependencies]
 bencher = "0.1.5"
 rand = "0.8"
@@ -63,23 +71,6 @@ serde_json = "1.0.67"
 #[build-dependencies]
 #prost-build = "0.10"
 
-[package.metadata.capi.library]
-# Used as the library name and defaults to the crate name. This might get
-# prefixed with `lib` depending on the target platform.
-name = "biscuit_auth"
-
-include = [
-  "Cargo.toml",
-  "cbindgen.toml",
-  "build.rs",
-  "examples/*.rs",
-  "LICENSE",
-  "README.md",
-  "src/*.rs",
-  "src/*/*.rs",
-  "tests/*.rs"
-]
-
 [[example]]
 name = "testcases"
 required-features = ["serde-error"]

biscuit-auth/src/lib.rs

@@ -235,12 +235,6 @@ pub use token::Biscuit;
 pub use token::RootKeyProvider;
 pub use token::{ThirdPartyBlock, ThirdPartyRequest};
 
-#[cfg(cargo_c)]
-mod capi;
-
-#[cfg(cargo_c)]
-pub use capi::*;
-
 #[cfg(bwk)]
 mod bwk;
 #[cfg(bwk)]

biscuit-auth/tests/macros.rs

@@ -1,3 +1,4 @@
+#![cfg(not(feature = "capi"))]
 use biscuit_auth::builder;
 use biscuit_quote::{
     authorizer, authorizer_merge, biscuit, biscuit_merge, block, block_merge, check, fact, policy,

biscuit-auth/tests/rights.rs

@@ -1,4 +1,5 @@
 #![allow(unused_must_use)]
+#![cfg(not(feature = "capi"))]
 use biscuit::builder::*;
 use biscuit::datalog::SymbolTable;
 use biscuit::KeyPair;

biscuit-capi/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "biscuit-capi"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+# used by cargo-c to signal the compilation of C bindings
+capi = ["inline-c"]
+
+[package.metadata.capi.library]
+# Used as the library name and defaults to the crate name. This might get
+# prefixed with `lib` depending on the target platform.
+name = "biscuit_auth"
+
+[dependencies]
+biscuit-auth = { version = "4.1.1", path = "../biscuit-auth" }
+inline-c = { version = "0.1", optional = true }
+rand = { version = "0.8" }
+