Skip to content

Commit d962e5c

Browse files
authored
Merge pull request #18 from NavAbility:25Q1/refac/downstream_capi
rm capi files and code
2 parents 1e15a90 + 3049955 commit d962e5c

File tree

10 files changed

+90
-1140
lines changed

10 files changed

+90
-1140
lines changed

Cargo.lock

Lines changed: 86 additions & 80 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "navabilitysdk"
3-
version = "0.1.0"
3+
version = "0.1.0-b3"
44
authors = ["NavAbility™ by WhereWhen.ai Technologies Inc."]
55
edition = "2021"
66

77
[lib]
8-
crate-type = ["cdylib", "rlib"]
8+
crate-type = ["rlib"]
99

1010
[dependencies]
1111
serde = "^1.0"
@@ -26,16 +26,14 @@ reqwest = {version = "^0.12", optional=true, features = [
2626
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
2727
tokio = { version = "^1.40", default-features = false, optional=true}
2828
tracing = "^0.1"
29-
ffi-convert = { version="^0.6", optional=true }
30-
libc = { version = "^0.2", default-features = false, optional=true}
3129

3230

3331
[target.'cfg(target_arch = "wasm32")'.dependencies]
3432
gloo-console = { version = "^0.3", optional = true }
3533

3634

3735
[features]
38-
tokio = ["dep:tokio", "dep:reqwest", "dep:ffi-convert", "dep:libc"]
36+
tokio = ["dep:tokio", "dep:reqwest"]
3937
blocking = ["graphql_client/reqwest","graphql_client/reqwest-blocking"]
4038
wasm = ["dep:reqwest"]
4139
wasm-dev = ["dep:gloo-console"]

Makefile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ NVA_API_TOKEN ?= ""
44

55
clean:
66
cargo clean
7+
rm -rf test/build
78

89
install-deps:
910
cargo install graphql_client_cli --force
@@ -14,21 +15,8 @@ build-wasm:
1415
build-tokio:
1516
cargo build -F tokio
1617

17-
build-lib: build-tokio generate-cbindgen-c generate-cbindgen-cpp
18-
1918
fetch-schema:
2019
@graphql-client introspect-schema --authorization $(NVA_API_TOKEN) --output src/schema.json $(NVA_API_URL)
2120

2221
test-tokio:
2322
cargo test -F tokio
24-
25-
test-capi: build-lib
26-
cd test && $(MAKE)
27-
28-
generate-cbindgen-cpp:
29-
cbindgen --config cbindgen.toml --crate navabilitysdk --output include/NavAbilitySDK.hpp
30-
cat src/capi/SDKSupplemental.h >> include/NavAbilitySDK.hpp
31-
32-
generate-cbindgen-c:
33-
cbindgen --config cbindgen.toml --lang c --crate navabilitysdk --output include/NavAbilitySDK.h
34-
cat src/capi/SDKSupplemental.h >> include/NavAbilitySDK.h

cbindgen.toml

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

src/capi.rs

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

src/capi/SDKSupplemental.h

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

0 commit comments

Comments
 (0)