mildlyfunctionalgays/rustybar
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move generated submodules into a subdir

Browse source 
This will avoid possibility of them colliding with generated.rs
This commit is contained in:
Skye 2023-12-16 17:57:36 -05:00
parent 2c766e917d
commit 381df2e644
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.rs
View file

@ -37,6 +37,7 @@ fn main() {
let dbus_paths_raw = let dbus_paths_raw =
env::var("DBUS_XML_PATH").unwrap_or("/usr/share/dbus-1/interfaces".to_string()); env::var("DBUS_XML_PATH").unwrap_or("/usr/share/dbus-1/interfaces".to_string());
fs::create_dir_all(out_dir.join("generated")).unwrap();
dbus_paths_raw dbus_paths_raw
.split(':') .split(':')
.map(fs::read_dir) .map(fs::read_dir)
@ -64,7 +65,7 @@ fn main() {
.strip_suffix(".xml") .strip_suffix(".xml")
.unwrap() .unwrap()
.replace('.', "_"); .replace('.', "_");
let out_path = out_dir.join(module_name.clone() + ".rs"); let out_path = out_dir.join(format!("generated/{module_name}.rs"));
fs::File::create(out_path) fs::File::create(out_path)
.unwrap() .unwrap()
.write_all(code.as_bytes()) .write_all(code.as_bytes())
@ -74,7 +75,7 @@ fn main() {
.write_all( .write_all(
format!( format!(
r#"mod {module_name} {{ r#"mod {module_name} {{
include!(concat!(env!("OUT_DIR"), "/{module_name}.rs")); include!(concat!(env!("OUT_DIR"), "/generated/{module_name}.rs"));
}} }}
pub use {module_name}::*; pub use {module_name}::*;
"# "#