P4Pillon/Krys4lide
4
2
Fork 0
Code Issues 27 Pull Requests 3 Actions Packages Projects 1 Releases Activity

fix: make path to env files depend of the CARGO_MANIFEST_DIR of sesam-vitale crate

Browse Source
This commit is contained in:
Florian Briand 2024-07-27 00:31:01 +02:00
parent a194b2d888
commit 9fc3fef350
Signed by: florian_briand
GPG Key ID: CC981B9E6B98E70B
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/sesam-vitale/build.rs
View File

@ -5,13 +5,17 @@ use std::path::PathBuf;
fn main() { fn main() {
// Load the .env.build file for build-time environment variables // Load the .env.build file for build-time environment variables
dotenv::from_filename(".env.build").ok();
println!("cargo::rerun-if-changed=.env.build");
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
let manifest_path = PathBuf::from(manifest_dir);
dotenv::from_path(manifest_path.join(".env.build")).ok();
println!("cargo::rerun-if-env-changed=SESAM_FSV_LIB_PATH");
println!("cargo::rerun-if-env-changed=SESAM_FSV_SSVLIB");
println!("cargo::rerun-if-changed=.env.build");
println!("cargo::rerun-if-changed=build.rs");
// Add local lib directory to the linker search path (for def files and static libs) // Add local lib directory to the linker search path (for def files and static libs)
let static_lib_path = PathBuf::from(manifest_dir).join("lib"); let static_lib_path = manifest_path.join("lib");
println!("cargo::rustc-link-search=native={}", static_lib_path.display()); println!("cargo::rustc-link-search=native={}", static_lib_path.display());
// Add the SESAM_FSV_LIB_PATH to the linker search path // Add the SESAM_FSV_LIB_PATH to the linker search path

6
crates/sesam-vitale/src/ssvlib_demo.rs
View File

@ -3,9 +3,9 @@ extern crate dotenv;
use libc::{ c_char, c_void, c_ushort, size_t }; use libc::{ c_char, c_void, c_ushort, size_t };
use std::ffi::CString; use std::ffi::CString;
use std::path::PathBuf;
use std::ptr; use std::ptr;
use dotenv::dotenv;
use std::env; use std::env;
extern "C" { extern "C" {
@ -72,7 +72,9 @@ fn ssv_lire_config() {
} }
pub fn demo() { pub fn demo() {
dotenv().ok(); let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
let manifest_path = PathBuf::from(manifest_dir);
dotenv::from_path(manifest_path.join(".env")).ok();
println!("------- Demo for the SSV library --------"); println!("------- Demo for the SSV library --------");