Move c header generation out of build.rs

abbaskiko · Aug 28, 2020 · 0a47a31 · 0a47a31
1 parent 73e2455
commit 0a47a31
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 407 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "utils/cgen",
   "utils/test-client",
   "memo/program",
   "token-swap/program",

diff --git a/cbindgen.sh b/cbindgen.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$0")"
+set -x
+
+# Cargo.lock can cause older spl-token bindings to be generated?  Move it out of
+# the way...
+mv -f Cargo.lock Cargo.lock.org
+
+cargo run --manifest-path=utils/cgen/Cargo.toml
+exitcode=$?
+
+mv -f Cargo.lock.org Cargo.lock
+
+exit $exitcode
diff --git a/ci/script.sh b/ci/script.sh
@@ -32,11 +32,12 @@ _ cargo run --manifest-path=utils/test-client/Cargo.toml
 
 
 # Check generated C headers
-#_ git diff --exit-code token/program/inc/token.h
-#_ cc token/program/inc/token.h -o target/token.gch
-#
-#_ git diff --exit-code token-swap/program/inc/token-swap.h
-#_ cc token-swap/program/inc/token-swap.h -o target/token-swap.gch
+_ cargo run --manifest-path=utils/cgen/Cargo.toml
+
+_ git diff --exit-code token/program/inc/token.h
+_ cc token/program/inc/token.h -o target/token.gch
+_ git diff --exit-code token-swap/program/inc/token-swap.h
+_ cc token-swap/program/inc/token-swap.h -o target/token-swap.gch
 
 
 # Run clippy for all program crates, with the `program` feature enabled

diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml
@@ -28,9 +28,6 @@ thiserror = "1.0"
 [dev-dependencies]
 rand = { version = "0.7.0"}
 
-[build-dependencies]
-cbindgen = "=0.14.2"
-
 [lib]
 name = "spl_token_swap"
 crate-type = ["cdylib", "lib"]
diff --git a/token-swap/program/build.rs b/token-swap/program/build.rs
diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml
@@ -29,8 +29,5 @@ num_enum = "0.5.1"
 [dev-dependencies]
 rand = { version = "0.7.0"}
 
-[build-dependencies]
-cbindgen = "=0.14.2"
-
 [lib]
 crate-type = ["cdylib", "lib"]