Merge pull request #36 from byrnHDF/master-compress-dirname

Change compressed directory name

.github/workflows/cmake-ctest.yml

@@ -128,7 +128,7 @@ jobs:
           HDF5_ROOT: ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}
           HDF5_PLUGIN_PATH: ${{ steps.set-hdf5lib-name.outputs.HDF5_PLUGIN_PATH }}
         run: |
-          cd "${{ runner.workspace }}/hdf5-examples/hdfsrc"
+          cd "${{ runner.workspace }}/hdf5-examples/hdf5-examples-master"
           cmake --workflow --preset=ci-StdShar-MSVC --fresh
         shell: bash
 
@@ -216,7 +216,7 @@ jobs:
           HDF5_ROOT: ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}
           HDF5_PLUGIN_PATH: ${{ steps.set-hdf5lib-name.outputs.HDF5_PLUGIN_PATH }}
         run: |
-          cd "${{ runner.workspace }}/hdf5-examples/hdfsrc"
+          cd "${{ runner.workspace }}/hdf5-examples/hdf5-examples-master"
           cmake --workflow --preset=ci-StdShar-GNUC --fresh
         shell: bash
 
@@ -309,7 +309,7 @@ jobs:
           HDF5_ROOT: ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}
           HDF5_PLUGIN_PATH: ${{ steps.set-hdf5lib-name.outputs.HDF5_PLUGIN_PATH }}
         run: |
-          cd "${{ runner.workspace }}/hdf5-examples/hdfsrc"
+          cd "${{ runner.workspace }}/hdf5-examples/hdf5-examples-master"
           cmake --workflow --preset=ci-StdShar-Clang --fresh
         shell: bash
 

.github/workflows/release.yml

@@ -52,12 +52,12 @@ jobs:
       - name: Get Sources
         uses: actions/checkout@v3
         with:
-          path: hdfsrc
+          path: hdf5-examples-master
 
       - name: Zip Folder
         run: |
-              zip -r ${{ steps.set-file-base.outputs.FILE_BASE }}.zip ./hdfsrc
-              tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz ./hdfsrc
+              zip -r ${{ steps.set-file-base.outputs.FILE_BASE }}.zip ./hdf5-examples-master
+              tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz ./hdf5-examples-master
 
       - name: List files in the repository
         run: |

.github/workflows/tarball.yml

@@ -85,12 +85,12 @@ jobs:
       - name: Get Sources
         uses: actions/checkout@v3
         with:
-          path: hdfsrc
+          path: hdf5-examples-master
 
       - name: Retrieve version
         id: version
         run: |
-          cd "$GITHUB_WORKSPACE/hdfsrc"
+          cd "$GITHUB_WORKSPACE/hdf5-examples-master"
           echo "TAG_VERSION=2.0.4" >> $GITHUB_OUTPUT
 
       - name: Set file base name
@@ -113,8 +113,8 @@ jobs:
       - name: Create source file (tgz and zip)
         id: create-files
         run: |
-              zip -r ${{ steps.set-file-base.outputs.FILE_BASE }}.zip ./hdfsrc
-              tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz ./hdfsrc
+              zip -r ${{ steps.set-file-base.outputs.FILE_BASE }}.zip ./hdf5-examples-master
+              tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz ./hdf5-examples-master
         shell: bash
 
       - name: List files in the repository

C/H5D/16/h5ex_d_fillval.c

@@ -37,7 +37,7 @@ main(void)
     int wdata[DIM0][DIM1],    /* Write buffer */
         rdata[DIM0][DIM1],    /* Read buffer */
         rdata2[EDIM0][EDIM1], /* Read buffer for
-                                 extenstion */
+                                 extension */
         fillval, i, j;
 
     /*

C/H5D/16/h5ex_d_unlimmod.c

@@ -6,7 +6,7 @@
   file.  Next, it reopens the file, reads back the data,
   outputs it to the screen, extends the dataset, and writes
   new data to the entire extended dataset.  Finally it
-  reopens the file again, reads back the data, and utputs it
+  reopens the file again, reads back the data, and outputs it
   to the screen.
 
   This file is intended for use with HDF5 Library version 1.6

C/H5D/CMakeLists.txt

@@ -21,10 +21,10 @@ foreach (example ${examples})
   if (H5_HAVE_PARALLEL)
     target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
   endif ()
-  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${LINK_LIBS})
+  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
 endforeach ()
 
-if (BUILD_TESTING)
+if (H5EX_BUILD_TESTING)
   macro (ADD_H5_TEST testname)
     add_test (
         NAME ${EXAMPLE_VARNAME}_${testname}-clearall

C/H5D/h5ex_d_unlimmod.c

@@ -6,7 +6,7 @@
   file.  Next, it reopens the file, reads back the data,
   outputs it to the screen, extends the dataset, and writes
   new data to the entire extended dataset.  Finally it
-  reopens the file again, reads back the data, and utputs it
+  reopens the file again, reads back the data, and outputs it
   to the screen.
 
  ************************************************************/

