chore: Write lalrpop files to OUT_DIR instead of the source tree

Marwes · Marwes · commit fd7ff461f442 · 2017-11-27T18:16:56.000+01:00
Should let gluon be ran under cargobomb rust-lang/crater#157 but I think that regardless of that it is better to generate files outside of the source tree
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,3 @@
 
 target
 Cargo.lock
-
-parser/src/grammar.rs
-vm/src/core/grammar.rs
diff --git a/parser/build.rs b/parser/build.rs
@@ -3,6 +3,9 @@ extern crate lalrpop;
 fn main() {
     ::std::env::set_var("LALRPOP_LANE_TABLE", "disabled");
 
-    lalrpop::Configuration::new().process_current_dir().unwrap();
-    println!("cargo:rerun-if-changed=src/grammar.lalrpop");
+    lalrpop::Configuration::new()
+        .use_cargo_dir_conventions()
+        .process_file("src/grammar.lalrpop")
+        .unwrap();
+    println!("cargo:rerun-if-changed=grammar.lalrpop");
 }
diff --git a/parser/src/grammar.rs b/parser/src/grammar.rs
@@ -0,0 +1 @@
+include!(concat!(env!("OUT_DIR"), "/grammar.rs"));
diff --git a/vm/build.rs b/vm/build.rs
@@ -1,10 +1,14 @@
-
 #[cfg(feature = "test")]
 mod build {
     extern crate lalrpop;
+
     pub fn main() {
-        lalrpop::Configuration::new().process_current_dir().unwrap();
-        println!("cargo:rerun-if-changed=src/core/grammar.lalrpop");
+        lalrpop::Configuration::new()
+            .use_cargo_dir_conventions()
+            .process_file("src/core/grammar.lalrpop")
+            .unwrap();
+
+        println!("cargo:rerun-if-changed=core/grammar.lalrpop");
     }
 }
 
diff --git a/vm/src/core/grammar.rs b/vm/src/core/grammar.rs
@@ -0,0 +1 @@
+include!(concat!(env!("OUT_DIR"), "/core/grammar.rs"));

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+include!(concat!(env!("OUT_DIR"), "/grammar.rs"));`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+include!(concat!(env!("OUT_DIR"), "/core/grammar.rs"));`