Refactor uniffi structure

mozilla · Aug 6, 2020 · 0492693 · 0492693
1 parent f727a57
commit 0492693
Show file tree

Hide file tree

Showing 85 changed files with 886 additions and 946 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,6 +2,12 @@
 
 version: 2.1
 
+commands:
+  make_install_uniffi_bindgen:
+    steps:
+      - run:
+          name: Build and install uniffi-bindgen
+          command: cargo install --path uniffi_bindgen
 jobs:
   Check Rust formatting:
     docker:
@@ -19,6 +25,7 @@ jobs:
     steps:
       - checkout
       - run: rustup component add clippy
+      - make_install_uniffi_bindgen
       - run: cargo clippy --version
       - run: cargo clippy --all --all-targets
   Rust and Foreign Language tests:
@@ -28,6 +35,7 @@ jobs:
     steps:
       - run: cat ~/.profile >> $BASH_ENV
       - checkout
+      - make_install_uniffi_bindgen
       - run: cargo test
 
 workflows:
@@ -40,4 +48,4 @@ workflows:
       - Lint Rust with clippy
   run-tests:
     jobs:
-      - Rust and Foreign Language tests
+      - Rust and Foreign Language tests
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,9 @@
 [workspace]
 members = [
-  "uniffi",
+  "uniffi_bindgen",
+  "uniffi_build",
   "uniffi_macros",
+  "uniffi",
   "examples/arithmetic",
   "examples/geometry",
   "examples/rondpoint",

diff --git a/examples/arithmetic/Cargo.toml b/examples/arithmetic/Cargo.toml
@@ -10,11 +10,8 @@ crate-type = ["cdylib"]
 name = "uniffi_arithmetic"
 
 [dependencies]
-anyhow = "1.0"
-log = "0.4"
-ffi-support = "0.4"
-uniffi = {path = "../../uniffi"}
 uniffi_macros = {path = "../../uniffi_macros"}
+uniffi = {path = "../../uniffi"}
 
 [build-dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi_build = {path = "../../uniffi_build"}
diff --git a/examples/arithmetic/build.rs b/examples/arithmetic/build.rs
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 fn main() {
-    uniffi::generate_component_scaffolding("./src/arithmetic.idl").unwrap();
+    uniffi_build::generate_scaffolding("./src/arithmetic.idl").unwrap();
 }
diff --git a/examples/arithmetic/src/main.rs b/examples/arithmetic/src/main.rs
diff --git a/examples/arithmetic/tests/test_generated_bindings.rs b/examples/arithmetic/tests/test_generated_bindings.rs
@@ -1,5 +1,8 @@
 uniffi_macros::build_foreign_language_testcases!(
-    "tests/bindings/test_arithmetic.py",
-    "tests/bindings/test_arithmetic.kts",
-    "tests/bindings/test_arithmetic.swift",
+    "src/arithmetic.idl",
+    [
+        "tests/bindings/test_arithmetic.py",
+        "tests/bindings/test_arithmetic.kts",
+        "tests/bindings/test_arithmetic.swift",
+    ]
 );
diff --git a/examples/geometry/Cargo.toml b/examples/geometry/Cargo.toml
@@ -10,11 +10,8 @@ crate-type = ["cdylib"]
 name = "uniffi_geometry"
 
 [dependencies]
-anyhow = "1.0"
-log = "0.4"
-ffi-support = "0.4"
-uniffi = {path = "../../uniffi"}
 uniffi_macros = {path = "../../uniffi_macros"}
+uniffi = {path = "../../uniffi"}
 
 [build-dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi_build = {path = "../../uniffi_build"}
diff --git a/examples/geometry/build.rs b/examples/geometry/build.rs
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 fn main() {
-    uniffi::generate_component_scaffolding("./src/geometry.idl").unwrap();
+    uniffi_build::generate_scaffolding("./src/geometry.idl").unwrap();
 }
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
diff --git a/examples/geometry/tests/test_generated_bindings.rs b/examples/geometry/tests/test_generated_bindings.rs
@@ -1,5 +1,8 @@
 uniffi_macros::build_foreign_language_testcases!(
-    "tests/bindings/test_geometry.py",
-    "tests/bindings/test_geometry.kts",
-    "tests/bindings/test_geometry.swift",
+    "src/geometry.idl",
+    [
+        "tests/bindings/test_geometry.py",
+        "tests/bindings/test_geometry.kts",
+        "tests/bindings/test_geometry.swift",
+    ]
 );
diff --git a/examples/rondpoint/Cargo.toml b/examples/rondpoint/Cargo.toml
@@ -10,12 +10,8 @@ crate-type = ["cdylib"]
 name = "uniffi_rondpoint"
 
 [dependencies]
-anyhow = "1.0"
-log = "0.4"
-ffi-support = "0.4"
-lazy_static = "1.4"
-uniffi = {path = "../../uniffi"}
 uniffi_macros = {path = "../../uniffi_macros"}
+uniffi = {path = "../../uniffi"}
 
 [build-dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi_build = {path = "../../uniffi_build"}
diff --git a/examples/rondpoint/build.rs b/examples/rondpoint/build.rs
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 fn main() {
-    uniffi::generate_component_scaffolding("./src/rondpoint.idl").unwrap();
+    uniffi_build::generate_scaffolding("./src/rondpoint.idl").unwrap();
 }
diff --git a/examples/rondpoint/src/main.rs b/examples/rondpoint/src/main.rs
diff --git a/examples/rondpoint/tests/test_generated_bindings.rs b/examples/rondpoint/tests/test_generated_bindings.rs
@@ -1,5 +1,8 @@
 uniffi_macros::build_foreign_language_testcases!(
-    "tests/bindings/test_rondpoint.kts",
-    "tests/bindings/test_rondpoint.swift",
-    // "tests/bindings/test_rondpoint.py"
+    "src/rondpoint.idl",
+    [
+        "tests/bindings/test_rondpoint.kts",
+        "tests/bindings/test_rondpoint.swift",
+        // "tests/bindings/test_rondpoint.py",
+    ]
 );
diff --git a/examples/sprites/Cargo.toml b/examples/sprites/Cargo.toml
@@ -10,12 +10,8 @@ crate-type = ["cdylib"]
 name = "uniffi_sprites"
 
 [dependencies]
-anyhow = "1.0"
-log = "0.4"
-ffi-support = "0.4"
-lazy_static = "1.4"
-uniffi = {path = "../../uniffi"}
 uniffi_macros = {path = "../../uniffi_macros"}
+uniffi = {path = "../../uniffi"}
 
 [build-dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi_build = {path = "../../uniffi_build"}
diff --git a/examples/sprites/build.rs b/examples/sprites/build.rs
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 fn main() {
-    uniffi::generate_component_scaffolding("./src/sprites.idl").unwrap();
+    uniffi_build::generate_scaffolding("./src/sprites.idl").unwrap();
 }
diff --git a/examples/sprites/src/main.rs b/examples/sprites/src/main.rs
diff --git a/examples/sprites/tests/test_generated_bindings.rs b/examples/sprites/tests/test_generated_bindings.rs
@@ -1,5 +1,8 @@
 uniffi_macros::build_foreign_language_testcases!(
-    // "tests/bindings/test_sprites.py",
-    "tests/bindings/test_sprites.kts",
-    "tests/bindings/test_sprites.swift",
+    "src/sprites.idl",
+    [
+        // "tests/bindings/test_sprites.py",
+        "tests/bindings/test_sprites.kts",
+        "tests/bindings/test_sprites.swift",
+    ]
 );
diff --git a/examples/todolist/Cargo.toml b/examples/todolist/Cargo.toml
@@ -10,13 +10,9 @@ crate-type = ["cdylib"]
 name = "uniffi_todolist"
 
 [dependencies]
-anyhow = "1.0"
-log = "0.4"
-ffi-support = "0.4"
-lazy_static = "1.4"
-uniffi = {path = "../../uniffi"}
 uniffi_macros = {path = "../../uniffi_macros"}
+uniffi = {path = "../../uniffi"}
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi_build = {path = "../../uniffi_build"}
diff --git a/examples/todolist/build.rs b/examples/todolist/build.rs
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 fn main() {
-    uniffi::generate_component_scaffolding("./src/todolist.idl").unwrap();
+    uniffi_build::generate_scaffolding("./src/todolist.idl").unwrap();
 }
diff --git a/examples/todolist/src/main.rs b/examples/todolist/src/main.rs
diff --git a/examples/todolist/tests/test_generated_bindings.rs b/examples/todolist/tests/test_generated_bindings.rs
@@ -1,5 +1,8 @@
 uniffi_macros::build_foreign_language_testcases!(
-    "tests/bindings/test_todolist.kts",
-    "tests/bindings/test_todolist.swift",
-    // "tests/bindings/test_todolist.py"
+    "src/todolist.idl",
+    [
+        "tests/bindings/test_todolist.kts",
+        "tests/bindings/test_todolist.swift",
+        // "tests/bindings/test_todolist.py"
+    ]
 );
diff --git a/uniffi/Cargo.toml b/uniffi/Cargo.toml
@@ -5,20 +5,12 @@ authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 license = "MPL-2.0"
 edition = "2018"
 
-[[bin]]
-name = "uniffi-bindgen"
-path = "src/main.rs"
-
 [dependencies]
-weedle = "0.11"
+# Re-exported dependencies used in generated Rust scaffolding files.
+anyhow = "1"
 bytes = "0.5"
 ffi-support = "0.4"
-anyhow = "1.0"
-askama = "0.9"
-heck = "0.3"
-clap = "2.33"
-object = "0.20"
-serde = "1.0"
-bincode = "1.3"
-cargo_metadata = "0.10.0"
 lazy_static = "1.4"
+log = "0.4"
+# Regular dependencies
+cargo_metadata = "0.11"