C/H5Filters/CMakeLists.txt

@@ -144,7 +144,7 @@ endif ()
 #run-time loadable library examples
 foreach (example ${dyn_examples})
   add_executable (${EXAMPLE_VARNAME}_${example} ${PROJECT_SOURCE_DIR}/${example}.c)
-  TARGET_C_PROPERTIES (${EXAMPLE_VARNAME}_${example} ${LIB_TYPE} " " " ")
+  TARGET_C_PROPERTIES (${EXAMPLE_VARNAME}_${example} ${LIB_TYPE})
   target_compile_options(${EXAMPLE_VARNAME}_${example}
       PRIVATE
           "$<$<BOOL:${${EXAMPLE_VARNAME}_USE_16_API}>:-DH5_USE_16_API>"
@@ -157,13 +157,13 @@ foreach (example ${dyn_examples})
   if (H5_HAVE_PARALLEL)
     target_include_directories (${EXAMPLE_VARNAME}_${example} PUBLIC ${MPI_C_INCLUDE_DIRS})
   endif ()
-  target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE ${LINK_LIBS})
+  target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE ${H5EX_HDF5_LINK_LIBS})
   if (NOT WIN32)
     target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE dl)
   endif ()
 endforeach ()
 
-if (BUILD_TESTING)
+if (H5EX_BUILD_TESTING)
   macro (ADD_H5_TEST testname)
     add_test (
         NAME ${EXAMPLE_VARNAME}_${testname}-clearall

C/H5Filters/testfiles/114/h5ex_d_lzf.ddl

@@ -11,7 +11,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 32000
             COMMENT HDF5 lzf filter; see http://www.hdfgroup.org/services/contributions.html
-            PARAMS { 4 262 128 }
+            PARAMS { 4 261 128 }
          }
       }
       FILLVALUE {

C/H5Filters/testfiles/116/h5ex_d_lzf.ddl

@@ -11,7 +11,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 32000
             COMMENT HDF5 lzf filter; see http://www.hdfgroup.org/services/contributions.html
-            PARAMS { 4 262 128 }
+            PARAMS { 4 261 128 }
          }
       }
       FILLVALUE {

C/H5G/CMakeLists.txt

@@ -21,10 +21,10 @@ foreach (example ${examples})
   if (H5_HAVE_PARALLEL)
     target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
   endif ()
-  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${LINK_LIBS})
+  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
 endforeach ()
 
-if (BUILD_TESTING)
+if (H5EX_BUILD_TESTING)
   macro (ADD_DUMP_TEST testname)
     add_test (
         NAME ${EXAMPLE_VARNAME}_${testname}-clearall

C/H5Parallel/CMakeLists.txt

@@ -19,10 +19,10 @@ foreach (example ${examples})
           "$<$<BOOL:${${EXAMPLE_VARNAME}_USE_116_API}>:-DH5_USE_116_API>"
   )
   target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
-  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${LINK_LIBS})
+  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
 endforeach ()
 
-if (BUILD_TESTING)
+if (H5EX_BUILD_TESTING)
   macro (ADD_GREP_TEST testname mumprocs)
     add_test (
         NAME ${EXAMPLE_VARNAME}_${testname}-clearall

C/H5T/CMakeLists.txt

@@ -21,10 +21,10 @@ foreach (example ${examples})
   if (H5_HAVE_PARALLEL)
     target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
   endif ()
-  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${LINK_LIBS})
+  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
 endforeach ()
 
-if (BUILD_TESTING)
+if (H5EX_BUILD_TESTING)
   macro (ADD_H5_TEST testname)
     add_test (
         NAME ${EXAMPLE_VARNAME}_${testname}-clearall

C/Performance/CMakeLists.txt

@@ -21,10 +21,10 @@ foreach (example ${examples})
   if (H5_HAVE_PARALLEL)
     target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
   endif ()
-  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${LINK_LIBS})
+  target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
 endforeach ()
 
