mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-02 22:29:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: basalt build

Browse source
This commit is contained in:
Gabriele Musco 2023-08-09 18:20:14 +00:00
commit ada31c5606
2 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/build_tools/cmake.rs
View file

@ -1,5 +1,5 @@
use std::collections::HashMap;
use crate::runner::Runner; use crate::runner::Runner;
use std::collections::HashMap;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Cmake { pub struct Cmake {
@ -12,8 +12,10 @@ pub struct Cmake {
impl Cmake { impl Cmake {
pub fn get_prepare_runner(&self) -> Runner { pub fn get_prepare_runner(&self) -> Runner {
let mut args = vec![ let mut args = vec![
"-B".into(), self.build_dir.clone(), "-B".into(),
"-G".into(), "Ninja".into(), self.build_dir.clone(),
"-G".into(),
"Ninja".into(),
]; ];
if self.vars.is_some() { if self.vars.is_some() {
for (k, v) in self.vars.as_ref().unwrap() { for (k, v) in self.vars.as_ref().unwrap() {
@ -21,10 +23,9 @@ impl Cmake {
panic!("Cmake vars cannot contain spaces!"); panic!("Cmake vars cannot contain spaces!");
} }
if v.contains(" ") { if v.contains(" ") {
args.push(format!("-D{k}=\"{v}\"", k=k, v=v)); args.push(format!("-D{k}=\"{v}\"", k = k, v = v));
} } else {
else { args.push(format!("-D{k}={v}", k = k, v = v));
args.push(format!("-D{k}={v}", k=k, v=v));
} }
} }
} }
@ -33,14 +34,18 @@ impl Cmake {
} }
pub fn get_build_runner(&self) -> Runner { pub fn get_build_runner(&self) -> Runner {
Runner::new(self.env.clone(), "cmake".into(), vec![ Runner::new(
"--build".into(), self.build_dir.clone() self.env.clone(),
]) "cmake".into(),
vec!["--build".into(), self.build_dir.clone()],
)
} }
pub fn get_install_runner(&self) -> Runner { pub fn get_install_runner(&self) -> Runner {
Runner::new(self.env.clone(), "cmake".into(), vec![ Runner::new(
"--install".into(), self.build_dir.clone() self.env.clone(),
]) "cmake".into(),
vec!["--install".into(), self.build_dir.clone()],
)
} }
} }

15
src/builders/build_basalt.rs
View file

@ -1,6 +1,5 @@
use crate::{ use crate::{
build_tools::{cmake::Cmake, git::Git}, build_tools::{cmake::Cmake, git::Git},
constants::pkg_data_dir,
file_utils::rm_rf, file_utils::rm_rf,
profile::Profile, profile::Profile,
runner::Runner, runner::Runner,
@ -32,12 +31,22 @@ pub fn get_build_basalt_runners(profile: &Profile, clean_build: bool) -> Vec<Run
format!("{}/lib", profile.prefix), format!("{}/lib", profile.prefix),
); );
let mut cmake_env: HashMap<String, String> = HashMap::new();
cmake_env.insert("CMAKE_BUILD_PARALLEL_LEVEL".into(), "2".into());
let cmake = Cmake { let cmake = Cmake {
env: None, env: Some(cmake_env),
vars: Some(cmake_vars), vars: Some(cmake_vars),
source_dir: profile.features.basalt.path.as_ref().unwrap().clone(), source_dir: profile.features.basalt.path.as_ref().unwrap().clone(),
build_dir: build_dir.clone(), build_dir: build_dir.clone(),
}; };
runners.push(Runner::new(None, "bash".into(), vec![
"-c".into(),
format!(
"cd {repo}/thirdparty/Pangolin && git checkout include/pangolin/utils/picojson.h && curl -sSL 'https://aur.archlinux.org/cgit/aur.git/plain/279c17d9c9eb9374c89489b449f92cb93350e8cd.patch?h=basalt-monado-git' -o picojson_fix.patch && git apply picojson_fix.patch && sed -i '1s/^/#include <stdint.h>\\n/' include/pangolin/platform.h",
repo = git.dir
),
]));
if !Path::new(&build_dir).is_dir() || clean_build { if !Path::new(&build_dir).is_dir() || clean_build {
rm_rf(&build_dir); rm_rf(&build_dir);
runners.push(cmake.get_prepare_runner()); runners.push(cmake.get_prepare_runner());
@ -62,7 +71,7 @@ pub fn get_build_basalt_runners(profile: &Profile, clean_build: bool) -> Vec<Run
vec![ vec![
"-Ra".into(), "-Ra".into(),
format!( format!(
"{}/basalt/thirdparty/basalt-headers/thirdparty/eigen", "{}/thirdparty/basalt-headers/thirdparty/eigen",
profile.features.basalt.path.as_ref().unwrap().clone() profile.features.basalt.path.as_ref().unwrap().clone()
), ),
format!("{}/share/basalt/thirdparty", profile.prefix), format!("{}/share/basalt/thirdparty", profile.prefix),