From b536d80ff8ddc8179b648a83b06bf4605b461c35 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Mon, 30 Oct 2023 22:27:51 +0000 Subject: [PATCH] Move c bindings to bindings/c directory --- .github/workflows/ci.yml | 2 +- Cargo.toml | 2 +- {ctaffy => bindings/c}/.gitignore | 0 {ctaffy => bindings/c}/Cargo.toml | 2 +- {ctaffy => bindings/c}/README.md | 0 {ctaffy => bindings/c}/cbindgen.toml | 0 {ctaffy => bindings/c}/examples/basic.c | 0 {ctaffy => bindings/c}/examples/compile_basic.sh | 0 {ctaffy => bindings/c}/generate-bindings.sh | 0 {ctaffy => bindings/c}/include/taffy.h | 0 {ctaffy => bindings/c}/src/error.rs | 0 {ctaffy => bindings/c}/src/lib.rs | 0 {ctaffy => bindings/c}/src/style.rs | 0 {ctaffy => bindings/c}/src/style_enums.rs | 0 {ctaffy => bindings/c}/src/tree.rs | 0 {ctaffy => bindings/c}/src/value.rs | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename {ctaffy => bindings/c}/.gitignore (100%) rename {ctaffy => bindings/c}/Cargo.toml (93%) rename {ctaffy => bindings/c}/README.md (100%) rename {ctaffy => bindings/c}/cbindgen.toml (100%) rename {ctaffy => bindings/c}/examples/basic.c (100%) rename {ctaffy => bindings/c}/examples/compile_basic.sh (100%) rename {ctaffy => bindings/c}/generate-bindings.sh (100%) rename {ctaffy => bindings/c}/include/taffy.h (100%) rename {ctaffy => bindings/c}/src/error.rs (100%) rename {ctaffy => bindings/c}/src/lib.rs (100%) rename {ctaffy => bindings/c}/src/style.rs (100%) rename {ctaffy => bindings/c}/src/style_enums.rs (100%) rename {ctaffy => bindings/c}/src/tree.rs (100%) rename {ctaffy => bindings/c}/src/value.rs (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 922add111..c12aec484 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -206,7 +206,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - run: | - cd ctaffy/examples + cd bindings/c/examples ./compile_basic.sh LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../target/debug ./basic name: Build C Bindings diff --git a/Cargo.toml b/Cargo.toml index 012cc2321..98d79cbeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,4 +49,4 @@ path = "benches/dummy_benchmark.rs" harness = false [workspace] -members = ["scripts/gentest", "scripts/format-fixtures", "scripts/import-yoga-tests", "benches", "ctaffy"] +members = ["scripts/gentest", "scripts/format-fixtures", "scripts/import-yoga-tests", "benches", "bindings/c"] diff --git a/ctaffy/.gitignore b/bindings/c/.gitignore similarity index 100% rename from ctaffy/.gitignore rename to bindings/c/.gitignore diff --git a/ctaffy/Cargo.toml b/bindings/c/Cargo.toml similarity index 93% rename from ctaffy/Cargo.toml rename to bindings/c/Cargo.toml index 851974768..d861825d5 100644 --- a/ctaffy/Cargo.toml +++ b/bindings/c/Cargo.toml @@ -15,4 +15,4 @@ name = "ctaffy" crate-type = ["staticlib", "cdylib", "rlib"] [dependencies] -taffy = { path = ".." } \ No newline at end of file +taffy = { path = "../.." } \ No newline at end of file diff --git a/ctaffy/README.md b/bindings/c/README.md similarity index 100% rename from ctaffy/README.md rename to bindings/c/README.md diff --git a/ctaffy/cbindgen.toml b/bindings/c/cbindgen.toml similarity index 100% rename from ctaffy/cbindgen.toml rename to bindings/c/cbindgen.toml diff --git a/ctaffy/examples/basic.c b/bindings/c/examples/basic.c similarity index 100% rename from ctaffy/examples/basic.c rename to bindings/c/examples/basic.c diff --git a/ctaffy/examples/compile_basic.sh b/bindings/c/examples/compile_basic.sh similarity index 100% rename from ctaffy/examples/compile_basic.sh rename to bindings/c/examples/compile_basic.sh diff --git a/ctaffy/generate-bindings.sh b/bindings/c/generate-bindings.sh similarity index 100% rename from ctaffy/generate-bindings.sh rename to bindings/c/generate-bindings.sh diff --git a/ctaffy/include/taffy.h b/bindings/c/include/taffy.h similarity index 100% rename from ctaffy/include/taffy.h rename to bindings/c/include/taffy.h diff --git a/ctaffy/src/error.rs b/bindings/c/src/error.rs similarity index 100% rename from ctaffy/src/error.rs rename to bindings/c/src/error.rs diff --git a/ctaffy/src/lib.rs b/bindings/c/src/lib.rs similarity index 100% rename from ctaffy/src/lib.rs rename to bindings/c/src/lib.rs diff --git a/ctaffy/src/style.rs b/bindings/c/src/style.rs similarity index 100% rename from ctaffy/src/style.rs rename to bindings/c/src/style.rs diff --git a/ctaffy/src/style_enums.rs b/bindings/c/src/style_enums.rs similarity index 100% rename from ctaffy/src/style_enums.rs rename to bindings/c/src/style_enums.rs diff --git a/ctaffy/src/tree.rs b/bindings/c/src/tree.rs similarity index 100% rename from ctaffy/src/tree.rs rename to bindings/c/src/tree.rs diff --git a/ctaffy/src/value.rs b/bindings/c/src/value.rs similarity index 100% rename from ctaffy/src/value.rs rename to bindings/c/src/value.rs