Split tgz path var into plugin var and compression vars (#81)

HDFGroup · Oct 2, 2023 · 4af60a6 · 4af60a6
1 parent b2c5ebb
commit 4af60a6
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 45 deletions.
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
@@ -98,9 +98,9 @@ jobs:
         run: |
           if [[ '${{ inputs.use_environ }}' == 'snapshots' && '${{ needs.check_commits.outputs.has_changes }}' == 'true' ]]
           then
-            FILE_NAME_BASE=$(echo "hdf5_plugin-${{ needs.check_commits.outputs.branch_ref }}-${{ needs.check_commits.outputs.branch_sha }}")
+            FILE_NAME_BASE=$(echo "hdf5_plugins-${{ needs.check_commits.outputs.branch_ref }}-${{ needs.check_commits.outputs.branch_sha }}")
           else
-            FILE_NAME_BASE=$(echo "hdf5_plugin-${{ steps.version.outputs.TAG_VERSION }}")
+            FILE_NAME_BASE=$(echo "hdf5_plugins-${{ steps.version.outputs.TAG_VERSION }}")
           fi
           echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
         shell: bash

diff --git a/BLOSC/CMakeLists.txt b/BLOSC/CMakeLists.txt
@@ -112,11 +112,11 @@ if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MAT
     set (BLOSC_URL ${BLOSC_GIT_URL} CACHE STRING "Path to blosc git repository")
     set (BLOSC_BRANCH ${BLOSC_GIT_BRANCH})
   elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    if (NOT TGZPATH)
-      set (TGZPATH ${H5BLOSC_SOURCE_DIR})
+    if (NOT H5PL_COMP_TGZPATH)
+      set (H5PL_COMP_TGZPATH ${H5BLOSC_SOURCE_DIR})
     endif ()
-    set (BLOSC_ZLIB_URL ${TGZPATH}/${BLOSC_ZLIB_TGZ_NAME})
-    set (BLOSC_URL ${TGZPATH}/${BLOSC_TGZ_NAME})
+    set (BLOSC_ZLIB_URL ${H5PL_COMP_TGZPATH}/${BLOSC_ZLIB_TGZ_NAME})
+    set (BLOSC_URL ${H5PL_COMP_TGZPATH}/${BLOSC_TGZ_NAME})
   else ()
     set (BLOSC_ZLIB_USE_EXTERNAL 0)
     set (BLOSC_USE_EXTERNAL 0)

diff --git a/BSHUF/CMakeLists.txt b/BSHUF/CMakeLists.txt
@@ -96,10 +96,10 @@ if (NOT BUILD_LZ4_LIBRARY_SOURCE)
       set (LZ4_URL ${LZ4_GIT_URL} CACHE STRING "Path to lz4 git repository")
       set (LZ4_BRANCH ${LZ4_GIT_BRANCH})
     elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-      if (NOT TGZPATH)
-        set (TGZPATH ${H5LZ4_SOURCE_DIR})
+      if (NOT H5PL_COMP_TGZPATH)
+        set (H5PL_COMP_TGZPATH ${H5LZ4_SOURCE_DIR})
       endif ()
-      set (LZ4_URL ${TGZPATH}/${LZ4_TGZ_NAME})
+      set (LZ4_URL ${H5PL_COMP_TGZPATH}/${LZ4_TGZ_NAME})
     else ()
       set (LZ4_USE_EXTERNAL 0)
     endif ()
@@ -148,10 +148,10 @@ if (NOT BUILD_BSHUF_LIBRARY_SOURCE)
       set (BSHUF_URL ${BSHUF_GIT_URL} CACHE STRING "Path to bshuf git repository")
       set (BSHUF_BRANCH ${BSHUF_GIT_BRANCH})
     elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-      if (NOT TGZPATH)
-        set (TGZPATH ${H5BSHUF_SOURCE_DIR})
+      if (NOT H5PL_COMP_TGZPATH)
+        set (H5PL_COMP_TGZPATH ${H5BSHUF_SOURCE_DIR})
       endif ()
-      set (BSHUF_URL ${TGZPATH}/${BSHUF_TGZ_NAME})
+      set (BSHUF_URL ${H5PL_COMP_TGZPATH}/${BSHUF_TGZ_NAME})
     else ()
       set (BSHUF_USE_EXTERNAL 0)
     endif ()

diff --git a/BZIP2/CMakeLists.txt b/BZIP2/CMakeLists.txt
@@ -92,10 +92,10 @@ if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MAT
     set (BZ2_URL ${BZ2_GIT_URL} CACHE STRING "Path to bz2 git repository")
     set (BZ2_BRANCH ${BZ2_GIT_BRANCH})
   elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    if (NOT TGZPATH)
-      set (TGZPATH ${H5BZ2_SOURCE_DIR})
+    if (NOT H5PL_COMP_TGZPATH)
+      set (H5PL_COMP_TGZPATH ${H5BZ2_SOURCE_DIR})
     endif ()
-    set (BZ2_URL ${TGZPATH}/${BZ2_TGZ_NAME})
+    set (BZ2_URL ${H5PL_COMP_TGZPATH}/${BZ2_TGZ_NAME})
   else ()
     set (BZ2_USE_EXTERNAL 0)
   endif ()

diff --git a/Building.txt b/Building.txt
@@ -18,7 +18,7 @@ For CMake, you must supply the location of the CMake-built HDF5 configuration fi
 Example:
     set(ENV{HDF5_ROOT} "/temp/hdf5/")
     set(BUILD_OPTIONS "-DUSE_SHARED_LIBS:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON")
-    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DTGZPATH:PATH=${PLUGIN_SOURCE}/libs -DH5PL_ALLOW_EXTERNAL_SUPPORT:STRING=\"TGZ\"")
+    set(BUILD_OPTIONS "${BUILD_OPTIONS} -DH5PL_TGZPATH:PATH=${PLUGIN_SOURCE}/libs -DH5PL_ALLOW_EXTERNAL_SUPPORT:STRING=\"TGZ\"")
     cmake -C ${PLUGIN_SOURCE}/config/cmake/cacheinit.cmake -DCMAKE_BUILD_TYPE:STRING=Release ${BUILD_OPTIONS} "-G${CMAKE_GENERATOR}" ${PLUGIN_SOURCE}
 
     For non-cmake built hdf5, use the location of the include/lib folders:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,16 +44,16 @@ if (NOT H5PL_VERS_MAJOR)
   set (H5PL_VERS_MAJOR "1")
 endif ()
 if (NOT H5PL_VERS_MINOR)
