try clean include things

Author: plule

dfhack-proto/build.rs

@@ -59,20 +59,11 @@ fn main() {
         assert!(!protos.is_empty(), "No protobuf file for code generation.");
 
         // Generate in the sources if DFHACK_REGEN is set
-        // in OUT_DIR otherwise.
-        // TODO It should always be OUT_DIR, then expose macros.
-        let out_path = match std::env::var("DFHACK_REGEN") {
-            Ok(_) => {
-                let dst = PathBuf::from("src/generated");
-                if dst.exists() {
-                    std::fs::remove_dir_all(&dst).unwrap();
-                }
-                std::fs::create_dir_all(&dst).unwrap();
-                dst
-            }
-            Err(_) => PathBuf::from(std::env::var("OUT_DIR").unwrap()),
-        };
-
+        let out_path = PathBuf::from(format!("{}/src/generated", env!("CARGO_MANIFEST_DIR")));
+        if out_path.exists() {
+            std::fs::remove_dir_all(&out_path).unwrap();
+        }
+        std::fs::create_dir_all(&out_path).unwrap();
         // Generate the protobuf message files
         generate_messages_rs(&protoc, &protos, proto_include_dir, &out_path);
 
@@ -101,13 +92,18 @@ fn messages_protoc_codegen(
     include_dir: &str,
     out_path: &Path,
 ) {
+    let mut mod_path = out_path.to_path_buf();
+    mod_path.push("includes.rs");
+    println!("{}", mod_path.display());
     prost_build::Config::new()
         .enable_type_names()
         .type_attribute(".", "#[derive(serde::Serialize)]")
         .protoc_executable(protoc)
         .out_dir(out_path)
+        .include_file(&mod_path)
         .compile_protos(protos, &[include_dir])
         .unwrap();
+    //panic!("{}", mod_path.display());
 }
 
 fn generate_stubs_rs(protos: &[PathBuf], out_path: &Path) {

dfhack-proto/src/generated/messages/includes.rs

@@ -0,0 +1,26 @@
+// This file is @generated by prost-build.
+pub mod adventure_control {
+    include!("adventure_control.rs");
+}
+pub mod dfproto {
+    include!("dfproto.rs");
+}
+pub mod dfstockpiles {
+    include!("dfstockpiles.rs");
+}
+pub mod dwarf_control {
+    include!("dwarf_control.rs");
+}
+pub mod itemdef_instrument {
+    include!("itemdef_instrument.rs");
+}
+pub mod proto {
+    pub mod enums {
+        pub mod ui_sidebar_mode {
+            include!("proto.enums.ui_sidebar_mode.rs");
+        }
+    }
+}
+pub mod remote_fortress_reader {
+    include!("remote_fortress_reader.rs");
+}

dfhack-proto/src/lib.rs

@@ -7,51 +7,19 @@ use std::{fmt::Display, ops::Deref};
 #[allow(missing_docs)]
 pub(crate) mod generated {
     pub(crate) mod stubs;
-
-    pub(crate) mod messages {
-        pub(crate) mod adventure_control;
-        pub(crate) mod dfproto;
-        pub(crate) mod dfstockpiles;
-        pub(crate) mod dwarf_control;
-        pub(crate) mod itemdef_instrument;
-        pub(crate) mod remote_fortress_reader;
-        pub(crate) mod proto {
-            pub(crate) mod enums {
-                #[path = "../../proto.enums.ui_sidebar_mode.rs"]
-                pub(crate) mod ui_sidebar_mode;
-            }
-        }
-    }
 }
 
 /// Raw protobuf messages
+#[allow(missing_docs)]
 pub mod messages {
-    pub use crate::generated::messages::adventure_control::*;
-    pub use crate::generated::messages::dfproto::*;
-    pub use crate::generated::messages::dfstockpiles::*;
-    pub use crate::generated::messages::dwarf_control::*;
-    pub use crate::generated::messages::itemdef_instrument::*;
-    pub use crate::generated::messages::proto::enums::ui_sidebar_mode::*;
-    pub use crate::generated::messages::remote_fortress_reader::*;
-    // pub use self::AdventureControl::*;
-    // mod Basic;
-    // pub use self::Basic::*;
-    // mod BasicApi;
-    // pub use self::BasicApi::*;
-    // mod CoreProtocol;
-    // pub use self::CoreProtocol::*;
-    // mod DwarfControl;
-    // pub use self::DwarfControl::*;
-    // mod ItemdefInstrument;
-    // pub use self::ItemdefInstrument::*;
-    // mod RemoteFortressReader;
-    // pub use self::RemoteFortressReader::*;
-    // mod example;
-    // pub use self::example::*;
-    // mod stockpiles;
-    // pub use self::stockpiles::*;
-    // mod ui_sidebar_mode;
-    // pub use self::ui_sidebar_mode::*;
+    include!("generated/messages/includes.rs");
+    pub use adventure_control::*;
+    pub use dfproto::*;
+    pub use dfstockpiles::*;
+    pub use dwarf_control::*;
+    pub use itemdef_instrument::*;
+    pub use proto::enums::ui_sidebar_mode::*;
+    pub use remote_fortress_reader::*;
 }
 
 /// Stubs exposing the feature of the DFHack remote API.