diff --git a/Artifacts.toml b/Artifacts.toml index c1e74c9..7246ff6 100644 --- a/Artifacts.toml +++ b/Artifacts.toml @@ -1,51 +1,60 @@ [[HDF5]] -arch = "i686" -git-tree-sha1 = "9138ae7d777f0e261e011682666c435efa2d4c0e" +arch = "aarch64" +git-tree-sha1 = "9e7e721ff6bbfea262744a89e1b9760d6b1044d3" libc = "glibc" os = "linux" [[HDF5.download]] - sha256 = "d9507b09f9d81e4652eaa34e423ffb992155c130cf2d5b45dfc961096d3e3fe7" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+4/HDF5.v1.10.5.i686-linux-gnu.tar.gz" + sha256 = "446152500812133d088429315bf5beeab1b3d76fa8a4ee8d0e9d011be1ec8fb2" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+5/HDF5.v1.10.5.aarch64-linux-gnu.tar.gz" [[HDF5]] -arch = "armv7l" -git-tree-sha1 = "233a15c728b4cd4de08dadf362bdbb8aef842089" +arch = "x86_64" +git-tree-sha1 = "7d43efbb6eaa15647f7532afa55301abc8e178b0" libc = "glibc" os = "linux" [[HDF5.download]] - sha256 = "aa666f99e59f05220ac374f55bc1d5cea7519655d7915e63691385c06bcd81b0" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+4/HDF5.v1.10.5.arm-linux-gnueabihf.tar.gz" + sha256 = "e24345f3656d8d410f057d28793afa6e522ef159368bd73ad408ecaf37d4528d" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+5/HDF5.v1.10.5.x86_64-linux-gnu.tar.gz" [[HDF5]] arch = "x86_64" -git-tree-sha1 = "f7c339473744594c2b99bd20497cd408208b19f0" +git-tree-sha1 = "99105bf03f4b937e0ff2d46cd3c551eb200ba5d5" os = "macos" [[HDF5.download]] - sha256 = "dc481057c5e5170e20cb52f0db0595abfc53d7d053a65621101711c3fc41f2ef" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+4/HDF5.v1.10.5.x86_64-apple-darwin14.tar.gz" + sha256 = "c358b409d14509945a75eb9ebe9acb930dd7c15285f8cbc3fd1e21d658754d33" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+5/HDF5.v1.10.5.x86_64-apple-darwin14.tar.gz" [[HDF5]] -arch = "x86_64" -git-tree-sha1 = "34cc42e0ff98cc47869b23d57a0f4bd2445183eb" +arch = "i686" +git-tree-sha1 = "883e86d101aed4745329fd58effac0e6b80490b2" libc = "glibc" os = "linux" [[HDF5.download]] - sha256 = "338910a31400cb321a817790089e61f09c759289dc255736ddd401dee267e477" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+4/HDF5.v1.10.5.x86_64-linux-gnu.tar.gz" + sha256 = "6d4e155f4baaf500883c7c8a4de2a5e3c9b90655b729cdd0b3d15d3a32068a76" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+5/HDF5.v1.10.5.i686-linux-gnu.tar.gz" [[HDF5]] -arch = "i686" -git-tree-sha1 = "5292ab0c0102423cfe89b59e323e34c50269a554" -os = "windows" +arch = "armv7l" +git-tree-sha1 = "301622ed44f211ae874585920d08eddf03a47d34" +libc = "glibc" +os = "linux" [[HDF5.download]] - sha256 = "262ea6505ffc49fa76d84dca5897b79085426eaad786e9836c3c389f60bca1b1" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+4/HDF5.v1.10.5.i686-w64-mingw32.tar.gz" + sha256 = "780192a436f2b3172741782aff325e03d59fb95f111e8679067015cb63430d9d" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+5/HDF5.v1.10.5.armv7l-linux-gnueabihf.tar.gz" [[HDF5]] arch = "x86_64" -git-tree-sha1 = "2a9f7864b3da590dfd96867cf1967ba4205ea21e" +git-tree-sha1 = "e4a598db95cb997373b93ebcd6e6ea22df113fa2" +os = "windows" + + [[HDF5.download]] + sha256 = "620193051072321eb7b40e935aa1eb896d71a69e5556b63702af26dbff301a02" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+5/HDF5.v1.10.5.x86_64-w64-mingw32.tar.gz" +[[HDF5]] +arch = "i686" +git-tree-sha1 = "155bdb9505ca8283e7b44ab7563643831e929c9e" os = "windows" [[HDF5.download]] - sha256 = "410cce3d0b9d5e1a27ef14a4dda7e9abb1a1420607f326c0de005fcc95d78bfc" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+4/HDF5.v1.10.5.x86_64-w64-mingw32.tar.gz" + sha256 = "cf2bafaead2e1d8ccc3a90d4c646c34ccc7802784d8d0d6f089b1f2babb27844" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+5/HDF5.v1.10.5.i686-w64-mingw32.tar.gz" diff --git a/Project.toml b/Project.toml index f55dea4..97e728d 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "HDF5_jll" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.10.5+4" +version = "1.10.5+5" [deps] Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" diff --git a/README.md b/README.md index a0a758a..d622e07 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,20 @@ This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl). -## Usage +## Products -The code bindings within this package are autogenerated from the `Products` defined within the `build_tarballs.jl` file that generated this package. For example purposes, we will assume that the following products were defined: +The code bindings within this package are autogenerated from the following `Products` defined within the `build_tarballs.jl` file that generated this package: + +```julia +products = [ + LibraryProduct(["libhdf5"], :libhdf5), + LibraryProduct(["libhdf5_hl"], :libhdf5_hl) +] +``` + +## Usage example + +For example purposes, we will assume that the following products were defined in the imaginary package `Example_jll`: ```julia products = [ @@ -14,10 +25,10 @@ products = [ ] ``` -With such products defined, this package will contain `data_txt`, `libdataproc` and `mungify_exe` symbols exported. For `FileProduct` variables, the exported value is a string pointing to the location of the file on-disk. For `LibraryProduct` variables, it is a string corresponding to the `SONAME` of the desired library (it will have already been `dlopen()`'ed, so typical `ccall()` usage applies), and for `ExecutableProduct` variables, the exported value is a function that can be called to set appropriate environment variables. Example: +With such products defined, `Example_jll` would contain `data_txt`, `libdataproc` and `mungify_exe` symbols exported. For `FileProduct` variables, the exported value is a string pointing to the location of the file on-disk. For `LibraryProduct` variables, it is a string corresponding to the `SONAME` of the desired library (it will have already been `dlopen()`'ed, so typical `ccall()` usage applies), and for `ExecutableProduct` variables, the exported value is a function that can be called to set appropriate environment variables. Example: ```julia -using HDF5_jll +using Example_jll # For file products, you can access its file location directly: data_lines = open(data_txt, "r") do io diff --git a/src/wrappers/aarch64-linux-gnu.jl b/src/wrappers/aarch64-linux-gnu.jl new file mode 100644 index 0000000..eb1cb83 --- /dev/null +++ b/src/wrappers/aarch64-linux-gnu.jl @@ -0,0 +1,79 @@ +# Autogenerated wrapper script for HDF5_jll for aarch64-linux-gnu +export libhdf5, libhdf5_hl + +using Zlib_jll +## Global variables +PATH = "" +LIBPATH = "" +LIBPATH_env = "LD_LIBRARY_PATH" + +# Relative path to `libhdf5` +const libhdf5_splitpath = ["lib", "libhdf5.so"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_path = "" + +# libhdf5-specific global declaration +# This will be filled out by __init__() +libhdf5_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5 = "libhdf5.so.103" + + +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_hl_path = "" + +# libhdf5_hl-specific global declaration +# This will be filled out by __init__() +libhdf5_hl_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5_hl = "libhdf5_hl.so.100" + + +""" +Open all libraries +""" +function __init__() + global artifact_dir = abspath(artifact"HDF5") + + # Initialize PATH and LIBPATH environment variable listings + global PATH_list, LIBPATH_list + # We first need to add to LIBPATH_list the libraries provided by Julia + append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) + # From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists, + # then append them to our own. + foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) + foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) + + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_handle = dlopen(libhdf5_path) + push!(LIBPATH_list, dirname(libhdf5_path)) + + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) + + # Filter out duplicate and empty entries in our PATH and LIBPATH entries + filter!(!isempty, unique!(PATH_list)) + filter!(!isempty, unique!(LIBPATH_list)) + global PATH = join(PATH_list, ':') + global LIBPATH = join(LIBPATH_list, ':') + + # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms + # that don't honor our "already opened" trick) + #for lp in LIBPATH_list + # push!(DL_LOAD_PATH, lp) + #end +end # __init__() + diff --git a/src/wrappers/armv7l-linux-gnueabihf.jl b/src/wrappers/armv7l-linux-gnueabihf.jl new file mode 100644 index 0000000..2dade00 --- /dev/null +++ b/src/wrappers/armv7l-linux-gnueabihf.jl @@ -0,0 +1,79 @@ +# Autogenerated wrapper script for HDF5_jll for armv7l-linux-gnueabihf +export libhdf5, libhdf5_hl + +using Zlib_jll +## Global variables +PATH = "" +LIBPATH = "" +LIBPATH_env = "LD_LIBRARY_PATH" + +# Relative path to `libhdf5` +const libhdf5_splitpath = ["lib", "libhdf5.so"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_path = "" + +# libhdf5-specific global declaration +# This will be filled out by __init__() +libhdf5_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5 = "libhdf5.so.103" + + +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_hl_path = "" + +# libhdf5_hl-specific global declaration +# This will be filled out by __init__() +libhdf5_hl_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5_hl = "libhdf5_hl.so.100" + + +""" +Open all libraries +""" +function __init__() + global artifact_dir = abspath(artifact"HDF5") + + # Initialize PATH and LIBPATH environment variable listings + global PATH_list, LIBPATH_list + # We first need to add to LIBPATH_list the libraries provided by Julia + append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) + # From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists, + # then append them to our own. + foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) + foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) + + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_handle = dlopen(libhdf5_path) + push!(LIBPATH_list, dirname(libhdf5_path)) + + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) + + # Filter out duplicate and empty entries in our PATH and LIBPATH entries + filter!(!isempty, unique!(PATH_list)) + filter!(!isempty, unique!(LIBPATH_list)) + global PATH = join(PATH_list, ':') + global LIBPATH = join(LIBPATH_list, ':') + + # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms + # that don't honor our "already opened" trick) + #for lp in LIBPATH_list + # push!(DL_LOAD_PATH, lp) + #end +end # __init__() + diff --git a/src/wrappers/i686-linux-gnu.jl b/src/wrappers/i686-linux-gnu.jl index 6f601d7..aec4395 100644 --- a/src/wrappers/i686-linux-gnu.jl +++ b/src/wrappers/i686-linux-gnu.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for i686-linux-gnu -export libhdf5_hl, libhdf5 +export libhdf5, libhdf5_hl using Zlib_jll ## Global variables @@ -7,32 +7,32 @@ PATH = "" LIBPATH = "" LIBPATH_env = "LD_LIBRARY_PATH" -# Relative path to `libhdf5_hl` -const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so.100.1.1"] +# Relative path to `libhdf5` +const libhdf5_splitpath = ["lib", "libhdf5.so.103.0.0"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_hl_path = "" +libhdf5_path = "" -# libhdf5_hl-specific global declaration +# libhdf5-specific global declaration # This will be filled out by __init__() -libhdf5_hl_handle = C_NULL +libhdf5_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5_hl = "libhdf5_hl-3aef14e1.so.100.1.1" +const libhdf5 = "libhdf5-cafdb71e.so.103.0.0" -# Relative path to `libhdf5` -const libhdf5_splitpath = ["lib", "libhdf5.so.103.0.0"] +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so.100.1.1"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_path = "" +libhdf5_hl_path = "" -# libhdf5-specific global declaration +# libhdf5_hl-specific global declaration # This will be filled out by __init__() -libhdf5_handle = C_NULL +libhdf5_hl_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5 = "libhdf5-cafdb71e.so.103.0.0" +const libhdf5_hl = "libhdf5_hl-3aef14e1.so.100.1.1" """ @@ -50,19 +50,19 @@ function __init__() foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) - global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_hl_handle = dlopen(libhdf5_hl_path) - push!(LIBPATH_list, dirname(libhdf5_hl_path)) + global libhdf5_handle = dlopen(libhdf5_path) + push!(LIBPATH_list, dirname(libhdf5_path)) - global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_handle = dlopen(libhdf5_path) - push!(LIBPATH_list, dirname(libhdf5_path)) + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) # Filter out duplicate and empty entries in our PATH and LIBPATH entries filter!(!isempty, unique!(PATH_list)) diff --git a/src/wrappers/i686-w64-mingw32.jl b/src/wrappers/i686-w64-mingw32.jl index 0b157e2..159cd98 100644 --- a/src/wrappers/i686-w64-mingw32.jl +++ b/src/wrappers/i686-w64-mingw32.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for i686-w64-mingw32 -export libhdf5_hl, libhdf5 +export libhdf5, libhdf5_hl using Zlib_jll ## Global variables @@ -7,32 +7,32 @@ PATH = "" LIBPATH = "" LIBPATH_env = "PATH" -# Relative path to `libhdf5_hl` -const libhdf5_hl_splitpath = ["bin", "libhdf5_hl-0.dll"] +# Relative path to `libhdf5` +const libhdf5_splitpath = ["bin", "libhdf5-0.dll"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_hl_path = "" +libhdf5_path = "" -# libhdf5_hl-specific global declaration +# libhdf5-specific global declaration # This will be filled out by __init__() -libhdf5_hl_handle = C_NULL +libhdf5_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5_hl = "libhdf5_hl-0.dll" +const libhdf5 = "libhdf5-0.dll" -# Relative path to `libhdf5` -const libhdf5_splitpath = ["bin", "libhdf5-0.dll"] +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["bin", "libhdf5_hl-0.dll"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_path = "" +libhdf5_hl_path = "" -# libhdf5-specific global declaration +# libhdf5_hl-specific global declaration # This will be filled out by __init__() -libhdf5_handle = C_NULL +libhdf5_hl_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5 = "libhdf5-0.dll" +const libhdf5_hl = "libhdf5_hl-0.dll" """ @@ -50,19 +50,19 @@ function __init__() foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) - global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_hl_handle = dlopen(libhdf5_hl_path) - push!(LIBPATH_list, dirname(libhdf5_hl_path)) + global libhdf5_handle = dlopen(libhdf5_path) + push!(LIBPATH_list, dirname(libhdf5_path)) - global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_handle = dlopen(libhdf5_path) - push!(LIBPATH_list, dirname(libhdf5_path)) + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) # Filter out duplicate and empty entries in our PATH and LIBPATH entries filter!(!isempty, unique!(PATH_list)) diff --git a/src/wrappers/x86_64-apple-darwin14.jl b/src/wrappers/x86_64-apple-darwin14.jl index 068c4c1..99fdb11 100644 --- a/src/wrappers/x86_64-apple-darwin14.jl +++ b/src/wrappers/x86_64-apple-darwin14.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for x86_64-apple-darwin14 -export libhdf5_hl, libhdf5 +export libhdf5, libhdf5_hl using Zlib_jll ## Global variables @@ -7,32 +7,32 @@ PATH = "" LIBPATH = "" LIBPATH_env = "DYLD_FALLBACK_LIBRARY_PATH" -# Relative path to `libhdf5_hl` -const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.100.dylib"] +# Relative path to `libhdf5` +const libhdf5_splitpath = ["lib", "libhdf5.103.dylib"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_hl_path = "" +libhdf5_path = "" -# libhdf5_hl-specific global declaration +# libhdf5-specific global declaration # This will be filled out by __init__() -libhdf5_hl_handle = C_NULL +libhdf5_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5_hl = "@rpath/libhdf5_hl.100.dylib" +const libhdf5 = "@rpath/libhdf5.103.dylib" -# Relative path to `libhdf5` -const libhdf5_splitpath = ["lib", "libhdf5.103.dylib"] +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.100.dylib"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_path = "" +libhdf5_hl_path = "" -# libhdf5-specific global declaration +# libhdf5_hl-specific global declaration # This will be filled out by __init__() -libhdf5_handle = C_NULL +libhdf5_hl_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5 = "@rpath/libhdf5.103.dylib" +const libhdf5_hl = "@rpath/libhdf5_hl.100.dylib" """ @@ -50,19 +50,19 @@ function __init__() foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) - global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_hl_handle = dlopen(libhdf5_hl_path) - push!(LIBPATH_list, dirname(libhdf5_hl_path)) + global libhdf5_handle = dlopen(libhdf5_path) + push!(LIBPATH_list, dirname(libhdf5_path)) - global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_handle = dlopen(libhdf5_path) - push!(LIBPATH_list, dirname(libhdf5_path)) + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) # Filter out duplicate and empty entries in our PATH and LIBPATH entries filter!(!isempty, unique!(PATH_list)) diff --git a/src/wrappers/x86_64-linux-gnu.jl b/src/wrappers/x86_64-linux-gnu.jl index c99c431..2644bee 100644 --- a/src/wrappers/x86_64-linux-gnu.jl +++ b/src/wrappers/x86_64-linux-gnu.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for x86_64-linux-gnu -export libhdf5_hl, libhdf5 +export libhdf5, libhdf5_hl using Zlib_jll ## Global variables @@ -7,32 +7,32 @@ PATH = "" LIBPATH = "" LIBPATH_env = "LD_LIBRARY_PATH" -# Relative path to `libhdf5_hl` -const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so.100.1.1"] +# Relative path to `libhdf5` +const libhdf5_splitpath = ["lib", "libhdf5.so.103.0.0"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_hl_path = "" +libhdf5_path = "" -# libhdf5_hl-specific global declaration +# libhdf5-specific global declaration # This will be filled out by __init__() -libhdf5_hl_handle = C_NULL +libhdf5_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5_hl = "libhdf5_hl-db841637.so.100.1.1" +const libhdf5 = "libhdf5-774513bb.so.103.0.0" -# Relative path to `libhdf5` -const libhdf5_splitpath = ["lib", "libhdf5.so.103.0.0"] +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so.100.1.1"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_path = "" +libhdf5_hl_path = "" -# libhdf5-specific global declaration +# libhdf5_hl-specific global declaration # This will be filled out by __init__() -libhdf5_handle = C_NULL +libhdf5_hl_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5 = "libhdf5-774513bb.so.103.0.0" +const libhdf5_hl = "libhdf5_hl-db841637.so.100.1.1" """ @@ -50,19 +50,19 @@ function __init__() foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) - global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_hl_handle = dlopen(libhdf5_hl_path) - push!(LIBPATH_list, dirname(libhdf5_hl_path)) + global libhdf5_handle = dlopen(libhdf5_path) + push!(LIBPATH_list, dirname(libhdf5_path)) - global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_handle = dlopen(libhdf5_path) - push!(LIBPATH_list, dirname(libhdf5_path)) + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) # Filter out duplicate and empty entries in our PATH and LIBPATH entries filter!(!isempty, unique!(PATH_list)) diff --git a/src/wrappers/x86_64-w64-mingw32.jl b/src/wrappers/x86_64-w64-mingw32.jl index 1c71008..a545fa5 100644 --- a/src/wrappers/x86_64-w64-mingw32.jl +++ b/src/wrappers/x86_64-w64-mingw32.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for x86_64-w64-mingw32 -export libhdf5_hl, libhdf5 +export libhdf5, libhdf5_hl using Zlib_jll ## Global variables @@ -7,32 +7,32 @@ PATH = "" LIBPATH = "" LIBPATH_env = "PATH" -# Relative path to `libhdf5_hl` -const libhdf5_hl_splitpath = ["bin", "libhdf5_hl-0.dll"] +# Relative path to `libhdf5` +const libhdf5_splitpath = ["bin", "libhdf5-0.dll"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_hl_path = "" +libhdf5_path = "" -# libhdf5_hl-specific global declaration +# libhdf5-specific global declaration # This will be filled out by __init__() -libhdf5_hl_handle = C_NULL +libhdf5_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5_hl = "libhdf5_hl-0.dll" +const libhdf5 = "libhdf5-0.dll" -# Relative path to `libhdf5` -const libhdf5_splitpath = ["bin", "libhdf5-0.dll"] +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["bin", "libhdf5_hl-0.dll"] # This will be filled out by __init__() for all products, as it must be done at runtime -libhdf5_path = "" +libhdf5_hl_path = "" -# libhdf5-specific global declaration +# libhdf5_hl-specific global declaration # This will be filled out by __init__() -libhdf5_handle = C_NULL +libhdf5_hl_handle = C_NULL # This must be `const` so that we can use it with `ccall()` -const libhdf5 = "libhdf5-0.dll" +const libhdf5_hl = "libhdf5_hl-0.dll" """ @@ -50,19 +50,19 @@ function __init__() foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) - global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_hl_handle = dlopen(libhdf5_hl_path) - push!(LIBPATH_list, dirname(libhdf5_hl_path)) + global libhdf5_handle = dlopen(libhdf5_path) + push!(LIBPATH_list, dirname(libhdf5_path)) - global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. - global libhdf5_handle = dlopen(libhdf5_path) - push!(LIBPATH_list, dirname(libhdf5_path)) + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) # Filter out duplicate and empty entries in our PATH and LIBPATH entries filter!(!isempty, unique!(PATH_list))