Fix proto out_dir

bomboni_prost/src/config.rs

@@ -17,8 +17,9 @@ pub struct ApiConfig {
 impl Default for CompileConfig {
     fn default() -> Self {
         Self {
-            file_descriptor_set_path: Default::default(),
-            output_path: Default::default(),
+            file_descriptor_set_path: PathBuf::from(std::env::var("OUT_DIR").unwrap())
+                .join("fd.pb"),
+            output_path: std::env::var("OUT_DIR").unwrap().into(),
             format: true,
             api: Default::default(),
         }

bomboni_proto/build.rs

@@ -6,19 +6,18 @@ use bomboni_prost::{
 };
 
 fn main() -> Result<(), Box<dyn Error + 'static>> {
+    let fd_path = PathBuf::from(std::env::var("OUT_DIR").unwrap()).join("fd.pb");
+
     #[cfg(feature = "testing")]
     {
         let mut config = prost_build::Config::new();
         config
-            .file_descriptor_set_path("./tests/proto/fd.pb")
-            .out_dir("./tests/proto")
+            .file_descriptor_set_path(fd_path.clone())
             .protoc_arg("--experimental_allow_proto3_optional")
             .btree_map(["."])
             .compile_protos(&["./tests/proto/tools.proto"], &["./tests/proto/"])?;
 
         compile(CompileConfig {
-            file_descriptor_set_path: "./tests/proto/fd.pb".into(),
-            output_path: "./tests/proto".into(),
             ..Default::default()
         })?;
     }
@@ -44,8 +43,7 @@ fn main() -> Result<(), Box<dyn Error + 'static>> {
 
     let mut config = prost_build::Config::new();
     config
-        .out_dir("./src")
-        .file_descriptor_set_path("./src/fd.pb")
+        .file_descriptor_set_path(fd_path)
         .compile_well_known_types()
         .protoc_arg("--experimental_allow_proto3_optional")
         .btree_map(["."]);
@@ -83,8 +81,6 @@ fn main() -> Result<(), Box<dyn Error + 'static>> {
 
     config.compile_protos(&proto_paths, &["./proto"])?;
     compile(CompileConfig {
-        file_descriptor_set_path: "./src/fd.pb".into(),
-        output_path: "./src".into(),
         api: ApiConfig {
             domain: Some("type.googleapis.com".into()),
             ..Default::default()

bomboni_proto/src/lib.rs

@@ -1,2 +1,37 @@
-pub mod google;
+mod protobuf;
+mod rpc;
 pub mod serde;
+
+/// Includes generated protobuf code.
+/// Base path is specified with OUT_DIR environment variable.
+#[macro_export]
+macro_rules! include_proto {
+    ($package: tt) => {
+        include!(concat!(env!("OUT_DIR"), concat!("/", $package, ".rs")));
+    };
+}
+
+/// Includes generated protobuf file descriptor set.
+#[macro_export]
+macro_rules! include_file_descriptor_set {
+    () => {
+        include_file_descriptor_set!("fd");
+    };
+    ($name:tt) => {
+        include_bytes!(concat!(env!("OUT_DIR"), concat!("/", $name, ".fd")));
+    };
+}
+
+#[allow(unused_qualifications)]
+pub mod google {
+    pub mod protobuf {
+        pub use super::super::protobuf::*;
+        crate::include_proto!("google.protobuf");
+        crate::include_proto!("google.protobuf.plus");
+    }
+    pub mod rpc {
+        pub use super::super::rpc::*;
+        crate::include_proto!("google.rpc");
+        crate::include_proto!("google.rpc.plus");
+    }
+}

bomboni_proto/src/google/protobuf/any.rs → bomboni_proto/src/protobuf/any.rs

@@ -1,7 +1,5 @@
+use crate::google::protobuf::Any;
 use prost::{DecodeError, EncodeError, Message, Name};
-
-use super::Any;
-
 impl Any {
     pub fn new(type_url: String, value: Vec<u8>) -> Self {
         Any { type_url, value }

bomboni_proto/src/google/protobuf/duration.rs → bomboni_proto/src/protobuf/duration.rs

@@ -9,7 +9,7 @@ use std::{
 };
 use thiserror::Error;
 
-use super::Duration;
+use crate::google::protobuf::Duration;
 
 #[derive(Error, Debug)]
 pub enum DurationError {

bomboni_proto/src/google/protobuf/empty.rs → bomboni_proto/src/protobuf/empty.rs

@@ -1,7 +1,5 @@
+use crate::google::protobuf::Empty;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-use super::Empty;
-
 impl Empty {
     pub fn new() -> Self {
         Empty {}

bomboni_proto/src/google/protobuf/field_mask.rs → bomboni_proto/src/protobuf/field_mask.rs

@@ -1,7 +1,7 @@
 use crate::serde::helpers as serde_helpers;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use super::FieldMask;
+use crate::google::protobuf::FieldMask;
 
 impl FieldMask {
     pub fn new(paths: Vec<String>) -> Self {

bomboni_proto/src/protobuf/mod.rs

@@ -0,0 +1,6 @@
+mod any;
+mod duration;
+mod empty;
+mod field_mask;
+mod timestamp;
+mod wrappers;

bomboni_proto/src/google/protobuf/timestamp.rs → bomboni_proto/src/protobuf/timestamp.rs

@@ -9,7 +9,7 @@ use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 
 use thiserror::Error;
 
-use super::Timestamp;
+use crate::google::protobuf::Timestamp;
 
 #[derive(Error, Debug)]
 pub enum TimestampError {

bomboni_proto/src/rpc/mod.rs

@@ -0,0 +1 @@
+pub mod status;

bomboni_proto/src/google/rpc/status.rs → bomboni_proto/src/rpc/status.rs

@@ -1,6 +1,6 @@
 use crate::google::protobuf::Any;
 
-use super::{Code, Status};
+use crate::google::rpc::{Code, Status};
 
 impl Status {
     pub fn new(code: Code, message: String, details: Vec<Any>) -> Self {

bomboni_proto/src/serde/helpers.rs

@@ -3,7 +3,6 @@ use serde::{de, ser, Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt;
 use std::fmt::{Display, Formatter};
 use std::marker::PhantomData;
-
 use std::str::FromStr;
 
 pub fn is_default<T>(value: &T) -> bool

bomboni_proto/tests/prost.rs

@@ -10,19 +10,23 @@ use crate::tools::{
     },
     CommandRequest, ServingStatus,
 };
+use bomboni_proto::include_proto;
 
-#[allow(clippy::module_inception)]
+#[allow(unused_qualifications, clippy::module_inception)]
 pub mod tools {
+    use super::*;
+    include_proto!("tools");
+    include_proto!("tools.plus");
     pub mod command {
-        include!("./proto/tools.command.rs");
-        include!("./proto/tools.command.plus.rs");
+        use super::*;
+        include_proto!("tools.command");
+        include_proto!("tools.command.plus");
     }
     pub mod perms {
-        include!("./proto/tools.perms.rs");
-        include!("./proto/tools.perms.plus.rs");
+        use super::*;
+        include_proto!("tools.perms");
+        include_proto!("tools.perms.plus");
     }
-    include!("./proto/tools.rs");
-    include!("./proto/tools.plus.rs");
 }
 
 #[test]