--output-dir

Author: burrbull

CHANGELOG.md

@@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- Option `-o`(`--output-path`) let you specify output directory path
+- Option `ignore_groups` for optional disabling #506
+
 ### Changed
 
 - options can be set now with `svd2rust.toml` config
-- option `ignore_groups` for optional disabling #506
 - [breaking-change] move `const_generic` from features to options
 - use `Config` to pass options over all render levels
 - Use register iterator from `svd-parser`

src/generate/device.rs

@@ -3,6 +3,7 @@ use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, ToTokens};
 use std::fs::File;
 use std::io::Write;
+use std::path::Path;
 
 use crate::util::{self, Config, ToSanitizedUpperCase};
 use crate::Target;
@@ -11,7 +12,12 @@ use anyhow::Result;
 use crate::generate::{interrupt, peripheral};
 
 /// Whole device generation
-pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<TokenStream> {
+pub fn render(
+    d: &Device,
+    config: &Config,
+    device_x: &mut String,
+    path: impl AsRef<Path>,
+) -> Result<TokenStream> {
     let mut out = TokenStream::new();
 
     let commit_info = {
@@ -139,7 +145,11 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
 
     let generic_file = std::str::from_utf8(include_bytes!("generic.rs"))?;
     if config.generic_mod {
-        writeln!(File::create("generic.rs")?, "{}", generic_file)?;
+        writeln!(
+            File::create(&path.as_ref().join("generic.rs"))?,
+            "{}",
+            generic_file
+        )?;
 
         if !config.make_mod {
             out.extend(quote! {

src/lib.rs

@@ -516,7 +516,7 @@ pub fn generate(xml: &str, config: &Config) -> Result<Generation> {
     let device = svd::parse(xml)?;
     let mut device_x = String::new();
     let items =
-        generate::device::render(&device, &config, &mut device_x).or(Err(SvdError::Render))?;
+        generate::device::render(&device, &config, &mut device_x, ".").or(Err(SvdError::Render))?;
 
     let mut lib_rs = String::new();
     writeln!(

src/main.rs

@@ -1,6 +1,7 @@
 #![recursion_limit = "128"]
 
 use log::error;
+use std::path::PathBuf;
 use svd_parser as svd;
 
 mod generate;
@@ -29,8 +30,17 @@ fn run() -> Result<()> {
                     .takes_value(true)
                     .value_name("FILE"),
             )
+            .arg(
+                Arg::with_name("output")
+                    .long("output-dir")
+                    .help("Directory to place generated files")
+                    .short("o")
+                    .takes_value(true)
+                    .value_name("PATH"),
+            )
             .arg(
                 Arg::with_name("config")
+                    .long("config")
                     .help("Config TOML file")
                     .short("c")
                     .takes_value(true)
@@ -102,6 +112,8 @@ fn run() -> Result<()> {
         }
     }
 
+    let path = PathBuf::from(matches.value_of("output").unwrap_or("."));
+
     let config_filename = matches.value_of("config").unwrap_or("");
 
     let cfg = with_toml_env(&matches, &[config_filename, "svd2rust.toml"]);
@@ -139,17 +151,17 @@ fn run() -> Result<()> {
     };
 
     let mut device_x = String::new();
-    let items = generate::device::render(&device, &config, &mut device_x)?;
+    let items = generate::device::render(&device, &config, &mut device_x, &path)?;
     let filename = if make_mod { "mod.rs" } else { "lib.rs" };
-    let mut file = File::create(filename).expect("Couldn't create output file");
+    let mut file = File::create(&path.join(filename)).expect("Couldn't create output file");
 
     let data = items.to_string().replace("] ", "]\n");
     file.write_all(data.as_ref())
         .expect("Could not write code to lib.rs");
 
     if target == Target::CortexM || target == Target::Msp430 || target == Target::XtensaLX {
-        writeln!(File::create("device.x")?, "{}", device_x)?;
-        writeln!(File::create("build.rs")?, "{}", build_rs())?;
+        writeln!(File::create(&path.join("device.x"))?, "{}", device_x)?;
+        writeln!(File::create(&path.join("build.rs"))?, "{}", build_rs())?;
     }
 
     Ok(())