Merge pull request #13 from xoviat/build

fix lib selection and bump version

Author: xoviat

stm32-bindings-gen/res/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stm32-bindings"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/embassy-rs/stm32-data"
@@ -73,4 +73,36 @@ defmt = ["dep:defmt"]
 
 rt = ["cortex-m-rt/device"]
 
-# Chip-selection features
+# Library selection features
+
+lib_wba5_linklayer_ble_basic_20_links_lib = []
+lib_wba5_linklayer_ble_basic_lib = []
+lib_wba5_linklayer_ble_basic_plus_20_links_lib = []
+lib_wba5_linklayer_ble_basic_plus_lib = []
+lib_wba5_linklayer_ble_full_lib = []
+lib_wba5_linklayer_ble_mac_lib = []
+lib_wba5_linklayer_ble_peripheral_only_lib = []
+lib_wba5_linklayer_ble_thread_lib = []
+lib_wba5_linklayer_rawmac_lib = []
+lib_wba5_linklayer_thread_lib = []
+lib_wba5_linklayer15_4 = []
+lib_wba6_linklayer_ble_basic_20_links_lib = []
+lib_wba6_linklayer_ble_basic_lib = []
+lib_wba6_linklayer_ble_basic_plus_20_links_lib = []
+lib_wba6_linklayer_ble_basic_plus_lib = []
+lib_wba6_linklayer_ble_full_lib = []
+lib_wba6_linklayer_ble_mac_lib = []
+lib_wba6_linklayer_ble_peripheral_only_lib = []
+lib_wba6_linklayer_ble_thread_lib = []
+lib_wba6_linklayer_rawmac_lib = []
+lib_wba6_linklayer_thread_lib = []
+lib_wba6_linklayer15_4 = []
+lib_wba_mac_lib = []
+lib_stm32wba_ble_stack_po = []
+lib_stm32wba_ble_stack_llo = []
+lib_stm32wba_ble_stack_full = []
+lib_stm32wba_ble_stack_basic = []
+lib_stm32wba_ble_stack_basic_plus = []
+lib_lc3 = []
+lib_codec_mngr = []
+lib_ble_audio = []

stm32-bindings-gen/res/build.rs

@@ -20,8 +20,8 @@ fn main() {
 
     add_dir(&lib_dir).unwrap();
 
-    // TODO: link libraries based on features
-
-    println!("cargo:rustc-link-lib=wba_mac_lib");
-    println!("cargo:rustc-link-lib=WBA5_LinkLayer15_4");
+    env::vars()
+        .filter_map(|(a, _)| a.strip_prefix("CARGO_FEATURE_LIB_").map(|a| a.to_string()))
+        .map(|a| a.to_ascii_lowercase())
+        .for_each(|a| println!("cargo:rustc-link-lib=static={}", a));
 }

stm32-bindings-gen/src/lib.rs

@@ -313,10 +313,10 @@ impl Gen {
             let dst = self.opts.out_dir.join(artifact.destination);
 
             if src.is_file() {
-                self.copy_file(&src, &dst, true)
+                self.copy_lib(&src, &dst)
                     .unwrap_or_else(|err| panic!("Failed to copy file {}: {err}", src.display()));
             } else if src.is_dir() {
-                self.copy_dir(&src, &dst, true)
+                self.copy_lib_dir(&src, &dst)
                     .unwrap_or_else(|err| panic!("Failed to copy dir {}: {err}", src.display()));
             } else {
                 panic!(
@@ -357,24 +357,28 @@ impl Gen {
         }
     }
 
-    fn copy_file(&self, src: &Path, dst: &Path, is_library: bool) -> io::Result<()> {
+    fn copy_lib(&self, src: &Path, dst: &Path) -> 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()
-        };
+        let file_name = "lib".to_string()
+            + dst
+                .file_name()
+                .ok_or(io::Error::new(io::ErrorKind::InvalidFilename, ""))?
+                .to_str()
+                .ok_or(io::Error::new(io::ErrorKind::InvalidFilename, ""))?;
+
+        let dst = dst
+            .parent()
+            .unwrap_or(&Path::new(""))
+            .join(file_name.to_ascii_lowercase());
 
         fs::copy(src, dst)?;
         Ok(())
     }
 
-    fn copy_dir(&self, src: &Path, dst: &Path, is_library: bool) -> io::Result<()> {
+    fn copy_lib_dir(&self, src: &Path, dst: &Path) -> io::Result<()> {
         if !dst.exists() {
             fs::create_dir_all(dst)?;
         }
@@ -383,9 +387,9 @@ impl Gen {
             let path = entry.path();
             let target = dst.join(entry.file_name());
             if path.is_dir() {
-                self.copy_dir(&path, &target, is_library)?;
+                self.copy_lib_dir(&path, &target)?;
             } else {
-                self.copy_file(&path, &target, is_library)?;
+                self.copy_lib(&path, &target)?;
             }
         }
         Ok(())