-  set (H5PL_VERS_MINOR "10")
+  set (H5PL_VERS_MINOR "14")
 endif ()
 if (NOT H5PL_VERS_RELEASE)
-  set (H5PL_VERS_RELEASE "11")
+  set (H5PL_VERS_RELEASE "3")
 endif ()
 set (H5PL_OVERRIDE_VERSION "${H5PL_VERS_MAJOR}.${H5PL_VERS_MINOR}.${H5PL_VERS_RELEASE}")
 
 set (H5PL_SOVERS_MAJOR 1)
 set (H5PL_SOVERS_MINOR 0)
-set (H5PL_SOVERS_INTERFACE 1)
+set (H5PL_SOVERS_INTERFACE 2)
 set (H5PL_SOVERS_RELEASE 0)
 math (EXPR H5PL_SOVERS_MAJOR ${H5PL_SOVERS_INTERFACE}-${H5PL_SOVERS_RELEASE})
 

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -13,7 +13,7 @@
         "H5PL_VERS_MINOR": {"type": "STRING", "value": "10"},
         "H5PL_VERS_RELEASE": {"type": "STRING", "value": "11"},
         "H5PL_ALLOW_EXTERNAL_SUPPORT": {"type": "STRING", "value": "TGZ"},
-        "TGZPATH": {"type": "STRING", "value": "${sourceDir}/libs"},
+        "H5PL_COMP_TGZPATH": {"type": "STRING", "value": "${sourceDir}/libs"},
         "H5PL_BUILD_TESTING": "ON",
         "BUILD_EXAMPLES": "ON"
       }

