Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default out_dir support #262

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add default out_dir support #262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions ttrpc-codegen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
//! .run()
//! .expect("Gen async code failed.");
//! }
//! ```
//! If there's no out_dir and use 'gen_mod' feature
//! You can use the following method to include the target file
//! include!(concat!(env!("OUT_DIR"), "/mod.rs"));

pub use protobuf_codegen::{
Customize as ProtobufCustomize, CustomizeCallback as ProtobufCustomizeCallback,
Expand All @@ -45,8 +49,8 @@ mod str_lit;
/// Invoke pure rust codegen.
#[derive(Debug, Default)]
pub struct Codegen {
/// --lang_out= param
out_dir: PathBuf,
/// --lang_out= param ,if out_dir is none ,will use env 'OUT_DIR' path
out_dir: Option<PathBuf>,
/// -I args
includes: Vec<PathBuf>,
/// List of .proto files to compile
Expand All @@ -65,9 +69,9 @@ impl Codegen {
Self::default()
}

/// Set the output directory for codegen.
/// Set the output directory for codegen. Support None out_dir
pub fn out_dir(&mut self, out_dir: impl AsRef<Path>) -> &mut Self {
self.out_dir = out_dir.as_ref().to_owned();
self.out_dir = Some(out_dir.as_ref().to_owned());
self
}

Expand Down Expand Up @@ -132,11 +136,18 @@ impl Codegen {
let includes: Vec<&Path> = self.includes.iter().map(|p| p.as_path()).collect();
let inputs: Vec<&Path> = self.inputs.iter().map(|p| p.as_path()).collect();
let p = parse_and_typecheck(&includes, &inputs)?;
// Add default path from env OUT_DIR, if no OUT_DIR env ,that's will be current path
let path_dir = std::env::var("OUT_DIR").map_or_else(
|_| std::env::current_dir().unwrap_or_default(),
PathBuf::from,
);
// If out_dir is none ,dst_path will be setting in path_dir
let dst_path = self.out_dir.clone().unwrap_or(path_dir);

if self.rust_protobuf {
self.rust_protobuf_codegen
.pure()
.out_dir(&self.out_dir)
.out_dir(&dst_path)
.inputs(&self.inputs)
.includes(&self.includes)
.run()
Expand All @@ -146,7 +157,7 @@ impl Codegen {
ttrpc_compiler::codegen::gen_and_write(
&p.file_descriptors,
&p.relative_paths,
&self.out_dir,
&dst_path,
&self.customize,
)
}
Expand Down
Loading