Răsfoiți Sursa

update hdf5 (#5352)

* update hdf5

* add configs in hdf5

* fix hdf5 tool

* fix version

* add missing links

* add cross test
Inari0 11 luni în urmă
părinte
comite
2bac0f8252
1 a modificat fișierele cu 34 adăugiri și 13 ștergeri
  1. 34 13
      packages/h/hdf5/xmake.lua

+ 34 - 13
packages/h/hdf5/xmake.lua

@@ -6,21 +6,37 @@ package("hdf5")
 
     add_urls("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(version).tar.gz", {version = function (version)
         return format("%d.%d/hdf5-%s/src/hdf5-%s", version:major(), version:minor(), version, version)
-    end})
-    add_versions("1.10.7", "7a1a0a54371275ce2dfc5cd093775bb025c365846512961e7e5ceaecb437ef15")
-    add_versions("1.12.0", "a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a")
-    add_versions("1.12.1", "79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca")
-    add_versions("1.12.2", "2a89af03d56ce7502dcae18232c241281ad1773561ec00c0f0e8ee2463910f14")
-    add_versions("1.13.2", "01643fa5b37dba7be7c4db6bbf3c5d07adf5c1fa17dbfaaa632a279b1b2f06da")
-    add_versions("1.13.3", "83c7c06671f975cee6944b0b217f95005faa55f79ea5532cf4ac268989866af4")
-    add_versions("1.14.0", "a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4")
+    end, alias = "home"})
+    add_urls("https://github.com/HDFGroup/hdf5/releases/download/hdf5_$(version).tar.gz", {version = function (version)
+        return format("%s/hdf5-%s", version:gsub("%-", "."), version)
+    end, alias = "github"})
+    add_versions("home:1.10.7", "7a1a0a54371275ce2dfc5cd093775bb025c365846512961e7e5ceaecb437ef15")
+    add_versions("home:1.12.0", "a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a")
+    add_versions("home:1.12.1", "79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca")
+    add_versions("home:1.12.2", "2a89af03d56ce7502dcae18232c241281ad1773561ec00c0f0e8ee2463910f14")
+    add_versions("home:1.13.2", "01643fa5b37dba7be7c4db6bbf3c5d07adf5c1fa17dbfaaa632a279b1b2f06da")
+    add_versions("home:1.13.3", "83c7c06671f975cee6944b0b217f95005faa55f79ea5532cf4ac268989866af4")
+    add_versions("home:1.14.0", "a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4")
+    add_versions("github:1.14.4-3", "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03")
 
+    add_configs("zlib", {description = "Enable Zlib Filters", default = false, type = "boolean"})
+    add_configs("szip", {description = "Enable Szip Filters", default = false, type = "boolean"})
     add_configs("cpplib", {description = "Build HDF5 C++ Library", default = false, type = "boolean"})
 
     add_deps("cmake")
-    if is_plat("linux") then
+    if is_plat("windows") then
+        add_syslinks("shlwapi")
+    elseif is_plat("linux") then
         add_syslinks("dl")
     end
+    on_load("windows", "macosx", "linux", function (package)
+        if package:config("zlib") then
+            package:add("deps", "zlib")
+        end
+        if package:config("szip") then
+            package:add("deps", "szip")
+        end
+    end)
     on_install("windows", "macosx", "linux", function (package)
         local configs = {
             "-DHDF5_GENERATE_HEADERS=OFF",
@@ -33,17 +49,22 @@ package("hdf5")
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DONLY_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DBUILD_STATIC_LIBS=" .. (package:config("shared") and "OFF" or "ON"))
+        table.insert(configs, "-DHDF5_BUILD_STATIC_TOOLS=" .. (package:config("shared") and "OFF" or "ON"))
         table.insert(configs, "-DHDF5_BUILD_CPP_LIB=" .. (package:config("cpplib") and "ON" or "OFF"))
+        table.insert(configs, "-DHDF5_ENABLE_Z_LIB_SUPPORT=" .. (package:config("zlib") and "ON" or "OFF"))
+        table.insert(configs, "-DHDF5_ENABLE_SZIP_SUPPORT=" .. (package:config("szip") and "ON" or "OFF"))
         import("package.tools.cmake").install(package, configs)
         package:addenv("HDF5_ROOT", path.join(package:installdir("cmake")))
         package:addenv("PATH", package:installdir("bin"))
     end)
 
     on_test(function (package)
-        if package:config("shared") then
-            os.vrun("h5diff-shared --version")
-        else
-            os.vrun("h5diff --version")
+        if not package:is_cross() then
+            if package:config("shared") and package:version():le("1.14.0") then
+                os.vrun("h5diff-shared --version")
+            else
+                os.vrun("h5diff --version")
+            end
         end
         assert(package:has_cfuncs("H5open", {includes = "H5public.h"}))