Skip to content

fix library naming #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xoviat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix library naming #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions stm32-bindings-gen/res/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
use std::env;
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use std::{env, fs, io};

fn add_dir(src: &Path) -> io::Result<()> {
println!("cargo:rustc-link-search=native={}", src.to_str().unwrap());

for entry in fs::read_dir(src)? {
let entry = entry?;
let path = entry.path();
if path.is_dir() {
add_dir(&path)?;
}
}
Ok(())
}

fn main() {
let crate_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
let lib_dir = crate_dir.join("src").join("lib");

add_dir(&lib_dir).unwrap();

// TODO: link libraries based on features

println!(
"cargo:rustc-link-search=native={}",
crate_dir.join("src").join("lib").to_str().unwrap()
);
println!("cargo:rustc-link-lib=wba_mac_lib");
println!("cargo:rustc-link-lib=WBA5_LinkLayer15_4");
}
21 changes: 15 additions & 6 deletions stm32-bindings-gen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,10 @@ impl Gen {
let dst = self.opts.out_dir.join(artifact.destination);

if src.is_file() {
self.copy_file(&src, &dst)
self.copy_file(&src, &dst, true)
.unwrap_or_else(|err| panic!("Failed to copy file {}: {err}", src.display()));
} else if src.is_dir() {
self.copy_dir(&src, &dst)
self.copy_dir(&src, &dst, true)
.unwrap_or_else(|err| panic!("Failed to copy dir {}: {err}", src.display()));
} else {
panic!(
Expand Down Expand Up @@ -357,15 +357,24 @@ impl Gen {
}
}

fn copy_file(&self, src: &Path, dst: &Path) -> io::Result<()> {
fn copy_file(&self, src: &Path, dst: &Path, is_library: bool) -> io::Result<()> {
if let Some(parent) = dst.parent() {
fs::create_dir_all(parent)?;
}

let dst = if is_library {
dst.parent()
.unwrap()
.join("lib".to_owned() + dst.file_name().unwrap().to_str().unwrap())
} else {
dst.to_path_buf()
};

fs::copy(src, dst)?;
Ok(())
}

fn copy_dir(&self, src: &Path, dst: &Path) -> io::Result<()> {
fn copy_dir(&self, src: &Path, dst: &Path, is_library: bool) -> io::Result<()> {
if !dst.exists() {
fs::create_dir_all(dst)?;
}
Expand All @@ -374,9 +383,9 @@ impl Gen {
let path = entry.path();
let target = dst.join(entry.file_name());
if path.is_dir() {
self.copy_dir(&path, &target)?;
self.copy_dir(&path, &target, is_library)?;
} else {
self.copy_file(&path, &target)?;
self.copy_file(&path, &target, is_library)?;
}
}
Ok(())
Expand Down