libhdf5-lib::emit_cfg_flags() - pass flags down

Author: aldanor

hdf5-rs/build.rs

@@ -1,3 +1,3 @@
 fn main() {
-    libhdf5_lib::dump_build_flags();
+    libhdf5_lib::emit_cfg_flags();
 }

hdf5-rs/src/lib.rs

@@ -95,9 +95,14 @@ mod internal_prelude {
 #[cfg(test)]
 pub mod test;
 
-/// Returns the version of the HDF5 library that the crate was compiled against.
+/// Returns the runtime version of the HDF5 library.
 pub fn hdf5_version() -> (u8, u8, u8) {
-    h5lock!(libhdf5_lib::hdf5_version()).unwrap_or((0, 0, 0))
+    use self::internal_prelude::c_uint;
+    use libhdf5_sys::h5::H5get_libversion;
+    let mut v: (c_uint, c_uint, c_uint) = (0, 0, 0);
+    h5call!(H5get_libversion(&mut v.0, &mut v.1, &mut v.2))
+        .map(|_| (v.0 as _, v.1 as _, v.2 as _))
+        .unwrap_or((0, 0, 0))
 }
 
 #[cfg(test)]
@@ -106,6 +111,6 @@ pub mod tests {
 
     #[test]
     pub fn test_hdf5_version() {
-        assert!(hdf5_version() >= (1, 8, 0));
+        assert!(hdf5_version() >= (1, 8, 4));
     }
 }

libhdf5-lib/build.rs

@@ -546,20 +546,31 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn emit_flags(&self) {
+    pub fn emit_link_flags(&self) {
         println!("cargo:rustc-link-lib=dylib=hdf5");
         for dir in &self.link_paths {
             println!("cargo:rustc-link-search=native={}", dir.to_str().unwrap());
         }
         println!("cargo:rerun-if-env-changed=HDF5_DIR");
         println!("cargo:rerun-if-env-changed=HDF5_VERSION");
     }
+
+    pub fn emit_cfg_flags(&self) {
+        let version = self.header.version;
+        assert!(version >= Version::new(1, 8, 4), "required HDF5 version: >=1.8.4");
+        let mut vs: Vec<_> = (5..=21).map(|v| Version::new(1, 8, v)).collect(); // 1.8.5-21
+        vs.extend((0..=4).map(|v| Version::new(1, 10, v))); // 1.10.0-4
+        for v in vs.into_iter().filter(|&v| version >= v) {
+            println!("cargo:rustc-cfg=hdf5_{}_{}_{}", v.major, v.minor, v.micro);
+        }
+    }
 }
 
 fn main() {
     let mut searcher = LibrarySearcher::new_from_env();
     searcher.try_locate_hdf5_library();
     let config = searcher.finalize();
     println!("{:#?}", config);
-    config.emit_flags();
+    config.emit_link_flags();
+    config.emit_cfg_flags();
 }

libhdf5-lib/src/lib.rs

@@ -1,40 +1,32 @@
-use std::os::raw::{c_int, c_uint};
-
-extern "C" {
-    pub fn H5open() -> c_int;
-    pub fn H5get_libversion(majnum: *mut c_uint, minnum: *mut c_uint, relnum: *mut c_uint)
-        -> c_int;
-}
-
-pub fn hdf5_version() -> Result<(u8, u8, u8), &'static str> {
-    let mut v: (c_uint, c_uint, c_uint) = (0, 0, 0);
-    unsafe {
-        if H5open() != 0 {
-            Err("cannot open HDF5 library")
-        } else if H5get_libversion(&mut v.0, &mut v.1, &mut v.2) != 0 {
-            Err("cannot get HDF5 version")
-        } else {
-            Ok((v.0 as _, v.1 as _, v.2 as _))
+macro_rules! check_and_emit {
+    ($flag:ident) => {
+        if cfg!($flag) {
+            println!("cargo:rustc-cfg={}", stringify!($flag));
         }
-    }
+    };
 }
 
-pub fn dump_build_flags() {
-    let version = hdf5_version().unwrap();
-    assert!(version >= (1, 8, 4));
-    let mut vs: Vec<_> = (5..=21).map(|v| (1, 8, v)).collect();
-    vs.extend((0..=1).map(|v| (1, 10, v)));
-    for v in vs.into_iter().filter(|&v| version >= v) {
-        println!("cargo:rustc-cfg=hdf5_{}_{}_{}", v.0, v.1, v.2);
-    }
-}
-
-#[cfg(test)]
-pub mod tests {
-    use super::hdf5_version;
-
-    #[test]
-    fn test_version() {
-        assert!(hdf5_version().unwrap() >= (1, 8, 4));
-    }
+pub fn emit_cfg_flags() {
+    check_and_emit!(hdf5_1_8_5);
+    check_and_emit!(hdf5_1_8_6);
+    check_and_emit!(hdf5_1_8_7);
+    check_and_emit!(hdf5_1_8_8);
+    check_and_emit!(hdf5_1_8_9);
+    check_and_emit!(hdf5_1_8_10);
+    check_and_emit!(hdf5_1_8_11);
+    check_and_emit!(hdf5_1_8_12);
+    check_and_emit!(hdf5_1_8_13);
+    check_and_emit!(hdf5_1_8_14);
+    check_and_emit!(hdf5_1_8_15);
+    check_and_emit!(hdf5_1_8_16);
+    check_and_emit!(hdf5_1_8_17);
+    check_and_emit!(hdf5_1_8_18);
+    check_and_emit!(hdf5_1_8_19);
+    check_and_emit!(hdf5_1_8_20);
+    check_and_emit!(hdf5_1_8_21);
+    check_and_emit!(hdf5_1_10_0);
+    check_and_emit!(hdf5_1_10_1);
+    check_and_emit!(hdf5_1_10_2);
+    check_and_emit!(hdf5_1_10_3);
+    check_and_emit!(hdf5_1_10_4);
 }

libhdf5-sys/build.rs

@@ -1,3 +1,3 @@
 fn main() {
-    libhdf5_lib::dump_build_flags();
+    libhdf5_lib::emit_cfg_flags();
 }