Merge remote-tracking branch 'mulimoen/feature/static-multi-versions'

Author: mulimoen

.github/workflows/ci.yml

@@ -58,7 +58,7 @@ jobs:
         include:
           - {version: hdf5@1.8}
           - {version: hdf5@1.10}
-          - {version: hdf5@1.12}
+          # - {version: hdf5@1.12}
           - {version: hdf5-mpi, mpi: true}
     steps:
       - name: Checkout repository
@@ -132,10 +132,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: ubuntu, rust: stable}
-          - {os: windows, rust: stable-msvc}
-          - {os: windows, rust: stable-gnu}
-          - {os: macos, rust: stable}
+          - {os: ubuntu, rust: stable, h5version: 1_13}
+          - {os: windows, rust: stable-msvc, h5version: 1_12}
+          - {os: windows, rust: stable-gnu, h5version: 1_10}
+          - {os: macos, rust: stable, h5version: 1_10}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -144,9 +144,9 @@ jobs:
         uses: actions-rs/toolchain@v1
         with: {toolchain: '${{matrix.rust}}', profile: minimal, override: true}
       - name: Build and test all crates
-        run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib --exclude hdf5-derive
+        run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib,hdf5-src/${{matrix.h5version}} --exclude hdf5-derive
       - name: Build and test with filters
-        run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib,lzf,blosc --exclude hdf5-derive
+        run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib,lzf,blosc,hdf5-src/${{matrix.h5version}} --exclude hdf5-derive
         if: matrix.rust != 'stable-gnu'
       - name: Run examples
         run: |

.gitmodules

@@ -1,3 +1,9 @@
-[submodule "hdf5"]
-	path = hdf5-src/ext/hdf5
+[submodule "hdf5-src/ext/1_13_0"]
+	path = hdf5-src/ext/1_13
+	url = https://github.com/HDFGroup/hdf5.git
+[submodule "hdf5-src/ext/1_12_0"]
+	path = hdf5-src/ext/1_12
+	url = https://github.com/HDFGroup/hdf5.git
+[submodule "hdf5-src/ext/1_10_0"]
+	path = hdf5-src/ext/1_10
 	url = https://github.com/HDFGroup/hdf5.git

hdf5-src/Cargo.toml

@@ -3,7 +3,7 @@ name = "hdf5-src"
 version = "0.8.1"  # !V
 authors = ["Ivan Smirnov <i.s.smirnov@gmail.com>"]
 keywords = ["hdf5"]
-license-file = "ext/hdf5/COPYING"
+license-file = "ext/1_13/COPYING"
 build = "build.rs"
 repository = "https://github.com/aldanor/hdf5-rust"
 homepage = "https://github.com/aldanor/hdf5-rust"
@@ -13,25 +13,36 @@ links = "hdf5src"
 readme = "README.md"
 categories = ["ffi"]
 exclude = [
-    "ext/hdf5/bin/**",
-    "ext/hdf5/c++/**",
-    "ext/hdf5/examples/**",
-    "ext/hdf5/fortran/**",
-    "ext/hdf5/java/**",
-    "ext/hdf5/release_docs/**",
-    "ext/hdf5/test/**",
-    "ext/hdf5/testpar/**",
-    "ext/hdf5/tools/**",
-    "ext/hdf5/hl/test/**",
-    "ext/hdf5/hl/tools/**",
-    "ext/hdf5/hl/examples/**",
+    "ext/*/bin/**",
+    "ext/*/c++/**",
+    "ext/*/examples/**",
+    "ext/*/fortran/**",
+    "ext/*/java/**",
+    "ext/*/release_docs/**",
+    "ext/*/test/**",
+    "ext/*/testpar/**",
+    "ext/*/tools/**",
+    "ext/*/m4/**",
+    "ext/*/configure",
+    "ext/*/MANIFEST",
+    "ext/*/hl/test/**",
+    "ext/*/hl/tools/**",
+    "ext/*/hl/examples/**",
+    "ext/*/hl/fortran/**",
+    "ext/*/hl/c++/**",
+    "ext/*/oxygen/**",
+    "ext/*/doxygen/**",
+    "ext/*/config/cmake_ext_mod/hdf.icns",
 ]
 
 [features]
 hl = []
 zlib = ["libz-sys"]
 deprecated = []
 threadsafe = []
+1_10 = []
+1_12 = []
+1_13 = []
 
 [dependencies]
 libz-sys = { version = "1.0.25", features = ["static"], optional = true, default-features=false }

hdf5-src/build.rs

@@ -6,7 +6,15 @@ fn feature_enabled(feature: &str) -> bool {
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
-    let mut cfg = cmake::Config::new("ext/hdf5");
+    let mut cfg = if feature_enabled("1_13") {
+        cmake::Config::new("ext/1_13")
+    } else if feature_enabled("1_12") {
+        cmake::Config::new("ext/1_12")
+    } else if feature_enabled("1_10") {
+        cmake::Config::new("ext/1_10")
+    } else {
+        cmake::Config::new("ext/1_10")
+    };
 
     // only build the static c library, disable everything else
     cfg.define("HDF5_NO_PACKAGES", "ON");

hdf5-src/ext/hdf5 renamed to hdf5-src/ext/1_10

@@ -1,6 +1,6 @@
 use std::fmt;
 use std::mem;
-use std::ptr;
+use std::ptr::{self, addr_of};
 
 use crate::internal_prelude::*;
 
@@ -53,7 +53,7 @@ pub trait ObjectClass: Sized {
     unsafe fn cast_unchecked<T: ObjectClass>(self) -> T {
         // This method requires you to be 18 years or older to use it
         // (note: if it wasn't a trait method, it could be marked as const)
-        let obj = ptr::read((&self as *const Self).cast());
+        let obj = ptr::read(addr_of!(self).cast());
         mem::forget(self);
         obj
     }

hdf5-src/ext/1_12

@@ -72,7 +72,7 @@ macro_rules! impl_tuple {
             #[inline]
             fn dims(&self) -> Vec<Ix> {
                 unsafe {
-                    slice::from_raw_parts(self as *const _ as *const _, self.ndim())
+                    slice::from_raw_parts((self as *const Self).cast(), self.ndim())
                 }.iter().cloned().collect()
             }
         }

hdf5-src/ext/1_13

@@ -3,7 +3,7 @@ use std::error::Error as StdError;
 use std::fmt;
 use std::ops::Deref;
 use std::panic;
-use std::ptr;
+use std::ptr::{self, addr_of_mut};
 
 use ndarray::ShapeError;
 
@@ -95,7 +95,7 @@ impl ErrorStack {
         }
 
         let mut data = CallbackData { stack: ExpandedErrorStack::new(), err: None };
-        let data_ptr: *mut c_void = (&mut data as *mut CallbackData).cast::<c_void>();
+        let data_ptr: *mut c_void = addr_of_mut!(data).cast::<c_void>();
 
         let stack_id = self.handle().id();
         h5lock!({