diff --git a/JPEG/CMakeLists.txt b/JPEG/CMakeLists.txt
@@ -87,10 +87,10 @@ if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MAT
     set (JPEG_URL ${JPEG_GIT_URL} CACHE STRING "Path to jpeg git repository")
     set (JPEG_BRANCH ${JPEG_GIT_BRANCH})
   elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    if (NOT TGZPATH)
-      set (TGZPATH ${H5JPEG_SOURCE_DIR})
+    if (NOT H5PL_COMP_TGZPATH)
+      set (H5PL_COMP_TGZPATH ${H5JPEG_SOURCE_DIR})
     endif ()
-    set (JPEG_URL ${TGZPATH}/${JPEG_TGZ_NAME})
+    set (JPEG_URL ${H5PL_COMP_TGZPATH}/${JPEG_TGZ_NAME})
   else ()
     set (JPEG_USE_EXTERNAL 0)
   endif ()

diff --git a/LZ4/CMakeLists.txt b/LZ4/CMakeLists.txt
@@ -96,10 +96,10 @@ if (NOT BUILD_LZ4_LIBRARY_SOURCE)
       set (LZ4_URL ${LZ4_GIT_URL} CACHE STRING "Path to lz4 git repository")
       set (LZ4_BRANCH ${LZ4_GIT_BRANCH})
     elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-      if (NOT TGZPATH)
-        set (TGZPATH ${H5LZ4_SOURCE_DIR})
+      if (NOT H5PL_COMP_TGZPATH)
+        set (H5PL_COMP_TGZPATH ${H5LZ4_SOURCE_DIR})
       endif ()
-      set (LZ4_URL ${TGZPATH}/${LZ4_TGZ_NAME})
+      set (LZ4_URL ${H5PL_COMP_TGZPATH}/${LZ4_TGZ_NAME})
     else ()
       set (LZ4_USE_EXTERNAL 0)
     endif ()

diff --git a/LZF/CMakeLists.txt b/LZF/CMakeLists.txt
@@ -92,10 +92,10 @@ if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MAT
     set (LZF_URL ${LZF_GIT_URL} CACHE STRING "Path to lzf git repository")
     set (LZF_BRANCH ${LZF_GIT_BRANCH})
   elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    if (NOT TGZPATH)
-      set (TGZPATH ${H5LZF_SOURCE_DIR})
+    if (NOT H5PL_COMP_TGZPATH)
+      set (H5PL_COMP_TGZPATH ${H5LZF_SOURCE_DIR})
     endif ()
-    set (LZF_URL ${TGZPATH}/${LZF_TGZ_NAME})
+    set (LZF_URL ${H5PL_COMP_TGZPATH}/${LZF_TGZ_NAME})
   else ()
     set (LZF_USE_EXTERNAL 0)
   endif ()

diff --git a/MAFISC/CMakeLists.txt b/MAFISC/CMakeLists.txt
@@ -194,10 +194,10 @@ if (NOT BUILD_MAFISC_LIBRARY_SOURCE)
       set (MAFISC_URL ${MAFISC_GIT_URL} CACHE STRING "Path to mafisc git repository")
       set (MAFISC_BRANCH ${MAFISC_GIT_BRANCH})
     elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-      if (NOT TGZPATH)
-        set (TGZPATH ${H5MAFISC_SOURCE_DIR})
+      if (NOT H5PL_COMP_TGZPATH)
+        set (H5PL_COMP_TGZPATH ${H5MAFISC_SOURCE_DIR})
       endif ()
-      set (MAFISC_URL ${TGZPATH}/${MAFISC_TGZ_NAME})
+      set (MAFISC_URL ${H5PL_COMP_TGZPATH}/${MAFISC_TGZ_NAME})
     else ()
       set (MAFISC_USE_EXTERNAL 0)
     endif ()

diff --git a/SZ/CMakeLists.txt b/SZ/CMakeLists.txt
@@ -92,10 +92,10 @@ if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MAT
     set (SZ_URL ${SZ_GIT_URL} CACHE STRING "Path to SZ git repository")
     set (SZ_BRANCH ${SZ_GIT_BRANCH})
   elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    if (NOT TGZPATH)
