Fix build.rs escaping OUT_DIR

finos · Jul 20, 2023 · 169673f · 169673f
1 parent e8ae29a
commit 169673f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 21 deletions.
diff --git a/rust/perspective-viewer/Cargo.lock b/rust/perspective-viewer/Cargo.lock
diff --git a/rust/perspective-viewer/build.rs b/rust/perspective-viewer/build.rs
@@ -44,13 +44,16 @@ fn glob_with_wd(indir: &str, input: &str) -> Vec<String> {
 }
 
 fn main() -> Result<(), anyhow::Error> {
+    let out_dir = std::env::var("OUT_DIR").unwrap();
+    let out_path = std::path::Path::new(&out_dir);
+
     let mut build = BuildCss::new("./src/less");
     let files = glob_with_wd("./src/less", "**/*.less");
     for src in files.iter() {
         build.add_file(src);
     }
 
-    build.compile()?.write("./target/css")?;
+    build.compile()?.write(out_path.join("css"))?;
 
     let mut build = BuildCss::new("./src/themes");
     build.add_file("variables.less");
@@ -62,7 +65,7 @@ fn main() -> Result<(), anyhow::Error> {
     build.add_file("solarized-dark.less");
     build.add_file("vaporwave.less");
     build.add_file("themes.less");
-    build.compile()?.write("./target/themes")?;
+    build.compile()?.write(out_path.join("themes"))?;
 
     println!(
         "cargo:rustc-env=PKG_VERSION={}",

diff --git a/rust/perspective-viewer/src/rust/components/column_dropdown.rs b/rust/perspective-viewer/src/rust/components/column_dropdown.rs
@@ -18,7 +18,7 @@ use super::modal::*;
 use crate::utils::WeakScope;
 use crate::*;
 
-static CSS: &str = include_str!("../../../target/css/column-dropdown.css");
+static CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/css/column-dropdown.css"));
 
 pub enum ColumnDropDownMsg {
     SetValues(Vec<InPlaceColumn>, f64),

diff --git a/rust/perspective-viewer/src/rust/components/filter_dropdown.rs b/rust/perspective-viewer/src/rust/components/filter_dropdown.rs
@@ -17,7 +17,7 @@ use super::modal::*;
 use crate::utils::WeakScope;
 use crate::*;
 
-static CSS: &str = include_str!("../../../target/css/filter-dropdown.css");
+static CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/css/filter-dropdown.css"));
 
 pub enum FilterDropDownMsg {
     SetValues(Vec<String>),

diff --git a/rust/perspective-viewer/src/rust/components/function_dropdown.rs b/rust/perspective-viewer/src/rust/components/function_dropdown.rs
@@ -18,7 +18,7 @@ use crate::exprtk::CompletionItemSuggestion;
 use crate::utils::WeakScope;
 use crate::*;
 
-static CSS: &str = include_str!("../../../target/css/function-dropdown.css");
+static CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/css/function-dropdown.css"));
 
 pub enum FunctionDropDownMsg {
     SetValues(Vec<CompletionItemSuggestion>),

diff --git a/rust/perspective-viewer/src/rust/components/style/mod.rs b/rust/perspective-viewer/src/rust/components/style/mod.rs
@@ -38,25 +38,13 @@ macro_rules! css {
     ($name:expr) => {{
         (
             $name,
-            include_str!(concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/target/css/",
-                $name,
-                ".css"
-            )),
+            include_str!(concat!(env!("OUT_DIR"), "/css/", $name, ".css")),
         )
     }};
     ($path:expr, $name:expr) => {{
         (
             $name,
-            include_str!(concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/",
-                $path,
-                "/",
-                $name,
-                ".css"
-            )),
+            include_str!(concat!(env!("OUT_DIR"), "/", $path, "/", $name, ".css")),
         )
     }};
 }