From 7392f9eb1acd1eb28e56d2a9fd367056dc528ac2 Mon Sep 17 00:00:00 2001
From: Davide Mor <davide.mor@skywarder.eu>
Date: Mon, 18 Mar 2024 10:30:08 +0100
Subject: [PATCH] Fixed saving output to OUT_DIR
---
build.rs | 6 +++---
src/bindings.rs | 41 -----------------------------------------
src/lib.rs | 4 +++-
3 files changed, 6 insertions(+), 45 deletions(-)
delete mode 100644 src/bindings.rs
diff --git a/build.rs b/build.rs
index 932fcea..87e1695 100644
--- a/build.rs
+++ b/build.rs
@@ -2,10 +2,10 @@
use std::env;
-const DEF_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/message_definitions");
-
pub fn main() {
- let result = mavlink_bindgen::generate(DEF_DIR, env::var("OUT_DIR").unwrap())
+ let out_path = env::var("OUT_DIR").unwrap();
+
+ let result = mavlink_bindgen::generate("message_definitions", out_path)
.expect("Failed to generate Rust MAVLink bindings");
mavlink_bindgen::format_generated_code(&result);
diff --git a/src/bindings.rs b/src/bindings.rs
deleted file mode 100644
index 725b2b7..0000000
--- a/src/bindings.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-#![allow(non_camel_case_types)]
-#![allow(clippy::derive_partial_eq_without_eq)]
-#![allow(clippy::field_reassign_with_default)]
-#![allow(non_snake_case)]
-#![allow(clippy::unnecessary_cast)]
-#![allow(clippy::bad_bit_mask)]
-
-#[cfg(feature = "gemini")]
-pub mod gemini {
- include!(concat!(env!("OUT_DIR"), "/lyra.rs"));
-}
-
-#[cfg(feature = "hermes")]
-pub mod hermes {
- include!(concat!(env!("OUT_DIR"), "/hermes.rs"));
-}
-
-#[cfg(feature = "lynx")]
-pub mod lynx {
- include!(concat!(env!("OUT_DIR"), "/lynx.rs"));
-}
-
-#[cfg(feature = "lyra")]
-pub mod lyra {
- include!(concat!(env!("OUT_DIR"), "/lyra.rs"));
-}
-
-#[cfg(feature = "pyxis")]
-pub mod pyxis {
- include!(concat!(env!("OUT_DIR"), "/pyxis.rs"));
-}
-
-#[cfg(feature = "r2a")]
-pub mod r2a {
- include!(concat!(env!("OUT_DIR"), "/r2a.rs"));
-}
-
-#[cfg(feature = "test")]
-pub mod test {
- include!(concat!(env!("OUT_DIR"), "/test.rs"));
-}
diff --git a/src/lib.rs b/src/lib.rs
index d667db1..ebad77c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,6 @@
-mod bindings;
+mod bindings {
+ include!(concat!(env!("OUT_DIR"), "/mod.rs"));
+}
// Re-export the generated bindings
pub use bindings::*;
--
GitLab