-      set (TGZPATH ${H5SZ_SOURCE_DIR})
+    if (NOT H5PL_COMP_TGZPATH)
+      set (H5PL_COMP_TGZPATH ${H5SZ_SOURCE_DIR})
     endif ()
-    set (SZ_URL ${TGZPATH}/${SZ_TGZ_NAME})
+    set (SZ_URL ${H5PL_COMP_TGZPATH}/${SZ_TGZ_NAME})
   else ()
     set (SZ_USE_EXTERNAL 0)
   endif ()

diff --git a/ZFP/CMakeLists.txt b/ZFP/CMakeLists.txt
@@ -188,10 +188,10 @@ if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MAT
     set (ZFP_URL ${ZFP_GIT_URL} CACHE STRING "Path to zfp git repository")
     set (ZFP_BRANCH ${ZFP_GIT_BRANCH})
   elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    if (NOT TGZPATH)
-      set (TGZPATH ${H5ZFP_SOURCE_DIR})
+    if (NOT H5PL_COMP_TGZPATH)
+      set (H5PL_COMP_TGZPATH ${H5ZFP_SOURCE_DIR})
     endif ()
-    set (ZFP_URL ${TGZPATH}/${ZFP_TGZ_NAME})
+    set (ZFP_URL ${H5PL_COMP_TGZPATH}/${ZFP_TGZ_NAME})
   else ()
     set (ZFP_USE_EXTERNAL 0)
   endif ()

diff --git a/ZSTD/CMakeLists.txt b/ZSTD/CMakeLists.txt
@@ -87,10 +87,10 @@ if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MAT
     set (ZSTD_URL ${ZSTD_GIT_URL} CACHE STRING "Path to zstd git repository")
     set (ZSTD_BRANCH ${ZSTD_GIT_BRANCH})
   elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-    if (NOT TGZPATH)
-      set (TGZPATH ${H5ZSTD_SOURCE_DIR})
+    if (NOT H5PL_COMP_TGZPATH)
+      set (H5PL_COMP_TGZPATH ${H5ZSTD_SOURCE_DIR})
     endif ()
-    set (ZSTD_URL ${TGZPATH}/${ZSTD_TGZ_NAME})
+    set (ZSTD_URL ${H5PL_COMP_TGZPATH}/${ZSTD_TGZ_NAME})
   else ()
     set (ZSTD_USE_EXTERNAL 0)
   endif ()

diff --git a/config/cmake/H5PLMacros.cmake b/config/cmake/H5PLMacros.cmake
@@ -96,10 +96,10 @@ macro (FILTER_OPTION plname)
         set (HDF_${plname}_URL ${HDF_${plname}_GIT_URL})
         set (HDF_${plname}_BRANCH ${HDF_${plname}_GIT_BRANCH})
       elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-        if (NOT TGZPATH)
-          set (TGZPATH ${H5PL_SOURCE_DIR})
+        if (NOT H5PL_COMP_TGZPATH)
+          set (H5PL_COMP_TGZPATH ${H5PL_SOURCE_DIR}/libs)
        endif ()
-        set (HDF_${plname}_URL ${TGZPATH}/${HDF_${plname}_TGZ_NAME})
+        set (HDF_${plname}_URL ${H5PL_COMP_TGZPATH}/${HDF_${plname}_TGZ_NAME})
       endif ()
     endif ()
     add_subdirectory (${plname})

diff --git a/docs/INSTALL_With_CMake.txt b/docs/INSTALL_With_CMake.txt
@@ -552,7 +552,7 @@ These five steps are described in detail below.
                SZIP_TGZ_NAME:STRING="szip_src.ext"
                LIBAEC_TGZ_NAME:STRING="libaec_src.ext"
                PLUGIN_TGZ_NAME:STRING="plugin_src.ext"
-               TGZPATH:STRING="some_location"
+               H5PL_TGZPATH:STRING="some_location"
             where "some_location/xxxx_src.ext" is the URL or full path to
             the compressed file and where ext is the type of the compression
             file such as .bz2, .tar, .tar.gz, .tgz, or .zip. Also define