-if (BUILD_TESTING)
+if (H5EX_BUILD_TESTING)
   macro (ADD_H5_TEST testname)
     add_test (
         NAME ${EXAMPLE_VARNAME}_${testname}-clearall

C/Performance/h5slabwrite.c

@@ -17,7 +17,7 @@
 #include "h5slab.h"
 
 /* Write the chunks in the row order.  This provides good and bad read
- * performance if the read pattern is by row and by column respectivly.
+ * performance if the read pattern is by row and by column respectively.
  *
  * Created by Albert Cheng and Christian Chilan 2010/7/13.
  */

CMakeLists.txt

@@ -4,6 +4,7 @@ project (H5EXAMPLES C CXX)
 #-----------------------------------------------------------------------------
 # Basic HDF5Examples stuff here
 #-----------------------------------------------------------------------------
+include (${H5EXAMPLES_SOURCE_DIR}/config/cmake/HDFMacros.cmake)
 include (${H5EXAMPLES_SOURCE_DIR}/config/cmake/HDFExampleMacros.cmake)
 set (CMAKE_JAVA_INCLUDE_PATH "")
 
@@ -22,14 +23,14 @@ set (HDF5EX_JAVA_DIR           ${H5EXAMPLES_SOURCE_DIR}/JAVA)
 # HDF5 support
 #-----------------------------------------------------------------------------
 HDF5_SUPPORT (TRUE)
-message (STATUS "HDF5 link libs: ${LINK_LIBS}")
+message (STATUS "HDF5 link libs: ${H5EX_HDF5_LINK_LIBS}")
 APIVersion(${HDF5_VERSION} H5_LIBVER_DIR)
 message (STATUS "HDF5 H5_LIBVER_DIR: ${H5_LIBVER_DIR}")
 
 #-----------------------------------------------------------------------------
 # parse the full version number from H5public.h and include in H5_VERS_INFO
 #-----------------------------------------------------------------------------
-find_file (_h5public_h H5public.h ${HDF5_INCLUDE_DIR})
+find_file (_h5public_h H5public.h ${H5EX_HDF5_INCLUDE_DIRS})
 file (READ ${_h5public_h} _h5public_h_contents)
 
 string (REGEX REPLACE ".*#define[ \t]+H5_VERS_MAJOR[ \t]+([0-9]*).*$"
@@ -70,7 +71,7 @@ endif ()
 
 # Parallel IO usage requires MPI to be Linked and Included
 if (H5_HAVE_PARALLEL)
-  set (LINK_LIBS ${LINK_LIBS} ${MPI_C_LIBRARIES})
+  set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${MPI_C_LIBRARIES})
   if (MPI_C_LINK_FLAGS)
     set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
   endif ()
@@ -97,14 +98,16 @@ if (HDF_ENABLE_THREADSAFE)
   if (NOT Threads_FOUND)
     message (STATUS " **** thread-safe package not found - threads still might work **** ")
   endif ()
-  set (LINK_LIBS ${LINK_LIBS} Threads::Threads)
+  set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} Threads::Threads)
 endif ()
 
+INCLUDE_DIRECTORIES (${H5EX_HDF5_INCLUDE_DIRS})
+
 #-----------------------------------------------------------------------------
 # Dashboard and Testing Settings
 #-----------------------------------------------------------------------------
-option (BUILD_TESTING "Build HDF5 Example Testing" OFF)
-if (BUILD_TESTING)
+option (H5EX_BUILD_TESTING "Build HDF5 Example Testing" OFF)
+if (H5EX_BUILD_TESTING)
   set (DART_TESTING_TIMEOUT 1200 CACHE STRING
       "Timeout in seconds for each test (default 1200=20minutes)"
   )
@@ -131,7 +134,7 @@ if (${H5_LIBVER_DIR} GREATER 16)
   if (EXISTS "${H5EXAMPLES_SOURCE_DIR}/FORTRAN" AND IS_DIRECTORY "${H5EXAMPLES_SOURCE_DIR}/FORTRAN")
     option (HDF_BUILD_FORTRAN "Build FORTRAN support" OFF)
     if (HDF_BUILD_FORTRAN AND HDF5_BUILD_FORTRAN)
-      set (LINK_Fortran_LIBS ${LINK_LIBS})
+      set (LINK_Fortran_LIBS ${H5EX_HDF5_LINK_LIBS})
 
       # Parallel IO usage requires MPI to be Linked and Included
       if (H5_HAVE_PARALLEL)

CMakePresets.json

@@ -11,7 +11,7 @@
         "CPACK_PACKAGE_VERSION": "2.0.4",
         "HDF5_NAMESPACE": {"type": "STRING", "value": "hdf5::"},
         "HDF5_PACKAGE_NAME": {"type": "STRING", "value": "hdf5"},
-        "BUILD_TESTING": "ON"
+        "H5EX_BUILD_TESTING": "ON"
       }
     },
     {