trying to internalize mib codegen

2022-11-27 22:13:15 +01:00 · 2022-11-27 22:13:15 +01:00 · 489686c8ce
commit 489686c8ce
parent b0b41a07dc
8 changed files with 7 additions and 4 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -2,7 +2,6 @@

 members = [
    "satrs-core",
-    "satrs-macros",
    "satrs-mib",
    "satrs-example",
    "spacepackets",
--- a/satrs-mib/Cargo.toml
+++ b/satrs-mib/Cargo.toml
@ -15,6 +15,9 @@ path = "../satrs-core"
 [dependencies.satrs-macros]
 path = "../satrs-macros"

+[dependencies.satrs-mib-codegen]
+path = "codegen"
+
 [dependencies.serde]
 version = "1.0"
 default-features = false
--- a/satrs-mib/codegen/Cargo.toml
+++ b/satrs-mib/codegen/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "satrs-macros"
+name = "satrs-mib-codegen"
 version = "0.1.0"
 edition = "2021"

@ -16,13 +16,13 @@ quote = "1.0"
 proc-macro2 = "1.0"

 [dependencies.satrs-core]
-path = "../satrs-core"
+path = "../../satrs-core"

 [dev-dependencies]
 trybuild = { version = "1.0", features = ["diff"] }

 [dev-dependencies.satrs-mib]
-path = "../satrs-mib"
+path = ".."

 [dependencies.syn]
 version = "1.0"
--- a/satrs-mib/codegen/src/lib.rs
+++ b/satrs-mib/codegen/src/lib.rs
--- a/satrs-mib/codegen/tests/basic.rs
+++ b/satrs-mib/codegen/tests/basic.rs
--- a/satrs-mib/codegen/tests/tests.rs
+++ b/satrs-mib/codegen/tests/tests.rs
--- a/satrs-mib/codegen/tests/verify_gen_struct.rs
+++ b/satrs-mib/codegen/tests/verify_gen_struct.rs
--- a/satrs-mib/src/lib.rs
+++ b/satrs-mib/src/lib.rs
@ -1 +1,2 @@
+pub use satrs_mib_codegen::*;
 pub mod res_code;