diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2016-09-23 14:37:48 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2016-09-23 14:37:48 (GMT) |
| commit | 866d17f57f47414b6e778d63fcdcc2a82b208683 (patch) | |
| tree | 0d3105342da42666df776663d6da0a1ec331427b | |
| parent | 391a231b76c1200ecda5d74636213e9e479fa51a (diff) | |
| parent | 08d84691ed13f4b645a593183524c4e36a2843d9 (diff) | |
| download | hdf5-866d17f57f47414b6e778d63fcdcc2a82b208683.zip hdf5-866d17f57f47414b6e778d63fcdcc2a82b208683.tar.gz hdf5-866d17f57f47414b6e778d63fcdcc2a82b208683.tar.bz2 | |
Merge branch 'develop' into talos-0177
| -rw-r--r-- | .gitattributes | 872 | ||||
| -rw-r--r-- | .gitignore | 105 | ||||
| -rw-r--r-- | CTestConfig.cmake | 2 | ||||
| -rw-r--r-- | MANIFEST | 8 | ||||
| -rwxr-xr-x | bin/bbrelease | 2 | ||||
| -rwxr-xr-x | bin/h5vers | 6 | ||||
| -rwxr-xr-x | bin/pkgscrpts/h5rmflags | 167 | ||||
| -rwxr-xr-x | bin/pkgscrpts/makeHDF5BinaryTarfiles.pl | 368 | ||||
| -rwxr-xr-x | bin/pkgscrpts/makeInternalREADME.pl | 215 | ||||
| -rwxr-xr-x | bin/pkgscrpts/makeOuterREADME.pl | 182 | ||||
| -rw-r--r-- | c++/test/h5cpputil.h | 15 | ||||
| -rw-r--r-- | c++/test/tattr.cpp | 12 | ||||
| -rw-r--r-- | config/cmake/FindJNI.cmake | 31 | ||||
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 15 | ||||
| -rw-r--r-- | config/cmake/HDF5_Examples.cmake.in | 15 | ||||
| -rw-r--r-- | config/cmake/UseJava.cmake | 169 | ||||
| -rw-r--r-- | config/cmake_ext_mod/FindMPI.cmake | 59 | ||||
| -rw-r--r-- | fortran/src/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 12 |
19 files changed, 2228 insertions, 58 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d18f9b9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,872 @@ +* text=auto !eol +bin/bbrelease -text +bin/genparser -text +bin/switch_maint_mode -text +c++/src/H5OcreatProp.cpp -text +c++/src/H5OcreatProp.h -text +c++/src/footer.html -text +c++/src/header_files/hdf_logo.jpg -text +c++/src/header_files/help.jpg -text +c++/src/header_files/image001.jpg -text +c++/src/header_files/image002.jpg -text +c++/test/tarray.cpp -text +c++/test/th5s.h5 -text +config/cce-fflags -text +config/cce-flags -text +config/cmake/CMakeFindJavaCommon.cmake -text +config/cmake/CPack.Info.plist.in -text svneol=unset#application/xml +config/cmake/FindHDFJAVA.cmake.in -text +config/cmake/FindJNI.cmake -text +config/cmake/HDF5UseFortran.cmake -text +config/cmake/HDF5_Examples.cmake.in -text +config/cmake/HDF5_Process_Flex_Files.cmake -text +config/cmake/HDFCompilerFlags.cmake -text +config/cmake/UseJava.cmake -text +config/cmake/UseJavaClassFilelist.cmake -text +config/cmake/UseJavaSymlinks.cmake -text +config/cmake/jrunTest.cmake -text +config/cmake/patch.xml -text +config/cmake/scripts/CTestScript.cmake -text +config/cmake/scripts/HDF5config.cmake -text +config/cmake_ext_mod/hdf.bmp -text +config/cmake_ext_mod/hdf.icns -text +config/cmake_ext_mod/hdf.ico -text +config/conclude_fc.am -text +config/gnu-cxxflags -text +examples/h5_vds-eiger.c -text +examples/h5_vds-exc.c -text +examples/h5_vds-exclim.c -text +examples/h5_vds-percival-unlim-maxmin.c -text +examples/h5_vds-percival-unlim.c -text +examples/h5_vds-percival.c -text +examples/h5_vds-simpleIO.c -text +examples/h5_vds.c -text +fortran/src/H5_buildiface.F90 -text +fortran/src/H5config_f.inc.cmake -text +fortran/src/H5config_f.inc.in -text +fortran/src/H5fort_type_defines.h.in -text +fortran/src/H5fortkit.F90 -text +fortran/test/H5_test_buildiface.F90 -text +hl/fortran/src/H5HL_buildiface.F90 -text +hl/fortran/src/hdf5_hl_fortrandll.def.in -text +hl/src/H5LD.c -text +hl/src/H5LDprivate.h -text +hl/src/H5LDpublic.h -text +hl/src/H5LTanalyze.c -text +hl/src/H5LTparse.c -text +hl/src/H5LTparse.h -text +hl/test/gen_test_ds.c svneol=native#text/plain +hl/test/gen_test_ld.c -text +hl/test/test_ds_be.h5 -text +hl/test/test_ds_le.h5 -text +hl/test/test_dset_append.c -text +hl/test/test_ld.c -text +hl/test/test_ld.h5 -text +hl/test/test_packet_vlen.c -text +hl/test/test_table_be.h5 -text +hl/test/test_table_cray.h5 -text +hl/test/test_table_le.h5 -text +hl/tools/gif2h5/CMakeLists.txt -text +hl/tools/gif2h5/CMakeTests.cmake -text +hl/tools/gif2h5/testfiles/README -text +hl/tools/gif2h5/testfiles/ex_image2.h5 -text +hl/tools/gif2h5/testfiles/h52giftst.h5 -text +hl/tools/gif2h5/testfiles/image1.gif -text +java/CMakeLists.txt -text +java/COPYING -text +java/Makefile.am -text +java/examples/CMakeLists.txt -text +java/examples/Makefile.am -text +java/examples/datasets/CMakeLists.txt -text +java/examples/datasets/H5Ex_D_Alloc.java -text +java/examples/datasets/H5Ex_D_Checksum.java -text +java/examples/datasets/H5Ex_D_Chunk.java -text +java/examples/datasets/H5Ex_D_Compact.java -text +java/examples/datasets/H5Ex_D_External.java -text +java/examples/datasets/H5Ex_D_FillValue.java -text +java/examples/datasets/H5Ex_D_Gzip.java -text +java/examples/datasets/H5Ex_D_Hyperslab.java -text +java/examples/datasets/H5Ex_D_Nbit.java -text +java/examples/datasets/H5Ex_D_ReadWrite.java -text +java/examples/datasets/H5Ex_D_Shuffle.java -text +java/examples/datasets/H5Ex_D_Sofloat.java -text +java/examples/datasets/H5Ex_D_Soint.java -text +java/examples/datasets/H5Ex_D_Szip.java -text +java/examples/datasets/H5Ex_D_Transform.java -text +java/examples/datasets/H5Ex_D_UnlimitedAdd.java -text +java/examples/datasets/H5Ex_D_UnlimitedGzip.java -text +java/examples/datasets/H5Ex_D_UnlimitedMod.java -text +java/examples/datasets/Makefile.am -text +java/examples/datasets/runExample.sh.in -text +java/examples/datatypes/CMakeLists.txt -text +java/examples/datatypes/H5Ex_T_Array.java -text +java/examples/datatypes/H5Ex_T_ArrayAttribute.java -text +java/examples/datatypes/H5Ex_T_Bit.java -text +java/examples/datatypes/H5Ex_T_BitAttribute.java -text +java/examples/datatypes/H5Ex_T_Commit.java -text +java/examples/datatypes/H5Ex_T_Compound.java -text +java/examples/datatypes/H5Ex_T_CompoundAttribute.java -text +java/examples/datatypes/H5Ex_T_Float.java -text +java/examples/datatypes/H5Ex_T_FloatAttribute.java -text +java/examples/datatypes/H5Ex_T_Integer.java -text +java/examples/datatypes/H5Ex_T_IntegerAttribute.java -text +java/examples/datatypes/H5Ex_T_ObjectReference.java -text +java/examples/datatypes/H5Ex_T_ObjectReferenceAttribute.java -text +java/examples/datatypes/H5Ex_T_Opaque.java -text +java/examples/datatypes/H5Ex_T_OpaqueAttribute.java -text +java/examples/datatypes/H5Ex_T_String.java -text +java/examples/datatypes/H5Ex_T_StringAttribute.java -text +java/examples/datatypes/H5Ex_T_VLString.java -text +java/examples/datatypes/Makefile.am -text +java/examples/datatypes/runExample.sh.in -text +java/examples/groups/CMakeLists.txt -text +java/examples/groups/H5Ex_G_Compact.java -text +java/examples/groups/H5Ex_G_Corder.java -text +java/examples/groups/H5Ex_G_Create.java -text +java/examples/groups/H5Ex_G_Intermediate.java -text +java/examples/groups/H5Ex_G_Iterate.java -text +java/examples/groups/H5Ex_G_Phase.java -text +java/examples/groups/H5Ex_G_Traverse.java -text +java/examples/groups/H5Ex_G_Visit.java -text +java/examples/groups/Makefile.am -text +java/examples/groups/h5ex_g_iterate.h5 -text svneol=unset#application/x-hdf +java/examples/groups/h5ex_g_visit.h5 -text svneol=unset#application/x-hdf +java/examples/groups/runExample.sh.in -text +java/examples/intro/CMakeLists.txt -text +java/examples/intro/H5_CreateAttribute.java -text +java/examples/intro/H5_CreateDataset.java -text +java/examples/intro/H5_CreateFile.java -text +java/examples/intro/H5_CreateGroup.java -text +java/examples/intro/H5_CreateGroupAbsoluteRelative.java -text +java/examples/intro/H5_CreateGroupDataset.java -text +java/examples/intro/H5_ReadWrite.java -text +java/examples/intro/Makefile.am -text +java/examples/intro/runExample.sh.in -text +java/examples/testfiles/examples.datasets.H5Ex_D_Alloc.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Checksum.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Chunk.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Compact.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_External.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_FillValue.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Gzip.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Hyperslab.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Nbit.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_ReadWrite.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Shuffle.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Sofloat.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Soint.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Szip.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_Transform.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_UnlimitedAdd.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_UnlimitedGzip.txt -text +java/examples/testfiles/examples.datasets.H5Ex_D_UnlimitedMod.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_Array.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_ArrayAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_Bit.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_BitAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_Commit.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_Compound.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_CompoundAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_Float.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_FloatAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_Integer.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_IntegerAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReference.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReferenceAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_Opaque.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_OpaqueAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_String.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_StringAttribute.txt -text +java/examples/testfiles/examples.datatypes.H5Ex_T_VLString.txt -text +java/examples/testfiles/examples.groups.H5Ex_G_Compact.txt -text +java/examples/testfiles/examples.groups.H5Ex_G_Corder.txt -text +java/examples/testfiles/examples.groups.H5Ex_G_Create.txt -text +java/examples/testfiles/examples.groups.H5Ex_G_Intermediate.txt -text +java/examples/testfiles/examples.groups.H5Ex_G_Iterate.txt -text +java/examples/testfiles/examples.groups.H5Ex_G_Phase.txt -text +java/examples/testfiles/examples.groups.H5Ex_G_Visit.txt -text +java/examples/testfiles/examples.intro.H5_CreateAttribute.txt -text +java/examples/testfiles/examples.intro.H5_CreateDataset.txt -text +java/examples/testfiles/examples.intro.H5_CreateFile.txt -text +java/examples/testfiles/examples.intro.H5_CreateGroup.txt -text +java/examples/testfiles/examples.intro.H5_CreateGroupAbsoluteRelative.txt -text +java/examples/testfiles/examples.intro.H5_CreateGroupDataset.txt -text +java/examples/testfiles/examples.intro.H5_ReadWrite.txt -text +java/lib/ext/slf4j-nop-1.7.5.jar -text svneol=unset#application/zip +java/lib/ext/slf4j-simple-1.7.5.jar -text svneol=unset#application/zip +java/lib/hamcrest-core.jar -text svneol=unset#application/java-archive +java/lib/junit.jar -text svneol=unset#application/java-archive +java/lib/simplelogger.properties -text +java/lib/slf4j-api-1.7.5.jar -text svneol=unset#application/zip +java/src/CMakeLists.txt -text +java/src/Makefile.am -text +java/src/hdf/CMakeLists.txt -text +java/src/hdf/hdf5lib/CMakeLists.txt -text +java/src/hdf/hdf5lib/H5.java -text +java/src/hdf/hdf5lib/HDF5Constants.java -text +java/src/hdf/hdf5lib/HDF5GroupInfo.java -text +java/src/hdf/hdf5lib/HDFArray.java -text +java/src/hdf/hdf5lib/HDFNativeData.java -text +java/src/hdf/hdf5lib/callbacks/Callbacks.java -text +java/src/hdf/hdf5lib/callbacks/H5A_iterate_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5A_iterate_t.java -text +java/src/hdf/hdf5lib/callbacks/H5D_append_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5D_append_t.java -text +java/src/hdf/hdf5lib/callbacks/H5D_iterate_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5D_iterate_t.java -text +java/src/hdf/hdf5lib/callbacks/H5E_walk_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5E_walk_t.java -text +java/src/hdf/hdf5lib/callbacks/H5L_iterate_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5L_iterate_t.java -text +java/src/hdf/hdf5lib/callbacks/H5O_iterate_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5O_iterate_t.java -text +java/src/hdf/hdf5lib/callbacks/H5P_cls_close_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_cls_close_func_t.java -text +java/src/hdf/hdf5lib/callbacks/H5P_cls_copy_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_cls_copy_func_t.java -text +java/src/hdf/hdf5lib/callbacks/H5P_cls_create_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_cls_create_func_t.java -text +java/src/hdf/hdf5lib/callbacks/H5P_iterate_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_iterate_t.java -text +java/src/hdf/hdf5lib/callbacks/H5P_prp_close_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_prp_compare_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_prp_copy_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_prp_create_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_prp_delete_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_prp_get_func_cb.java -text +java/src/hdf/hdf5lib/callbacks/H5P_prp_set_func_cb.java -text +java/src/hdf/hdf5lib/exceptions/HDF5AtomException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5AttributeException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5BtreeException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5DataFiltersException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5DataStorageException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5DatasetInterfaceException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5DataspaceInterfaceException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5DatatypeInterfaceException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5Exception.java -text +java/src/hdf/hdf5lib/exceptions/HDF5ExternalFileListException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5FileInterfaceException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5FunctionArgumentException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5FunctionEntryExitException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5HeapException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5InternalErrorException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5JavaException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5LowLevelIOException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5MetaDataCacheException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5ObjectHeaderException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5PropertyListInterfaceException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5ReferenceException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5ResourceUnavailableException.java -text +java/src/hdf/hdf5lib/exceptions/HDF5SymbolTableException.java -text +java/src/hdf/hdf5lib/structs/H5AC_cache_config_t.java -text +java/src/hdf/hdf5lib/structs/H5A_info_t.java -text +java/src/hdf/hdf5lib/structs/H5E_error2_t.java -text +java/src/hdf/hdf5lib/structs/H5F_info2_t.java -text +java/src/hdf/hdf5lib/structs/H5G_info_t.java -text +java/src/hdf/hdf5lib/structs/H5L_info_t.java -text +java/src/hdf/hdf5lib/structs/H5O_hdr_info_t.java -text +java/src/hdf/hdf5lib/structs/H5O_info_t.java -text +java/src/hdf/hdf5lib/structs/H5_ih_info_t.java -text +java/src/hdf/overview.html -text +java/src/jni/CMakeLists.txt -text +java/src/jni/Makefile.am -text +java/src/jni/exceptionImp.c -text +java/src/jni/exceptionImp.h -text +java/src/jni/h5Constants.c -text +java/src/jni/h5Imp.c -text +java/src/jni/h5Imp.h -text +java/src/jni/h5aImp.c -text +java/src/jni/h5aImp.h -text +java/src/jni/h5dImp.c -text +java/src/jni/h5dImp.h -text +java/src/jni/h5eImp.c -text +java/src/jni/h5eImp.h -text +java/src/jni/h5fImp.c -text +java/src/jni/h5fImp.h -text +java/src/jni/h5gImp.c -text +java/src/jni/h5gImp.h -text +java/src/jni/h5iImp.c -text +java/src/jni/h5iImp.h -text +java/src/jni/h5jni.h -text +java/src/jni/h5lImp.c -text +java/src/jni/h5lImp.h -text +java/src/jni/h5oImp.c -text +java/src/jni/h5oImp.h -text +java/src/jni/h5pImp.c -text +java/src/jni/h5pImp.h -text +java/src/jni/h5plImp.c -text +java/src/jni/h5plImp.h -text +java/src/jni/h5rImp.c -text +java/src/jni/h5rImp.h -text +java/src/jni/h5sImp.c -text +java/src/jni/h5sImp.h -text +java/src/jni/h5tImp.c -text +java/src/jni/h5tImp.h -text +java/src/jni/h5util.c -text +java/src/jni/h5util.h -text +java/src/jni/h5zImp.c -text +java/src/jni/h5zImp.h -text +java/src/jni/nativeData.c -text +java/src/jni/nativeData.h -text +java/test/CMakeLists.txt -text +java/test/JUnit-interface.ert -text +java/test/JUnit-interface.txt -text +java/test/Makefile.am -text +java/test/TestAll.java -text +java/test/TestH5.java -text +java/test/TestH5A.java -text +java/test/TestH5D.java -text +java/test/TestH5Dparams.java -text +java/test/TestH5Dplist.java -text +java/test/TestH5E.java -text +java/test/TestH5Edefault.java -text +java/test/TestH5Eregister.java -text +java/test/TestH5F.java -text +java/test/TestH5Fbasic.java -text +java/test/TestH5Fparams.java -text +java/test/TestH5G.java -text +java/test/TestH5Gbasic.java -text +java/test/TestH5Giterate.java -text +java/test/TestH5Lbasic.java -text +java/test/TestH5Lcreate.java -text +java/test/TestH5Lparams.java -text +java/test/TestH5Obasic.java -text +java/test/TestH5Ocopy.java -text +java/test/TestH5Ocreate.java -text +java/test/TestH5Oparams.java -text +java/test/TestH5P.java -text +java/test/TestH5PData.java -text +java/test/TestH5PL.java -text +java/test/TestH5Pfapl.java -text +java/test/TestH5Plist.java -text +java/test/TestH5Pvirtual.java -text +java/test/TestH5R.java -text +java/test/TestH5S.java -text +java/test/TestH5Sbasic.java -text +java/test/TestH5T.java -text +java/test/TestH5Tbasic.java -text +java/test/TestH5Tparams.java -text +java/test/TestH5Z.java -text +java/test/h5ex_g_iterate.orig -text svneol=unset#application/x-hdf +java/test/junit.sh.in -text +m4/aclocal_cxx.m4 -text +m4/aclocal_fc.f90 -text +m4/aclocal_fc.m4 -text +m4/ax_check_class.m4 -text +m4/ax_check_classpath.m4 -text +m4/ax_check_java_home.m4 -text +m4/ax_check_junit.m4 -text +m4/ax_check_rqrd_class.m4 -text +m4/ax_java_check_class.m4 -text +m4/ax_java_options.m4 -text +m4/ax_jni_include_dir.m4 -text +m4/ax_prog_jar.m4 -text +m4/ax_prog_java.m4 -text +m4/ax_prog_java_cc.m4 -text +m4/ax_prog_java_works.m4 -text +m4/ax_prog_javac.m4 -text +m4/ax_prog_javac_works.m4 -text +m4/ax_prog_javadoc.m4 -text +m4/ax_prog_javah.m4 -text +m4/ax_try_compile_java.m4 -text +m4/ax_try_run_java.m4 -text +src/H5Cepoch.c -text +src/H5Cquery.c -text +src/H5Ctag.c -text +src/H5Ctest.c -text +src/H5Dnone.c -text +src/H5Dsingle.c -text +src/H5Oflush.c -text +test/bad_compound.h5 -text +test/be_data.h5 -text +test/be_extlink1.h5 -text +test/be_extlink2.h5 -text +test/btree_idx_1_6.h5 -text +test/btree_idx_1_8.h5 -text +test/cork.c -text +test/corrupt_stab_msg.h5 -text +test/deflate.h5 -text +test/dynlib4.c -text +test/family_v16_00000.h5 -text +test/family_v16_00001.h5 -text +test/family_v16_00002.h5 -text +test/family_v16_00003.h5 -text +test/file_image_core_test.h5 -text +test/filespace_1_6.h5 -text +test/filespace_1_8.h5 -text +test/fill_old.h5 -text +test/filter_error.h5 -text +test/group_old.h5 -text +test/le_data.h5 -text +test/le_extlink1.h5 -text +test/le_extlink2.h5 -text +test/mergemsg.h5 -text svneol=unset#application/hdf5 +test/multi_file_v16-r.h5 -text +test/multi_file_v16-s.h5 -text +test/noencoder.h5 -text +test/specmetaread.h5 -text +test/tarrold.h5 -text +test/tbad_msg_count.h5 -text +test/tbogus.h5 -text +test/test_filters_be.h5 -text +test/test_filters_le.h5 -text +test/testfiles/plist_files/acpl_32be -text +test/testfiles/plist_files/acpl_32le -text +test/testfiles/plist_files/acpl_64be -text +test/testfiles/plist_files/acpl_64le -text +test/testfiles/plist_files/dapl_32be -text +test/testfiles/plist_files/dapl_32le -text +test/testfiles/plist_files/dapl_64be -text +test/testfiles/plist_files/dapl_64le -text +test/testfiles/plist_files/dcpl_32be -text +test/testfiles/plist_files/dcpl_32le -text +test/testfiles/plist_files/dcpl_64be -text +test/testfiles/plist_files/dcpl_64le -text +test/testfiles/plist_files/def_acpl_32be -text +test/testfiles/plist_files/def_acpl_32le -text +test/testfiles/plist_files/def_acpl_64be -text +test/testfiles/plist_files/def_acpl_64le -text +test/testfiles/plist_files/def_dapl_32be -text +test/testfiles/plist_files/def_dapl_32le -text +test/testfiles/plist_files/def_dapl_64be -text +test/testfiles/plist_files/def_dapl_64le -text +test/testfiles/plist_files/def_dcpl_32be -text +test/testfiles/plist_files/def_dcpl_32le -text +test/testfiles/plist_files/def_dcpl_64be -text +test/testfiles/plist_files/def_dcpl_64le -text +test/testfiles/plist_files/def_dxpl_32be -text +test/testfiles/plist_files/def_dxpl_32le -text +test/testfiles/plist_files/def_dxpl_64be -text +test/testfiles/plist_files/def_dxpl_64le -text +test/testfiles/plist_files/def_fapl_32be -text +test/testfiles/plist_files/def_fapl_32le -text +test/testfiles/plist_files/def_fapl_64be -text +test/testfiles/plist_files/def_fapl_64le -text +test/testfiles/plist_files/def_fcpl_32be -text +test/testfiles/plist_files/def_fcpl_32le -text +test/testfiles/plist_files/def_fcpl_64be -text +test/testfiles/plist_files/def_fcpl_64le -text +test/testfiles/plist_files/def_gcpl_32be -text +test/testfiles/plist_files/def_gcpl_32le -text +test/testfiles/plist_files/def_gcpl_64be -text +test/testfiles/plist_files/def_gcpl_64le -text +test/testfiles/plist_files/def_lapl_32be -text +test/testfiles/plist_files/def_lapl_32le -text +test/testfiles/plist_files/def_lapl_64be -text +test/testfiles/plist_files/def_lapl_64le -text +test/testfiles/plist_files/def_lcpl_32be -text +test/testfiles/plist_files/def_lcpl_32le -text +test/testfiles/plist_files/def_lcpl_64be -text +test/testfiles/plist_files/def_lcpl_64le -text +test/testfiles/plist_files/def_ocpl_32be -text +test/testfiles/plist_files/def_ocpl_32le -text +test/testfiles/plist_files/def_ocpl_64be -text +test/testfiles/plist_files/def_ocpl_64le -text +test/testfiles/plist_files/def_ocpypl_32be -text +test/testfiles/plist_files/def_ocpypl_32le -text +test/testfiles/plist_files/def_ocpypl_64be -text +test/testfiles/plist_files/def_ocpypl_64le -text +test/testfiles/plist_files/def_strcpl_32be -text +test/testfiles/plist_files/def_strcpl_32le -text +test/testfiles/plist_files/def_strcpl_64be -text +test/testfiles/plist_files/def_strcpl_64le -text +test/testfiles/plist_files/dxpl_32be -text +test/testfiles/plist_files/dxpl_32le -text +test/testfiles/plist_files/dxpl_64be -text +test/testfiles/plist_files/dxpl_64le -text +test/testfiles/plist_files/fapl_32be -text +test/testfiles/plist_files/fapl_32le -text +test/testfiles/plist_files/fapl_64be -text +test/testfiles/plist_files/fapl_64le -text +test/testfiles/plist_files/fcpl_32be -text +test/testfiles/plist_files/fcpl_32le -text +test/testfiles/plist_files/fcpl_64be -text +test/testfiles/plist_files/fcpl_64le -text +test/testfiles/plist_files/gcpl_32be -text +test/testfiles/plist_files/gcpl_32le -text +test/testfiles/plist_files/gcpl_64be -text +test/testfiles/plist_files/gcpl_64le -text +test/testfiles/plist_files/lapl_32be -text +test/testfiles/plist_files/lapl_32le -text +test/testfiles/plist_files/lapl_64be -text +test/testfiles/plist_files/lapl_64le -text +test/testfiles/plist_files/lcpl_32be -text +test/testfiles/plist_files/lcpl_32le -text +test/testfiles/plist_files/lcpl_64be -text +test/testfiles/plist_files/lcpl_64le -text +test/testfiles/plist_files/ocpl_32be -text +test/testfiles/plist_files/ocpl_32le -text +test/testfiles/plist_files/ocpl_64be -text +test/testfiles/plist_files/ocpl_64le -text +test/testfiles/plist_files/ocpypl_32be -text +test/testfiles/plist_files/ocpypl_32le -text +test/testfiles/plist_files/ocpypl_64be -text +test/testfiles/plist_files/ocpypl_64le -text +test/testfiles/plist_files/strcpl_32be -text +test/testfiles/plist_files/strcpl_32le -text +test/testfiles/plist_files/strcpl_64be -text +test/testfiles/plist_files/strcpl_64le -text +test/th5s.h5 -text +test/tlayouto.h5 -text +test/tmtimen.h5 -text +test/tmtimeo.h5 -text +test/tsizeslheap.h5 -text +testpar/t_init_term.c -text +testpar/t_prestart.c -text +testpar/t_pshutdown.c -text +tools/h5copy/testfiles/h5copy_extlinks_src.h5 -text +tools/h5copy/testfiles/h5copy_extlinks_trg.h5 -text +tools/h5copy/testfiles/h5copy_ref.h5 -text +tools/h5copy/testfiles/h5copytst.h5 -text +tools/h5copy/testfiles/h5copytst_new.h5 -text +tools/h5copy/testfiles/h5copytst_new.out.ls -text +tools/h5diff/testfiles/compounds_array_vlen1.h5 -text +tools/h5diff/testfiles/compounds_array_vlen2.h5 -text +tools/h5diff/testfiles/h5diff_attr1.h5 -text +tools/h5diff/testfiles/h5diff_attr2.h5 -text +tools/h5diff/testfiles/h5diff_attr_v_level1.h5 -text +tools/h5diff/testfiles/h5diff_attr_v_level2.h5 -text +tools/h5diff/testfiles/h5diff_basic1.h5 -text +tools/h5diff/testfiles/h5diff_basic2.h5 -text +tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 -text +tools/h5diff/testfiles/h5diff_danglelinks1.h5 -text +tools/h5diff/testfiles/h5diff_danglelinks2.h5 -text +tools/h5diff/testfiles/h5diff_dset1.h5 -text +tools/h5diff/testfiles/h5diff_dset2.h5 -text +tools/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5 -text +tools/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5 -text +tools/h5diff/testfiles/h5diff_dtypes.h5 -text +tools/h5diff/testfiles/h5diff_empty.h5 -text +tools/h5diff/testfiles/h5diff_enum_invalid_values.h5 -text +tools/h5diff/testfiles/h5diff_exclude1-1.h5 -text +tools/h5diff/testfiles/h5diff_exclude1-2.h5 -text +tools/h5diff/testfiles/h5diff_exclude2-1.h5 -text +tools/h5diff/testfiles/h5diff_exclude2-2.h5 -text +tools/h5diff/testfiles/h5diff_exclude3-1.h5 -text +tools/h5diff/testfiles/h5diff_exclude3-2.h5 -text +tools/h5diff/testfiles/h5diff_ext2softlink_src.h5 -text +tools/h5diff/testfiles/h5diff_ext2softlink_trg.h5 -text +tools/h5diff/testfiles/h5diff_extlink_src.h5 -text +tools/h5diff/testfiles/h5diff_extlink_trg.h5 -text +tools/h5diff/testfiles/h5diff_grp_recurse1.h5 -text +tools/h5diff/testfiles/h5diff_grp_recurse2.h5 -text +tools/h5diff/testfiles/h5diff_grp_recurse_ext1.h5 -text +tools/h5diff/testfiles/h5diff_grp_recurse_ext2-1.h5 -text +tools/h5diff/testfiles/h5diff_grp_recurse_ext2-2.h5 -text +tools/h5diff/testfiles/h5diff_grp_recurse_ext2-3.h5 -text +tools/h5diff/testfiles/h5diff_hyper1.h5 -text +tools/h5diff/testfiles/h5diff_hyper2.h5 -text +tools/h5diff/testfiles/h5diff_linked_softlink.h5 -text +tools/h5diff/testfiles/h5diff_links.h5 -text +tools/h5diff/testfiles/h5diff_softlinks.h5 -text +tools/h5diff/testfiles/h5diff_types.h5 -text +tools/h5diff/testfiles/h5diff_v1.txt -text +tools/h5diff/testfiles/h5diff_v2.txt -text +tools/h5diff/testfiles/h5diff_v3.txt -text +tools/h5diff/testfiles/non_comparables1.h5 -text +tools/h5diff/testfiles/non_comparables2.h5 -text +tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 -text +tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 -text +tools/h5diff/testfiles/tmptest.he5 -text +tools/h5diff/testfiles/tmptest2.he5 -text +tools/h5dump/errfiles/non_existing.err -text +tools/h5format_convert/CMakeLists.txt -text +tools/h5format_convert/CMakeTests.cmake -text +tools/h5format_convert/Makefile.am -text +tools/h5format_convert/h5fc_chk_idx.c -text +tools/h5format_convert/h5fc_gentest.c -text +tools/h5format_convert/h5format_convert.c -text +tools/h5format_convert/testfiles/h5fc_d_file.ddl -text +tools/h5format_convert/testfiles/h5fc_dname.ddl -text +tools/h5format_convert/testfiles/h5fc_edge_v3.h5 -text +tools/h5format_convert/testfiles/h5fc_err_level.h5 -text +tools/h5format_convert/testfiles/h5fc_ext1_f.ddl -text +tools/h5format_convert/testfiles/h5fc_ext1_f.h5 -text +tools/h5format_convert/testfiles/h5fc_ext1_i.ddl -text +tools/h5format_convert/testfiles/h5fc_ext1_i.h5 -text +tools/h5format_convert/testfiles/h5fc_ext1_s.ddl -text +tools/h5format_convert/testfiles/h5fc_ext1_s.h5 -text +tools/h5format_convert/testfiles/h5fc_ext2_if.ddl -text +tools/h5format_convert/testfiles/h5fc_ext2_if.h5 -text +tools/h5format_convert/testfiles/h5fc_ext2_is.ddl -text +tools/h5format_convert/testfiles/h5fc_ext2_is.h5 -text +tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl -text +tools/h5format_convert/testfiles/h5fc_ext2_sf.h5 -text +tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl -text +tools/h5format_convert/testfiles/h5fc_ext3_isf.h5 -text +tools/h5format_convert/testfiles/h5fc_ext_none.h5 -text +tools/h5format_convert/testfiles/h5fc_help.ddl -text +tools/h5format_convert/testfiles/h5fc_non_v3.h5 -text +tools/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl -text +tools/h5format_convert/testfiles/h5fc_nonexistfile.ddl -text +tools/h5format_convert/testfiles/h5fc_nooption.ddl -text +tools/h5format_convert/testfiles/h5fc_v_all.ddl -text +tools/h5format_convert/testfiles/h5fc_v_bt1.ddl -text +tools/h5format_convert/testfiles/h5fc_v_err.ddl -text +tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl -text +tools/h5format_convert/testfiles/h5fc_v_n_all.ddl -text +tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl -text +tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext1_f.h5 -text +tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext1_i.h5 -text +tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext1_s.h5 -text +tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext2_if.h5 -text +tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext2_is.h5 -text +tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext2_sf.h5 -text +tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl -text +tools/h5format_convert/testfiles/old_h5fc_ext3_isf.h5 -text +tools/h5format_convert/testfiles/old_h5fc_ext_none.h5 -text +tools/h5format_convert/testh5fc.sh.in -text +tools/h5import/testfiles/binfp64.h5 -text +tools/h5import/testfiles/binin16.h5 -text +tools/h5import/testfiles/binin32.h5 -text +tools/h5import/testfiles/binin8.h5 -text +tools/h5import/testfiles/binin8w.h5 -text +tools/h5import/testfiles/binuin16.h5 -text +tools/h5import/testfiles/binuin32.h5 -text +tools/h5import/testfiles/textpfe.h5 -text +tools/h5import/testfiles/txtfp32.h5 -text +tools/h5import/testfiles/txtfp64.h5 -text +tools/h5import/testfiles/txtin16.h5 -text +tools/h5import/testfiles/txtin32.h5 -text +tools/h5import/testfiles/txtin8.h5 -text +tools/h5import/testfiles/txtstr.h5 -text +tools/h5import/testfiles/txtuin16.h5 -text +tools/h5import/testfiles/txtuin32.h5 -text +tools/h5jam/testfiles/tall.h5 -text +tools/h5jam/testfiles/twithub.h5 -text +tools/h5jam/testfiles/twithub513.h5 -text +tools/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl -text +tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl -text +tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl -text +tools/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl -text +tools/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl -text +tools/h5repack/testfiles/README -text +tools/h5repack/testfiles/h5repack_attr.h5 -text +tools/h5repack/testfiles/h5repack_attr_refs.h5 -text +tools/h5repack/testfiles/h5repack_deflate.h5 -text +tools/h5repack/testfiles/h5repack_early.h5 -text +tools/h5repack/testfiles/h5repack_ext.bin -text +tools/h5repack/testfiles/h5repack_ext.h5 -text +tools/h5repack/testfiles/h5repack_fill.h5 -text +tools/h5repack/testfiles/h5repack_filters.h5 -text +tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst -text +tools/h5repack/testfiles/h5repack_fletcher.h5 -text +tools/h5repack/testfiles/h5repack_hlink.h5 -text +tools/h5repack/testfiles/h5repack_layout.UD.h5 -text svneol=unset#application/x-hdf +tools/h5repack/testfiles/h5repack_layout.h5 -text +tools/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst -text +tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst -text +tools/h5repack/testfiles/h5repack_layout2.h5 -text +tools/h5repack/testfiles/h5repack_layout3.h5 -text +tools/h5repack/testfiles/h5repack_layouto.h5 -text +tools/h5repack/testfiles/h5repack_named_dtypes.h5 -text +tools/h5repack/testfiles/h5repack_nbit.h5 -text +tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5 -text +tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5 -text +tools/h5repack/testfiles/h5repack_objs.h5 -text +tools/h5repack/testfiles/h5repack_refs.h5 -text +tools/h5repack/testfiles/h5repack_shuffle.h5 -text +tools/h5repack/testfiles/h5repack_soffset.h5 -text +tools/h5repack/testfiles/h5repack_szip.h5 -text +tools/h5repack/testfiles/ublock.bin -text +tools/h5stat/testfiles/h5stat_filters.h5 -text +tools/h5stat/testfiles/h5stat_idx.ddl -text +tools/h5stat/testfiles/h5stat_idx.h5 -text +tools/h5stat/testfiles/h5stat_newgrat.h5 -text +tools/h5stat/testfiles/h5stat_threshold.h5 -text +tools/h5stat/testfiles/h5stat_tsohm.h5 -text +tools/lib/h5tools_error.h svneol=native#text/plain +tools/testfiles/charsets.h5 -text +tools/testfiles/family_file00000.h5 -text +tools/testfiles/family_file00001.h5 -text +tools/testfiles/family_file00002.h5 -text +tools/testfiles/family_file00003.h5 -text +tools/testfiles/family_file00004.h5 -text +tools/testfiles/family_file00005.h5 -text +tools/testfiles/family_file00006.h5 -text +tools/testfiles/family_file00007.h5 -text +tools/testfiles/family_file00008.h5 -text +tools/testfiles/family_file00009.h5 -text +tools/testfiles/family_file00010.h5 -text +tools/testfiles/family_file00011.h5 -text +tools/testfiles/family_file00012.h5 -text +tools/testfiles/family_file00013.h5 -text +tools/testfiles/family_file00014.h5 -text +tools/testfiles/family_file00015.h5 -text +tools/testfiles/family_file00016.h5 -text +tools/testfiles/family_file00017.h5 -text +tools/testfiles/file_space.h5 -text +tools/testfiles/filter_fail.h5 -text +tools/testfiles/non_existing.ddl -text +tools/testfiles/packedbits.h5 -text +tools/testfiles/taindices.h5 -text +tools/testfiles/tall.h5 -text +tools/testfiles/tarray1.h5 -text +tools/testfiles/tarray1_big.h5 -text +tools/testfiles/tarray2.h5 -text +tools/testfiles/tarray3.h5 -text +tools/testfiles/tarray4.h5 -text +tools/testfiles/tarray5.h5 -text +tools/testfiles/tarray6.h5 -text +tools/testfiles/tarray7.h5 -text +tools/testfiles/tarray8.h5 -text +tools/testfiles/tattr.h5 -text +tools/testfiles/tattr2.h5 -text +tools/testfiles/tattr4_be.h5 -text +tools/testfiles/tattrintsize.h5 -text +tools/testfiles/tattrreg.h5 -text +tools/testfiles/tbigdims.h5 -text +tools/testfiles/tbinary.h5 -text +tools/testfiles/tbitfields.h5 -text +tools/testfiles/tbitnopaque.ddl -text +tools/testfiles/tbitnopaque.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tchar.h5 -text +tools/testfiles/tcmpdattrintsize.h5 -text +tools/testfiles/tcmpdintarray.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tcmpdints.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tcmpdintsize.h5 -text +tools/testfiles/tcompound.h5 -text +tools/testfiles/tcompound2.h5 -text +tools/testfiles/tcompound_complex.h5 -text +tools/testfiles/tcompound_complex2.ddl -text +tools/testfiles/tcompound_complex2.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tdatareg.h5 -text +tools/testfiles/tdset.h5 -text +tools/testfiles/tdset2.h5 -text +tools/testfiles/tdset_idx.h5 -text +tools/testfiles/tdset_idx.ls -text +tools/testfiles/tempty.h5 -text +tools/testfiles/tenum.h5 -text +tools/testfiles/textlink.h5 -text +tools/testfiles/textlinkfar.h5 -text +tools/testfiles/textlinksrc.h5 -text +tools/testfiles/textlinktar.h5 -text +tools/testfiles/tfamily00000.h5 -text +tools/testfiles/tfamily00001.h5 -text +tools/testfiles/tfamily00002.h5 -text +tools/testfiles/tfamily00003.h5 -text +tools/testfiles/tfamily00004.h5 -text +tools/testfiles/tfamily00005.h5 -text +tools/testfiles/tfamily00006.h5 -text +tools/testfiles/tfamily00007.h5 -text +tools/testfiles/tfamily00008.h5 -text +tools/testfiles/tfamily00009.h5 -text +tools/testfiles/tfamily00010.h5 -text +tools/testfiles/tfcontents1.h5 -text +tools/testfiles/tfcontents2.h5 -text +tools/testfiles/tfilters.h5 -text +tools/testfiles/tfpformat.h5 -text +tools/testfiles/tfvalues.h5 -text +tools/testfiles/tgroup.h5 -text +tools/testfiles/tgrp_comments.h5 -text +tools/testfiles/thlink.h5 -text +tools/testfiles/thyperslab.h5 -text +tools/testfiles/tints4dims.ddl -text +tools/testfiles/tints4dims.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tints4dimsBlock2.ddl -text +tools/testfiles/tints4dimsBlockEq.ddl -text +tools/testfiles/tints4dimsCount2.ddl -text +tools/testfiles/tints4dimsCountEq.ddl -text +tools/testfiles/tints4dimsStride2.ddl -text +tools/testfiles/tintsattrs.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tlarge_objname.h5 -text +tools/testfiles/tldouble.h5 -text +tools/testfiles/tlonglinks.h5 -text +tools/testfiles/tloop.h5 -text +tools/testfiles/tloop2.h5 -text +tools/testfiles/tmany.h5 -text +tools/testfiles/tmulti-b.h5 -text +tools/testfiles/tmulti-g.h5 -text svneol=unset#application/octet-stream +tools/testfiles/tmulti-l.h5 -text +tools/testfiles/tmulti-o.h5 -text +tools/testfiles/tmulti-r.h5 -text +tools/testfiles/tmulti-s.h5 -text +tools/testfiles/tname-amp.h5 -text +tools/testfiles/tname-apos.h5 -text +tools/testfiles/tname-gt.h5 -text +tools/testfiles/tname-lt.h5 -text +tools/testfiles/tname-quot.h5 -text +tools/testfiles/tname-sp.h5 -text +tools/testfiles/tnamed_dtype_attr.h5 -text +tools/testfiles/tnestedcmpddt.h5 -text +tools/testfiles/tnestedcomp.h5 -text +tools/testfiles/tno-subset.h5 -text +tools/testfiles/tnodata.h5 -text +tools/testfiles/tnullspace.h5 -text +tools/testfiles/tobjref.h5 -text +tools/testfiles/topaque.h5 -text +tools/testfiles/torderattr.h5 -text +tools/testfiles/tordergr.h5 -text +tools/testfiles/tref-escapes-at.h5 -text +tools/testfiles/tref-escapes.h5 -text +tools/testfiles/tref.h5 -text +tools/testfiles/tsaf.h5 -text +tools/testfiles/tscalarattrintsize.h5 -text +tools/testfiles/tscalarintattrsize.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tscalarintsize.h5 -text +tools/testfiles/tscalarstring.h5 -text +tools/testfiles/tslink.h5 -text +tools/testfiles/tsoftlinks.h5 -text +tools/testfiles/tsplit_file-m.h5 -text +tools/testfiles/tsplit_file-r.h5 -text +tools/testfiles/tstr.h5 -text +tools/testfiles/tstr2.h5 -text +tools/testfiles/tstr3.h5 -text +tools/testfiles/tstring-at.h5 -text +tools/testfiles/tstring.ddl -text svneol=unset#application/octet-stream +tools/testfiles/tstring.h5 -text +tools/testfiles/tudlink.h5 -text +tools/testfiles/tvldtypes1.h5 -text +tools/testfiles/tvldtypes2.h5 -text +tools/testfiles/tvldtypes3.h5 -text +tools/testfiles/tvldtypes4.h5 -text +tools/testfiles/tvldtypes5.h5 -text +tools/testfiles/tvlenstr_array.ddl -text +tools/testfiles/tvlenstr_array.h5 -text svneol=unset#application/x-hdf +tools/testfiles/tvlstr.h5 -text +tools/testfiles/tvms.h5 -text +tools/testfiles/vds/1_a.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/1_b.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/1_c.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/1_d.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/1_e.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/1_f.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/1_vds.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/2_a.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/2_b.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/2_c.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/2_d.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/2_e.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/2_vds.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/3_1_vds.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/3_2_vds.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/4_0.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/4_1.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/4_2.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/4_vds.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/5_a.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/5_b.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/5_c.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/5_vds.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/a.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/b.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/c.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/d.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/f-0.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/f-3.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/vds-eiger.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/vds-first.ddl -text +tools/testfiles/vds/vds-gap1.ddl -text +tools/testfiles/vds/vds-gap2.ddl -text +tools/testfiles/vds/vds-percival-unlim-maxmin.h5 -text svneol=unset#application/x-hdf +tools/testfiles/vds/vds_layout-eiger.ddl -text +tools/testfiles/vds/vds_layout-maxmin.ddl -text +tools/testfiles/zerodim.h5 -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1c4acc6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,105 @@ +/Makefile.in +/aclocal.m4 +/autom4te.cache +bin/Makefile.in +bin/compile +bin/config.guess +bin/config.sub +bin/depcomp +bin/install-sh +bin/ltmain.sh +bin/missing +bin/test-driver +/build* +c++/Makefile.in +c++/examples/Makefile.in +c++/src/Makefile.in +c++/src/header_files/Makefile.in +c++/test/Makefile.in +config/Makefile.in +config/cmake/Makefile.in +config/cmake/UserMacros/Makefile.in +config/cmake/scripts/Makefile.in +config/cmake_ext_mod/Makefile.in +config/site-specific/Makefile.in +/configure +examples/Makefile.in +fortran/Makefile.in +fortran/examples/Makefile.in +fortran/src/Makefile.in +fortran/test/Makefile.in +fortran/testpar/Makefile.in +hl/Makefile.in +hl/c++/Makefile.in +hl/c++/examples/Makefile.in +hl/c++/src/Makefile.in +hl/c++/test/Makefile.in +hl/examples/Makefile.in +hl/fortran/Makefile.in +hl/fortran/examples/Makefile.in +hl/fortran/src/Makefile.in +hl/fortran/test/Makefile.in +hl/src/Makefile.in +hl/test/Makefile.in +hl/tools/Makefile.in +hl/tools/gif2h5/Makefile.in +hl/tools/gif2h5/testfiles/Makefile.in +java/Makefile.in +java/examples/Makefile.in +java/examples/datasets/.classes +java/examples/datasets/Makefile.in +java/examples/datatypes/.classes +java/examples/datatypes/Makefile.in +java/examples/groups/.classes +java/examples/groups/Makefile.in +java/examples/intro/.classes +java/examples/intro/Makefile.in +java/src/.classes +java/src/Makefile.in +java/src/jni/Makefile.in +java/test/.classes +java/test/Makefile.in +m4/Makefile.in +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 +release_docs/Makefile.in +src/H5Edefin.h +src/H5Einit.h +src/H5Epubgen.h +src/H5Eterm.h +src/H5config.h.in +src/H5overflow.h +src/H5version.h +src/Makefile.in +test/Makefile.in +test/testfiles/Makefile.in +test/testfiles/plist_files/Makefile.in +testpar/Makefile.in +tools/Makefile.in +tools/h5copy/Makefile.in +tools/h5copy/testfiles/Makefile.in +tools/h5diff/Makefile.in +tools/h5diff/testfiles/Makefile.in +tools/h5dump/Makefile.in +tools/h5dump/errfiles/Makefile.in +tools/h5format_convert/Makefile.in +tools/h5import/Makefile.in +tools/h5import/testfiles/Makefile.in +tools/h5jam/Makefile.in +tools/h5jam/testfiles/Makefile.in +tools/h5ls/Makefile.in +tools/h5repack/Makefile.in +tools/h5repack/testfiles/Makefile.in +tools/h5stat/Makefile.in +tools/h5stat/testfiles/Makefile.in +tools/lib/Makefile.in +tools/misc/Makefile.in +tools/misc/testfiles/Makefile.in +tools/misc/vds/Makefile.in +tools/perform/Makefile.in +tools/testfiles/Makefile.in +tools/testfiles/pbits/Makefile.in +tools/testfiles/vds/Makefile.in diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 45fa7d5..849d218 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -17,7 +17,7 @@ else (CDASH_LOCAL) endif (CDASH_LOCAL) set (CTEST_DROP_SITE_CDASH TRUE) -set (UPDATE_TYPE svn) +set (UPDATE_TYPE git) set (VALGRIND_COMMAND "/usr/bin/valgrind") set (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe") set (CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind") @@ -20,7 +20,9 @@ # in column one with a '#'. #------------------------------------------------------------------------------ -./.autom4te.cfg _DO_NOT_DISTRIBUTE_ +./.gitattributes _DO_NOT_DISTRIBUTE_ +./.gitignore _DO_NOT_DISTRIBUTE_ +./.autom4te.cfg _DO_NOT_DISTRIBUTE_ ./.h5chkright.ini _DO_NOT_DISTRIBUTE_ ./ACKNOWLEDGMENTS ./COPYING @@ -89,6 +91,10 @@ ./bin/timekeeper _DO_NOT_DISTRIBUTE_ ./bin/trace ./bin/yodconfigure +./bin/pkgscrpts/h5rmflags _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/makeHDF5BinaryTarfiles.pl _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/makeInternalREADME.pl _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/makeOuterREADME.pl _DO_NOT_DISTRIBUTE_ ./config/COPYING ./config/BlankForm diff --git a/bin/bbrelease b/bin/bbrelease index 79fe08f..c5d562e 100755 --- a/bin/bbrelease +++ b/bin/bbrelease @@ -279,7 +279,7 @@ if [ X$revmode = Xyes ]; then # "undo" changes to it. cp config/lt_vers.am $tmpdir branch=`git branch | grep '*' | awk '{print $NF}'` - revision=`git rev-parse HEAD` + revision=`git rev-parse --short HEAD` # Set version information to m.n.r-r$revision. # (h5vers does not correctly handle just m.n.r-$today.) VERS=`echo $VERS | sed -e s/-.*//`-$revision @@ -381,12 +381,12 @@ sub gen_configure { $conf =~ /^(.*?)\/?configure.ac$/; if ($1) { - $rc = system("cd $1 && ./autogen.sh -p >/dev/null 2>/dev/null && rm -rf autom4te.cache"); + $rc = system("cd $1 && ./autogen.sh >/dev/null 2>/dev/null && rm -rf autom4te.cache"); } else { - $rc = system("./autogen.sh -p >/dev/null 2>/dev/null && rm -rf autom4te.cache"); + $rc = system("./autogen.sh >/dev/null 2>/dev/null && rm -rf autom4te.cache"); } if ($rc) { - printf("./autogen.sh -p failed with exit code %d. Aborted.\n", $rc); + printf("./autogen.sh failed with exit code %d. Aborted.\n", $rc); exit 1; } } diff --git a/bin/pkgscrpts/h5rmflags b/bin/pkgscrpts/h5rmflags new file mode 100755 index 0000000..32b8090 --- /dev/null +++ b/bin/pkgscrpts/h5rmflags @@ -0,0 +1,167 @@ +#! /bin/sh +# +# Copyright by The HDF Group. +# Copyright by the Board of Trustees of the University of Illinois. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF5 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. +# + +## Remove paths to libraries used to build HDF5 when packaging HDF5 +## binaries. +## For help page, use "h5rmflags -help" + +# Constants definitions +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +# Function definitions + +# show help page +usage() { + # A wonderfully informative "usage" message. + echo "usage: $prog_name [OPTIONS]" + echo " OPTIONS:" + echo " -help|help This help message" + echo " -echo Show all the shell commands executed" + echo " -force No prompt, just do it" + echo " -prefix=DIR New directory to find HDF5 lib/ and include/" + echo " subdirectories [default: current directory]" + echo " -tool=TOOL Tool to update. TOOL must be in the current" + echo " directory and writable. [default: $h5tools]" + echo " -show Show the commands without executing them" + echo " " + exit $EXIT_FAILURE +} + +# display variable values +dump_vars(){ + echo "====Showing all variable values=====" + echo prefix=$prefix + echo h5tools=$h5tools + echo "====End Showing=====" +} + +# show actions to be taken +show_action() +{ + echo "Update the following tools because they are now installed at a new directory" + for t in $foundtools; do + echo "${t}:" + echo " current setting=`sed -e '/^prefix=/s/prefix=//p' -e d $t`" + echo " new setting="\""$prefix"\" + done +} + + +# Report Error message +ERROR() +{ + echo "***ERROR***" + echo "$1" +} + +# Main +# +# Initialization +h5tools="h5cc h5pcc h5fc h5pfc h5c++" # possible hdf5 tools +foundtools= # tools found and will be modified +fmode= # force mode, default is off +prefix=`(cd ..;pwd)` + +# Parse options +for arg in $@ ; do + case "$arg" in + -prefix=*) + prefix="`expr "$arg" : '-prefix=\(.*\)'`" + ;; + -echo) + set -x + ;; + -show) + SHOW="echo" + ;; + -tool=*) + h5tools="`expr "$arg" : '-tool=\(.*\)'`" + ;; + -help|help) + usage + ;; + -force) + fmode=yes + ;; + *) + ERROR "Unknown Option($arg)" + usage + exit $EXIT_FAILURE + ;; + esac +done + +# Sanity checks +#if [ ! -d $prefix ]; then +# ERROR "prefix($prefix) is not an existing directory" +# exit $EXIT_FAILURE +#fi + +for x in $h5tools; do + if [ -f $x ]; then + foundtools="$foundtools $x" + if [ ! -w $x ]; then + ERROR "h5tool($x) is not writable" + exit $EXIT_FAILURE + fi + fi +done + +if [ -z "$foundtools" ]; then + ERROR "found no tools to modify" + exit $EXIT_FAILURE +fi + +# Show actions to be taken and get consent +show_action + + +# Update them +if [ "$SHOW" = "echo" ]; then + echo "===Update commands are:====" +# cat $CMDFILE + echo "===End Update commands=====" +fi + +for t in $foundtools; do + echo Update $t ... +# COMMAND="ed - $t" +# if [ "$SHOW" = "echo" ]; then +# echo $COMMAND +# else +# $COMMAND < $CMDFILE + ed - $t << end + g/^H5BLD_CPPFLAGS/s/-I\/.*include //g + g/^H5BLD_LDFLAGS/s/-L\/.*lib //g + g/^H5BLD_LDFLAGS/s/-L\/.*lib64 //g + . + w +end +# fi +done + + +# Cleanup +#rm -f $CMDFILE +exit $EXIT_SUCCESS + +# Some possible future features to add +# CCBASE - Name of the alternative C compiler +# CLINKERBASE - Name of the alternative linker +# LDFLAGS - Path to different libraries your application will link with +# (this path should include the path to the zlib library) +# LIBS - Libraries your application will link with diff --git a/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl b/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl new file mode 100755 index 0000000..32b3049 --- /dev/null +++ b/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl @@ -0,0 +1,368 @@ +#!/usr/bin/perl +# makeTarFiles.pl + +# Copyright by The HDF Group. +# Copyright by the Board of Trustees of the University of Illinois. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF5 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. +# +# +# +use warnings; +use strict; +use Cwd; +use File::Basename; + + +my %destsubdir = ('emu' => 'sunos-5.11-sparc-32-sunc512', + 'emu64' => 'sunos-5.11-sparc-64-sunc512', + 'ostrich' => 'linux-el6-ppc64-gcc447', + 'ostrichxl' => 'linux-el6-ppc64-xl13.1', + 'platypus' => 'linux-centos6-x86_64-gcc447', + 'platypus32' => 'linux-centos6-x86_64-32-gcc447', + 'moohan' => 'linux-centos7-x86_64-gcc485', + 'moohan32' => 'linux-centos7-x86_64-32-gcc485', + 'kite' => 'osx-10.8-x86_64-clang5.1', + 'quail' => 'osx-10.9-x86_64-clang6.0', + 'osx1010test' => 'osx-10.10-x86_64-clang6.0'); + +my %szipdir = ('emu' => '/mnt/hdf/packages/szip/shared/encoder/SunOS-5.10', + 'emu-static' => '/mnt/hdf/packages/szip/static/encoder/SunOS-5.10', + 'emu64' => '/mnt/hdf/packages/szip-PIC/shared/encoder/SunOS-5.11-64', + 'emu64-static' => '/mnt/hdf/packages/szip-PIC/shared/encoder/SunOS-5.11-64', + 'kite' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8', + 'kite-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8', + 'ostrich32' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-ppc64-gcc', + 'ostrich32-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-ibmppc64-gcc-32', + 'ostrich' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-ppc64-gcc-64', + 'ostrich-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-ibmppc64-gcc', + 'ostrichxl' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-ppc64-gcc-64', + 'ostrichxl-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-ibmppc64-gcc', + 'osx1010test' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8', + 'osx1010test-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8', + 'moohan' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc', + 'moohan-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-x86_64-gcc', + 'moohan32' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc-m32', + 'moohan32-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/Linux2.6-x86_64-gcc-m32', + 'platypus32' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc-m32', + 'platypus32-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/Linux2.6-x86_64-gcc-m32', + 'platypus' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc', + 'platypus-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-x86_64-gcc', + 'quail' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8', + 'quail-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8'); + +my %zlibdir = ('emu' => '/mnt/hdf/packages/zlib-125/shared/SunOS-5.10', + 'emu-static' => '/mnt/hdf/packages/zlib-125/static/SunOS-5.10', + 'emu64' => '/mnt/hdf/packages/zlib-123-PIC/SunOS-5.11-64', + 'emu64-static' => '/mnt/hdf/packages/zlib-123-PIC/SunOS-5.11-64', + 'kite' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64', + 'kite-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64', + 'ostrich32' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc', + 'ostrich32-static' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc', + 'ostrich' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64', + 'ostrich-static' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64', + 'ostrichxl' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64', + 'ostrichxl-static' => '/mnt/hdf/packages/zlib-125/PIC/Linux2.6-ppc64-gcc-64', + 'osx1010test' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64', + 'osx1010test-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64', + 'moohan' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-x86_64-gcc', + 'moohan-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-x86_64-gcc', + 'moohan32' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32', + 'moohan32-static' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32', + 'platypus32' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32', + 'platypus32-static' => '/mnt/hdf/packages/zlib-128/Linux2.6-x86_64-gcc-m32', + 'platypus' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-x86_64-gcc', + 'platypus-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-x86_64-gcc', + 'quail' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64', + 'quail-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64'); + +my $indirectory = "."; +$indirectory = shift; + +my $outdirectory = "."; +$outdirectory = shift; + +my $key = "."; +#$key = shift; + +my $scriptdirname = dirname(__FILE__); + +unless (-d $outdirectory) { + print "$outdirectory not found. Create it or choose another one and try again.\n"; + exit 1; +} + +print "Subdirectories of $indirectory will be tarred and stored in $outdirectory.\n"; + + +my $tarfilename; +my $tardirname; +my $output; +my $cmd; + +# I'm currently copying system zlibs for at least solaris and FreeBSD machines. Since this script runs on jam it may require scp to get the libs. + +#For future reference +# command for getting szlib files and links for shared binaries: +# tar cvf - -C <szipDir>/lib . | tar xvf - -C <libdir> . +# libz.so.1.2.3 and the static files should just be copied because they're in directories +# with other files. Then create the libz.so.1 and libz.so symbolic links. +sub addzandszlibs { + my $dir = shift; + my $indirectory = shift; + my $currentdir = getcwd(); + + if (-d "$indirectory/$dir" ) { + my $szdir = $szipdir{$dir}; + my $zldir = $zlibdir{$dir}; + if ($dir =~ /static/ || $dir =~ /ostrich/) { + $cmd = "cp $szdir/lib/libsz.a $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + } elsif ($dir eq "freedom" || $dir eq "loyalty") { + $cmd = "cp $szdir/lib/libsz.so.2 $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + $cmd = "cp $zldir/lib/libz.so.5 $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + + chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!"; + $cmd = "ln -s libsz.so.2 libsz.so"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libz.so.5 libz.so"; + $output = `$cmd`; + print $output; + + chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; + } elsif ($dir eq "quail" || $dir eq "kite" || $dir eq "osx1010test") { + #we've been using the static libraries for the macs - built with -fPIC +# $cmd = "cp $szdir/lib/libsz.a $indirectory/$dir/lib"; +# $output = `$cmd`; +# print $output; +# $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib"; +# $output = `$cmd`; +# print $output; + $cmd = "cp $szdir/lib/libsz.2.0.0.dylib $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + $cmd = "cp $zldir/lib/libz.1.2.5.dylib $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + + chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!"; + $cmd = "ln -s libsz.2.0.0.dylib libsz.2.dylib"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libsz.2.0.0.dylib libsz.dylib"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libz.1.2.5.dylib libz.1.dylib"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libz.1.2.5.dylib libz.dylib"; + $output = `$cmd`; + print $output; + + chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; + + } elsif ($dir eq "emu64") { + $cmd = "cp $szdir/lib/libsz.so.2.0.0 $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + + chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!"; + $cmd = "ln -s libsz.so.2.0.0 libsz.so.2"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libsz.so.2.0.0 libsz.so"; + $output = `$cmd`; + print $output; + + chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; + + } elsif ($dir eq "platypus32" || $dir eq "moohan32") { + $cmd = "cp $szdir/lib/libsz.so.2.0.0 $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + + # $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib"; + # $output = `$cmd`; + # print $output; + + chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!"; + $cmd = "ln -s libsz.so.2.0.0 libsz.so.2"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libsz.so.2.0.0 libsz.so"; + $output = `$cmd`; + print $output; + + # $cmd = "ln -s libz.so.1.2.8 libz.so.1"; + # $output = `$cmd`; + # print $output; + + # $cmd = "ln -s libz.so.1.2.8 libz.so"; + # $output = `$cmd`; + # print $output; + + chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; + + } else { + $cmd = "cp $szdir/lib/libsz.so.2.0.0 $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + + $cmd = "cp $zldir/lib/libz.so.1.2.5 $indirectory/$dir/lib"; + $output = `$cmd`; + print $output; + + chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!"; + $cmd = "ln -s libsz.so.2.0.0 libsz.so.2"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libsz.so.2.0.0 libsz.so"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libz.so.1.2.5 libz.so.1"; + $output = `$cmd`; + print $output; + + $cmd = "ln -s libz.so.1.2.5 libz.so"; + $output = `$cmd`; + print $output; + + chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; + } + } +} + +sub makeTarFile { + my $directoryname = shift; + my $origdirname = shift; + my $tarfilename = shift; + my $tardirname = shift; + $cmd = "mv $indirectory/$origdirname $indirectory/$tardirname"; + $output = `$cmd`; + print $output; + if (-d $indirectory."/".$tardirname."/doc/hdf5/examples") { + $cmd = "mv $indirectory/$tardirname/doc/hdf5/examples $indirectory/$tardirname/examples"; + $output = `$cmd`; + print $output; + $cmd = "rm -rf $indirectory/$tardirname/doc"; + $output = `$cmd`; + print $output; + } + $cmd = "tar zcvf $outdirectory/$directoryname/$tarfilename -C $indirectory $tardirname"; + print "Need to run $cmd.\n"; + $output = `$cmd`; + sleep 10; + print "Create $tarfilename: $output\n"; + $cmd = "mv $indirectory/$tardirname $indirectory/$origdirname"; + $output = `$cmd`; + print $output; +} + +foreach $key (keys %destsubdir) { + print "Process ".$key."\n\n"; + #skip unless there's a directory by the name of $key or $key-static + next unless -d $indirectory.'/'.$key || -d $indirectory.'/'.$key."-static"; + my $version; + # This assumes a static directory. Probably the others should be checked if this + # doesn't exist. + $cmd = "grep \"HDF5 Version\" $indirectory/$key/lib/libhdf5.settings"; + $_ = `$cmd`; + print $_, "\n"; + s/HDF5 Version://; + s/^\s+//; + chomp; + $version = $_; + #my $directoryname = substr $destsubdir{$key}, 0, rindex($destsubdir{$key}, '-'); + my $directoryname = $destsubdir{$key}; + mkdir $outdirectory."/".$directoryname, 0755 unless -d $outdirectory."/".$directoryname; + my $staticdir = $key."-static"; + print $indirectory."/$key tarfile will be put in " . $outdirectory."/".$directoryname."\n"; + if (-e $outdirectory."/".$destsubdir{$key}."/README") { + print $outdirectory."/".$destsubdir{$key}."/README" . " has already been created.\n"; + } + else { + print "Make the Outer README file: "; + $cmd = "perl ./makeOuterREADME.pl $indirectory/$key $outdirectory $directoryname"; + print $cmd, "\n"; + my $output = `$cmd`; + print $output; + } + my $file = ""; + my @dirnames = ""; + opendir(DIR, $indirectory) or die "can't open .: $!"; + while (defined($file = readdir(DIR))) { + next unless ($file eq $key || $file eq "$key-static") && -d $indirectory."/".$file; + push @dirnames, $file; + } + foreach my $dir (@dirnames) { + next if $dir eq ""; + print "Make the Inner README files.\n"; + $cmd = "perl ./makeInternalREADME.pl $indirectory/$dir"; + print $cmd, "\n"; + $output = `$cmd`; + print $output; + print "Add the zlib and szip files for $dir.\n"; + &addzandszlibs($dir, $indirectory); + my $currentdir = getcwd(); + + print "Remove all lib*.la files from $dir/lib*.\n"; + $cmd = "rm $indirectory/$dir/lib*/lib*.la"; + print $cmd, "\n"; + $output = `$cmd`; + print $output; + + chdir "$indirectory/$dir/bin" or die "Couldn't change directory to $indirectory/$dir/bin, $!"; + + $cmd = "$scriptdirname/h5rmflags -force"; + $output = `$cmd`; + print $output; + chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; + print "Tar up the files into the output directory.\n"; + if (-d $indirectory."/".$dir) { + if ($dir =~ /static/) { + $tarfilename = "hdf5-$version-$destsubdir{$key}-static.tar.gz"; + $tardirname = "hdf5-$version-$destsubdir{$key}-static"; + } else { + $tarfilename = "hdf5-$version-$destsubdir{$key}-shared.tar.gz"; + $tardirname = "hdf5-$version-$destsubdir{$key}-shared"; + } + &makeTarFile($directoryname, $dir, $tarfilename, $tardirname); + } + } + # If this copy is done after h5rmflags is run on all the directories the compile scripts + # in the utilities directory will already have the paths removed. + if (-d $indirectory."/".$staticdir) { + $cmd = "cp -prv $indirectory/$staticdir/bin $outdirectory/$directoryname/utilities"; + $output = `$cmd`; + print $output; + } +} + diff --git a/bin/pkgscrpts/makeInternalREADME.pl b/bin/pkgscrpts/makeInternalREADME.pl new file mode 100755 index 0000000..355036f --- /dev/null +++ b/bin/pkgscrpts/makeInternalREADME.pl @@ -0,0 +1,215 @@ +#!/usr/bin/perl +# makeInternalREADME.pl +# +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF4. The full HDF4 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF4 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF4/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. +# + +use warnings; +use strict; + +my $section2="For information on compilers and settings used to build these HDF5 +libraries, please refer to: + + ./lib/libhdf5.settings + +The contents of this directory are: + + COPYING - Copyright notice + README - This file + RELEASE.txt - Detailed information regarding this release + bin/ - Directory containing HDF5 pre-compiled utilities + include/ - Directory containing HDF5 include files + lib/ - Directory containing HDF5 libraries and settings + share/ - Directory containing example code in C, C++, and + Fortran using HDF5 and HDF5 HL library APIs. The + shell scripts provided with these examples will + compile and run them, and will also test the + h5cc, h5c++, and h5fc compile scripts found + in the installed bin directory. + +These binaries were built with the ZLIB and SZIP (version 2.1, Encoder +ENABLED) external libraries which are included in the lib directory for +convenience. + +We also provide the ZLIB and SZIP source code on our ftp server at: + + ftp://ftp.hdfgroup.org/lib-external/ + +The official ZLIB and SZIP pages are at: + + ZLIB: http://www.zlib.net/ + SZIP: http://hdfgroup.org/doc_resource/SZIP/ + +"; + +my $section3 = "If using the shared libraries, you must add the HDF5 library path +to the LD_LIBRARY_PATH variable. +"; + +my $section4 = "We provide scripts for compiling applications with the HDF5 libraries: + + bin/h5cc - for C + bin/h5fc - for F90 (if Fortran 90 library is included with the binaries) + bin/h5c++ - for C++ (if C++ library is included with the binaries) + +After you have installed the binaries to their final destination, you can use +these scripts (h5cc, h5fc, h5c++) to compile. However, you must first run +./h5redeploy in the bin directory to change site specific paths in the scripts. + +You may also need to change other variables in the scripts, depending +on how things are set up on your system. Here are some of the variables +to check: + + prefix - Path to the HDF5 top level installation directory + CCBASE - Name of the C compiler + CLINKERBASE - Name of the linker + LIBS - Libraries your application will link with + +For further details refer to the INSTALL files in + ftp://ftp.hdfgroup.org/HDF5/current/src/unpacked/release_docs/ +or in the ./release_docs/ directory of the HDF5 source code, which can be found +on the HDF Group ftp server at ftp://ftp.hdfgroup.org/HDF5/current/src/. + +Please send questions, comments, and suggestions to the appropriate +contact address from http://www.hdfgroup.org/about/contact.html + + +"; + +my $indirectory = "."; +$indirectory = shift; +my $linktype = "shared"; +if ($indirectory =~ /static/) { + $linktype = "static"; +} +my $modestring=""; +if ($indirectory =~ /32/) { + $modestring = "in 32 bit mode "; +} + +my $version; + +my $outfile = "$indirectory/README"; +open OUTFILE, ">$outfile" or die "$!Couldn't open $outfile - check permissions for $indirectory\n"; +my $hostname; +my $cmd = "grep \"HDF5 Version\" $indirectory/lib/libhdf5.settings"; +$_ = `$cmd`; +#print OUTFILE $_, "\n"; +s/HDF5 Version://; +s/^\s+//; +chomp; +$version = $_; +#print OUTFILE $_, "\n"; + +my $versionstring= "This directory contains the $linktype binary distribution of HDF5-".$version; + +$cmd = "grep \"Uname information:\" $indirectory/lib/libhdf5.settings"; +$_ = `$cmd`; +s/Uname information://; +s/^\s+//; +#print OUTFILE $_; +chomp; +#s/(^\w+)(\s)(\S+)/$1/; +#s/(^.*)(-)(.*)(200[7-8])(.*)(\s)(\S+)/$1 $5/; +#my $platformstring = "\nthat was compiled on:" . $_ . " "; +my $platformstring = ""; +my $hostnamestring = $_; +my @hostnamestring = split / /, $hostnamestring; +#print OUTFILE "Size of hostnamestring is ", scalar @hostnamestring, "\n"; +#print OUTFILE $hostnamestring[0] . "\t" . $hostnamestring[2]."\t".$hostnamestring[19]."\n"; +$hostname = $hostnamestring[1]; +#my $size = scalar @hostnamestring; +if ($hostname =~ /loyalty/) { + $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0]." " . $hostnamestring[2]." " . $hostnamestring[-1] . " "; +} +elsif ($hostname =~ /freedom/) { + $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0]." " . $hostnamestring[2]." " . $hostnamestring[-1] . " "; +} elsif ($hostname =~ /emu/) { + $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0]." " . $hostnamestring[2] . " " . $hostnamestring[-2] . " "; +} elsif ($hostname =~ /fred/) { + $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0]." " . $hostnamestring[2] . " " . $hostnamestring[-1] . " "; +} else { + $_ = $hostnamestring[2]; + my $pos = index $_, '-'; + my $os = substr $_, 0, $pos; + $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0] . " " . $os . " " . $hostnamestring[-2] . " "; +} + + +my $mappingstring = ""; +#no mappingstring for 1.6. Put it back for 1.8. +#$cmd = "grep \"Default API Mapping:\" $indirectory/lib/libhdf5.settings"; +#$_ = `$cmd`; +#s/Default API Mapping://; +#s/^\s+//; +#chomp; +#if (/v\d+/) { +# s/v//; +# s/(\d)(\d)/$1\.$2/g; +# $mappingstring = "using the default\nAPI mapping for VERSION ".$_."."; +# +#} +print OUTFILE $versionstring; +print OUTFILE $platformstring."\n\n"; +#print OUTFILE $mappingstring; + +#if ($hostname eq "loyalty.hdfgroup.uiuc.edu" || $hostname eq "freedom.hdfgroup.uiuc.edu") { +# print OUTFILE " It includes the C APIs,\nbuilt using the following "; +# print OUTFILE "compilers:\n\n"; +#} +#else { +if ($linktype eq "shared" && !($hostname =~ /32/)) { + print OUTFILE "\n\nIt includes the C, C++, F90 and Java APIs, built using the following\n"; +} else { + print OUTFILE "\n\nIt includes the C, C++, and F90 APIs, built using the following\n"; +} +print OUTFILE "compilers:\n\n"; +#} + +# Only the gcc compiler version is in libhdf5.settings, so for now I looked +# up the versions and hardcoded them here. We will put them in libhdf5.settings +# for the next release. +if ($indirectory =~ /gnu484/) { + print OUTFILE "\tgcc, g++, and gfortran 4.8.4\n\n"; +} elsif ($hostname =~ /jam/ || $hostname =~ /koala/) { + print OUTFILE "\tgcc, g++, and gfortran 4.1.2\n\n"; +} elsif ($hostname =~ /platypus/) { + print OUTFILE "\tgcc, g++, and gfortran 4.4.7\n\n"; + if ($linktype eq "shared" && !($hostname =~ /32/)) { + print OUTFILE "\tjava 1.8.0_51\n\n"; + } +} elsif ($hostname =~ /moohan/) { + print OUTFILE "\tgcc, g++, and gfortran 4.8.5\n\n"; + if ($linktype eq "shared" && !($hostname =~ /32/)) { + print OUTFILE "\tjava 1.8.0_51\n\n"; + } +} elsif ($hostname =~ /emu/) { + print OUTFILE "\tSun C and C++ 5.12, Sun Fortran 95 8.6\n\n"; +} elsif ($hostname =~ /loyalty/ || $hostname =~ /freedom/) { + print OUTFILE "\tgcc, g++, and gfortran 4.6.1\n\n"; +} elsif ($hostname =~ /duck/) { + print OUTFILE "\tApple clang/clang++ 3.0 from Xcode 4.6.1 and gfortran 4.8.2\n\n"; +} elsif ($hostname =~ /kite/) { + print OUTFILE "\tApple clang/clang++ 5.1 from Xcode 5.0.2 and gfortran 4.8.2\n\n"; +} elsif ($hostname =~ /quail/) { + print OUTFILE "\tgcc, g++ 5.1 from Xcode 5.1 and gfortran 4.8.2\n\n"; +} elsif ($hostname =~ /osx1010test/) { + print OUTFILE "\tgcc, g++ 5.1 from Xcode 5.1 and gfortran 4.8.2\n\n"; +} + +print OUTFILE $section2; + +print OUTFILE $section3; + +print OUTFILE $section4; + diff --git a/bin/pkgscrpts/makeOuterREADME.pl b/bin/pkgscrpts/makeOuterREADME.pl new file mode 100755 index 0000000..602ad28 --- /dev/null +++ b/bin/pkgscrpts/makeOuterREADME.pl @@ -0,0 +1,182 @@ +#!/usr/bin/perl +# makeOuterREADME.pl + +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF4. The full HDF4 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF4 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF4/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. +# + +use warnings; +use strict; + +my $indirectory = "."; +$indirectory = shift; + +my $outdirectory = "."; +$outdirectory = shift; + +my $outsubdir = shift; + +my $version; + +my $outfile = "$outdirectory/$outsubdir/README"; +open OUTFILE, ">$outfile"; +my $hostname=""; +my $cmd = "grep \"HDF5 Version\" $indirectory-static/lib/libhdf5.settings"; +$_ = `$cmd`; +print OUTFILE $_, "\n"; +s/HDF5 Version://; +s/^\s+//; +chomp; +$version = $_; +#print OUTFILE $_, "\n"; +my $versionstring= "This directory contains the precompiled HDF5 $version binary distribution\n(include files, libraries, utilities) for"; + +$cmd = "grep \"Uname information:\" $indirectory-static/lib/libhdf5.settings"; +$_ = `$cmd`; +s/Uname information://; +s/^\s+//; +chomp; +print "String to work with is $_\n"; +my $platformstring = ""; +my $hostnamestring = $_; +my @hostnamestring = split / /, $hostnamestring; +$platformstring = "$hostnamestring[0] "; +if ($indirectory =~ /jam/ || $indirectory =~ /koala/) { + $hostnamestring = $hostnamestring[2]; + my $pos = index $hostnamestring, "-"; + if ($pos > 0) { + $platformstring .= substr $hostnamestring, 0, $pos; + } else { + $platformstring .= $hostnamestring[2]; + } + $platformstring .= " ".$hostnamestring[-3]; +} elsif ($indirectory =~ /linew/) { + $platformstring .= "$hostnamestring[2] $hostnamestring[-2]"; +} else { + $platformstring .= "$hostnamestring[2] $hostnamestring[-1]"; +} + +print OUTFILE $versionstring." ".$platformstring.":\n\n"; +my $line1; +my $line3; +my $line5; +my $compilerstring=""; +my $compilerstring1=""; +my $compilerstring2=""; + + +print $indirectory, "\n"; + +if ($indirectory =~ /ostrich/) { +# $line1 = " hdf5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n"; + $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring = " gcc, g++, and gfortran 4.4.7)"; +} +elsif ($indirectory =~ /platypus/) { +# $line1 = " hdf5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n"; + $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring1 = " gcc, g++, and gfortran 4.4.7)\n"; + if ($indirectory =~ /32/) { + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 and Java APIs (using"; + $compilerstring2 = " gcc, g++, and gfortran 4.4.7)\n"; + } else { + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 and Java APIs (using"; + $compilerstring2 = " gcc, g++, and gfortran 4.4.7 and java 1.8.0_51)\n"; + } +} +elsif ($indirectory =~ /moohan/) { +# $line1 = " hdf5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n"; + $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring1 = " gcc, g++, and gfortran 4.8.5)\n"; + if ($indirectory =~ /32/) { + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 and Java APIs (using"; + $compilerstring2 = " gcc, g++, and gfortran 4.4.7)\n"; + } else { + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 and Java APIs (using"; + $compilerstring2 = " gcc, g++, and gfortran 4.8.5 and java 1.8.0_51)\n"; + } +} +elsif ($indirectory =~ /emu/) { +# $line1 = " hdf5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n"; + $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring = " Sun C and C++ 5.12, Sun Fortran 95 8.6)\n"; +} +elsif ($indirectory =~ /kite/) { + $line3 = " hfd5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $line5 = " hfd5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring = " Apple clang/clang++ 5.1 from Xcode 5.0.2, + gfortran 4.8.2)\n"; +} +elsif ($indirectory =~ /quail/) { + $line3 = " hfd5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $line5 = " hfd5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring = " Apple clang/clang++ 6.0 from Xcode 5.1, + gfortran 4.9.2)\n"; +} +elsif ($indirectory =~ /osx1010test/) { + $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring = " Apple clang/clang++ 6.1 from Xcode 6.1, + gfortran 4.9.2)\n"; +} +elsif ($indirectory =~ /osx1011test/) { + $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring = " Apple clang/clang++ 7.0.2 from Xcode 7.0, + gfortran 5.2.0)\n"; +} + + print OUTFILE $line3; + print OUTFILE $compilerstring1."\n"; +if ($line5 ne "") { + print OUTFILE $line5; + print OUTFILE $compilerstring2."\n"; +} +#elsif ($indirectory =~ /-16API/) { +# print OUTFILE $line1; +# print OUTFILE $compilerstring; +# print OUTFILE " USES THE VERSION 1.6 DEFAULT API\n"; +# print OUTFILE " MAPPING.\n\n"; +#} + +print OUTFILE " utilities/ - Directory containing the compiled HDF5 utilities.\n"; +print OUTFILE " These utilities are STATICALLY linked and will run as is.\n\n"; +#print OUTFILE " The tools can be downloaded separately, or ALL in one\n"; +#print OUTFILE " compressed file (5-$version-$outsubdir-static-util.tar.gz).\n\n"; +print OUTFILE "\n"; +print OUTFILE "To obtain the HDF5 distribution, 'unzip' and 'untar' the distribution\n"; +print OUTFILE "file:\n\n"; +print OUTFILE " gzip -cd <gz file from above> | tar xvf -\n"; + + +#$cmd = "grep \"Configured by:\" $indirectory/$key-static/lib/libhdf5.settings"; +#$_ = `$cmd`; +#s/Configured by://; +#s/^\s+//; +#print OUTFILE $_; +#chomp; +#my $hostnamestring = $_; +#s/(^\w+)(\s)(\S+)/$1/; +#s/(^.*)(-)(.*)(200[7-8])(.*)(\s)(\S+)/$1 $5/; +#my $platformstring = $_ . ":\n\n"; +#my @hostnamestring = split /@/, $hostnamestring; +#print "Size of hostnamestring is ", scalar @hostnamestring, "\n"; +#print $hostnamestring[0] . "\t" . $hostnamestring[2]."\t".$hostnamestring[19]."\n"; +#my $platformstring = $hostnamestring[1].":\n\n"; +#$hostnamestring = $hostnamestring[1]; +#my $pos = index $hostnamestring, "."; +#if ($pos > 0) { +# @hostnamestring = split /\./, $hostnamestring; +# $platformstring = $hostnamestring[0].":\n\n"; +#} diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h index b615194..50cde99 100644 --- a/c++/test/h5cpputil.h +++ b/c++/test/h5cpputil.h @@ -89,7 +89,7 @@ template <class Type1, class Type2> { cerr << endl; cerr << "*** UNEXPECTED VALUE: " << file_name << ":line " << line - << ":" << msg << " different: " << x << ", should be " << value + << ": " << msg << " different: " << x << ", should be " << value << endl; IncTestNumErrs(); throw TestFailedException(file_name, msg); @@ -127,6 +127,19 @@ template <class Type1, class Type2> } } +template <class Type1, class Type2> + void verify_val(Type1 x, Type2 value, float epsilon, const char* msg, int line, const char* file_name) +{ + if (x == value) + { + cerr << endl; + cerr << "*** UNEXPECTED FLOAT VALUE: " << file_name << ":line " << line + << ": " << msg << " different: " << x << ", should be " << value + << " (epsilon=" << epsilon << ")" << endl; + IncTestNumErrs(); + throw TestFailedException(file_name, msg); + } +} /* Prototypes for the test routines */ #ifdef __cplusplus diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index e8c2a78..2dfa562 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -830,6 +830,9 @@ static void test_attr_scalar_write() ** test_attr_scalar_read(): Test scalar attribute reading functionality. ** ****************************************************************/ +/* Epsilon for floating-point comparisons */ +#define FP_EPSILON 0.000001F + static void test_attr_scalar_read() { // Output message about test being performed @@ -852,7 +855,8 @@ static void test_attr_scalar_read() // Read attribute information float read_data2=0.0; // Buffer for reading 1st attribute ds_attr.read(PredType::NATIVE_FLOAT,&read_data2); - verify_val(read_data2, attr_data5, "Attribute::read", __LINE__, __FILE__); + if (HDfabs(read_data2 - attr_data5) > FP_EPSILON) + verify_val(read_data2, attr_data5, FP_EPSILON, "Attribute::read", __LINE__, __FILE__); // Get the dataspace of the attribute DataSpace att_space = ds_attr.getSpace(); @@ -1714,7 +1718,7 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl, // Get creation order indexing on object unsigned crt_order_flags = 0; crt_order_flags = dcpl.getAttrCrtOrder(); - verify_val(crt_order_flags, 0, "DSetCreatPropList::getAttrCrtOrder",__LINE__,__FILE__); + verify_val(crt_order_flags, (unsigned)0, "DSetCreatPropList::getAttrCrtOrder",__LINE__,__FILE__); // Setting invalid combination of a attribute order creation order // indexing on should fail @@ -1731,7 +1735,7 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl, // verify them dcpl.setAttrCrtOrder(H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED); crt_order_flags = dcpl.getAttrCrtOrder(); - verify_val(crt_order_flags, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED), "DSetCreatPropList::getAttrCrtOrder",__LINE__,__FILE__); + verify_val(crt_order_flags, (unsigned)(H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED), "DSetCreatPropList::getAttrCrtOrder",__LINE__,__FILE__); // Create dataspace for dataset DataSpace ds_space(H5S_SCALAR); @@ -1766,7 +1770,7 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl, // Query the attribute creation properties crt_order_flags = dcpl.getAttrCrtOrder(); - verify_val(crt_order_flags, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED), "DSetCreatPropList::getAttrCrtOrder",__LINE__,__FILE__); + verify_val(crt_order_flags, (unsigned)(H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED), "DSetCreatPropList::getAttrCrtOrder",__LINE__,__FILE__); PASSED(); } // end try block diff --git a/config/cmake/FindJNI.cmake b/config/cmake/FindJNI.cmake index 440a9889..9105f3d 100644 --- a/config/cmake/FindJNI.cmake +++ b/config/cmake/FindJNI.cmake @@ -63,7 +63,7 @@ macro(java_append_library_directories _var) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") set(_java_libarch "ppc64" "ppc") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") - set(_java_libarch "ppc") + set(_java_libarch "ppc" "ppc64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc") # Both flavours can run on the same processor set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9") @@ -92,10 +92,14 @@ macro(java_append_library_directories _var) if(_path MATCHES "{libarch}") foreach(_libarch ${_java_libarch}) string(REPLACE "{libarch}" "${_libarch}" _newpath "${_path}") - list(APPEND ${_var} "${_newpath}") + if(EXISTS ${_newpath}) + list(APPEND ${_var} "${_newpath}") + endif() endforeach() else() - list(APPEND ${_var} "${_path}") + if(EXISTS ${_path}) + list(APPEND ${_var} "${_path}") + endif() endif() endforeach() endmacro() @@ -161,6 +165,10 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES /usr/lib/jvm/default-java/jre/lib/{libarch} /usr/lib/jvm/default-java/jre/lib /usr/lib/jvm/default-java/lib + # Ubuntu specific paths for default JVM + /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 + /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 + /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 # OpenBSD specific paths for default JVM /usr/local/jdk-1.7.0/jre/lib/{libarch} /usr/local/jre-1.7.0/lib/{libarch} @@ -191,6 +199,9 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" +) + +JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include /usr/include /usr/java/include @@ -209,6 +220,9 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES /usr/lib/jvm/java-7-openjdk-amd64/include /usr/lib64/jvm/java-7-openjdk/include /usr/lib64/jvm/java-7-openjdk-amd64/include + /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10 + /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10 + /usr/lib/jvm/java-6-openjdk-{libarch}/include # ubuntu 15.10 /usr/local/share/java/include /usr/lib/j2sdk1.4-sun/include /usr/lib/j2sdk1.5-sun/include @@ -290,7 +304,8 @@ find_path(JAVA_INCLUDE_PATH jni.h ${JAVA_AWT_INCLUDE_DIRECTORIES} ) -find_path(JAVA_INCLUDE_PATH2 jni_md.h +find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h + PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/darwin ${JAVA_INCLUDE_PATH}/win32 @@ -300,6 +315,7 @@ find_path(JAVA_INCLUDE_PATH2 jni_md.h ${JAVA_INCLUDE_PATH}/solaris ${JAVA_INCLUDE_PATH}/hp-ux ${JAVA_INCLUDE_PATH}/alpha + ${JAVA_INCLUDE_PATH}/aix ) find_path(JAVA_AWT_INCLUDE_PATH jawt.h @@ -316,8 +332,11 @@ endif() #include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) INCLUDE (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI DEFAULT_MSG JAVA_AWT_LIBRARY JAVA_JVM_LIBRARY - JAVA_INCLUDE_PATH JAVA_INCLUDE_PATH2 JAVA_AWT_INCLUDE_PATH) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI DEFAULT_MSG JAVA_AWT_LIBRARY + JAVA_JVM_LIBRARY + JAVA_INCLUDE_PATH + JAVA_INCLUDE_PATH2 + JAVA_AWT_INCLUDE_PATH) mark_as_advanced( JAVA_AWT_LIBRARY diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 561bdb7..efabbe6 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -45,6 +45,18 @@ if(NOT DEFINED FORTRAN_LIBRARIES) else(NOT DEFINED FORTRAN_LIBRARIES) set(FORTRANLIBRARIES "YES") endif() +if(NOT DEFINED HDF_LOCAL) + set(CDASH_LOCAL "NO") +else(NOT HDF_LOCAL) + set(CDASH_LOCAL "YES") +endif() +if(NOT DEFINED CTEST_SITE) + set(CTEST_SITE "local") +endif() +if(NOT DEFINED CTEST_BUILD_NAME) + set(CTEST_BUILD_NAME "examples") +endif() +set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}") #TAR_SOURCE - name of tarfile #if(NOT DEFINED TAR_SOURCE) @@ -77,6 +89,9 @@ if(${FORTRANLIBRARIES}) else() set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF") endif() +if(${CDASH_LOCAL}) + set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON") +endif() set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@") ############################################################################################################### diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index d7e2591..8ea6d18 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/HDF5_Examples.cmake.in @@ -51,6 +51,18 @@ if(NOT DEFINED JAVA_LIBRARIES) else(NOT DEFINED JAVA_LIBRARIES) set(JAVALIBRARIES "YES") endif() +if(NOT DEFINED HDF_LOCAL) + set(CDASH_LOCAL "NO") +else(NOT HDF_LOCAL) + set(CDASH_LOCAL "YES") +endif() +if(NOT DEFINED CTEST_SITE) + set(CTEST_SITE "local") +endif() +if(NOT DEFINED CTEST_BUILD_NAME) + set(CTEST_BUILD_NAME "examples") +endif() +set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}") #TAR_SOURCE - name of tarfile #if(NOT DEFINED TAR_SOURCE) @@ -88,6 +100,9 @@ if(${JAVALIBRARIES}) else() set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=OFF") endif() +if(${CDASH_LOCAL}) + set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON") +endif() set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@") ############################################################################################################### diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake index 9b2b1e0..4f8e4c8 100644 --- a/config/cmake/UseJava.cmake +++ b/config/cmake/UseJava.cmake @@ -169,7 +169,7 @@ # # :: # -# The add_jar() functions sets some target properties. You can get these +# The add_jar() function sets some target properties. You can get these # properties with the # get_property(TARGET <target_name> PROPERTY <propery_name>) # command. @@ -217,6 +217,19 @@ # This command installs the TARGET_NAME files to the given DESTINATION. # It should be called in the same scope as add_jar() or it will fail. # +# Target Properties: +# +# :: +# +# The install_jar() function sets the INSTALL_DESTINATION target property +# on jars so installed. This property holds the DESTINATION as described +# above, and is used by install_jar_exports(). You can get this property +# with the +# get_property(TARGET <target_name> PROPERTY INSTALL_DESTINATION) +# command. +# +# +# # :: # # install_jni_symlink(target_name destination) @@ -228,6 +241,24 @@ # # :: # +# install_jar_exports(TARGETS jar1 [jar2 ...] +# FILE export_filename +# DESTINATION destination [COMPONENT component]) +# +# This command installs a target export file export_filename for the named jar +# targets to the given DESTINATION. Its function is similar to that of +# install(EXPORTS). +# +# :: +# +# export_jars(TARGETS jar1 [jar2 ...] +# FILE export_filename) +# +# This command writes a target export file export_filename for the named jar +# targets. Its function is similar to that of export(). +# +# :: +# # create_javadoc(<VAR> # PACKAGES pkg1 [pkg2 ...] # [SOURCEPATH <sourcepath>] @@ -324,7 +355,7 @@ # that allow your Java and C code to interact. # # There are two main signatures for create_javah. The first signature -# returns generated files throught variable specified by GENERATED_FILES option: +# returns generated files through variable specified by GENERATED_FILES option: # # :: # @@ -389,14 +420,36 @@ include(CMakeParseArguments) function (__java_copy_file src dest comment) add_custom_command( OUTPUT ${dest} - COMMAND cmake -E copy_if_different + COMMAND ${CMAKE_COMMAND} -E copy_if_different ARGS ${src} ${dest} DEPENDS ${src} COMMENT ${comment}) endfunction () +function(__java_lcat VAR) + foreach(_line ${ARGN}) + set(${VAR} "${${VAR}}${_line}\n") + endforeach() + + set(${VAR} "${${VAR}}" PARENT_SCOPE) +endfunction() + +function(__java_export_jar VAR TARGET PATH) + get_target_property(_jarpath ${TARGET} JAR_FILE) + get_filename_component(_jarname ${_jarpath} NAME) + __java_lcat(${VAR} + "# Create imported target ${TARGET}" + "add_custom_target(${TARGET})" + "set_target_properties(${TARGET} PROPERTIES" + " JAR_FILE \"${PATH}/${_jarname}\")" + "" + ) + set(${VAR} "${${VAR}}" PARENT_SCOPE) +endfunction() + # define helper scripts +set(_JAVA_EXPORT_TARGETS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/javaTargets.cmake.in) set(_JAVA_CLASS_FILELIST_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaClassFilelist.cmake) set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake) @@ -435,6 +488,8 @@ function(add_jar _TARGET_NAME) if (NOT DEFINED _add_jar_OUTPUT_DIR) set(_add_jar_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) + else() + get_filename_component(_add_jar_OUTPUT_DIR ${_add_jar_OUTPUT_DIR} ABSOLUTE) endif() if (_add_jar_ENTRY_POINT) @@ -554,11 +609,6 @@ function(add_jar _TARGET_NAME) endif () endforeach() - # create an empty java_class_filelist - if (NOT EXISTS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist) - file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist "") - endif() - if (_JAVA_COMPILE_FILES OR _JAVA_COMPILE_FILELISTS) set (_JAVA_SOURCES_FILELISTS) @@ -598,6 +648,11 @@ function(add_jar _TARGET_NAME) DEPENDS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) + else () + # create an empty java_class_filelist + if (NOT EXISTS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist) + file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist "") + endif() endif () # create the jar file @@ -716,6 +771,13 @@ function(INSTALL_JAR _TARGET_NAME) PROPERTY INSTALL_FILES ) + set_property( + TARGET + ${_TARGET_NAME} + PROPERTY + INSTALL_DESTINATION + ${_DESTINATION} + ) if (__FILES) install( @@ -1348,3 +1410,94 @@ function (create_javah) set (${_create_javah_GENERATED_FILES} ${_output_files} PARENT_SCOPE) endif() endfunction() + +function(export_jars) + # Parse and validate arguments + cmake_parse_arguments(_export_jars + "" + "FILE" + "TARGETS" + ${ARGN} + ) + if (NOT _export_jars_FILE) + message(SEND_ERROR "export_jars: FILE must be specified.") + endif() + if (NOT _export_jars_TARGETS) + message(SEND_ERROR "export_jars: TARGETS must be specified.") + endif() + + # Set content of generated exports file + string(REPLACE ";" " " __targets__ "${_export_jars_TARGETS}") + set(__targetdefs__ "") + foreach(_target ${_export_jars_TARGETS}) + get_target_property(_jarpath ${_target} JAR_FILE) + get_filename_component(_jarpath ${_jarpath} PATH) + __java_export_jar(__targetdefs__ ${_target} "${_jarpath}") + endforeach() + + # Generate exports file + configure_file( + ${_JAVA_EXPORT_TARGETS_SCRIPT} + ${_export_jars_FILE} + @ONLY + ) +endfunction() + +function(install_jar_exports) + # Parse and validate arguments + cmake_parse_arguments(_install_jar_exports + "" + "FILE;DESTINATION;COMPONENT" + "TARGETS" + ${ARGN} + ) + if (NOT _install_jar_exports_FILE) + message(SEND_ERROR "install_jar_exports: FILE must be specified.") + endif() + if (NOT _install_jar_exports_DESTINATION) + message(SEND_ERROR "install_jar_exports: DESTINATION must be specified.") + endif() + if (NOT _install_jar_exports_TARGETS) + message(SEND_ERROR "install_jar_exports: TARGETS must be specified.") + endif() + + if (_install_jar_exports_COMPONENT) + set (_COMPONENT COMPONENT ${_install_jar_exports_COMPONENT}) + endif() + + # Determine relative path from installed export file to install prefix + if(IS_ABSOLUTE ${_install_jar_exports_DESTINATION}) + file(RELATIVE_PATH _relpath + ${_install_jar_exports_DESTINATION} + ${CMAKE_INSTALL_PREFIX} + ) + else() + file(RELATIVE_PATH _relpath + ${CMAKE_INSTALL_PREFIX}/${_install_jar_exports_DESTINATION} + ${CMAKE_INSTALL_PREFIX} + ) + endif() + + # Set up unique location for generated exports file + string(SHA256 _hash "${_install_jar_exports_DESTINATION}") + set(_tmpdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/JavaExports/${_hash}) + + # Set content of generated exports file + string(REPLACE ";" " " __targets__ "${_install_jar_exports_TARGETS}") + set(__targetdefs__ "set(_prefix \${CMAKE_CURRENT_LIST_DIR}/${_relpath})\n\n") + foreach(_target ${_install_jar_exports_TARGETS}) + get_target_property(_dir ${_target} INSTALL_DESTINATION) + __java_export_jar(__targetdefs__ ${_target} "\${_prefix}/${_dir}") + endforeach() + __java_lcat(__targetdefs__ "\nunset(_prefix)") + + # Generate and install exports file + configure_file( + ${_JAVA_EXPORT_TARGETS_SCRIPT} + ${_tmpdir}/${_install_jar_exports_FILE} + @ONLY + ) + install(FILES ${_tmpdir}/${_install_jar_exports_FILE} + DESTINATION ${_install_jar_exports_DESTINATION} + ${_COMPONENT}) +endfunction() diff --git a/config/cmake_ext_mod/FindMPI.cmake b/config/cmake_ext_mod/FindMPI.cmake index 1c9a2e3..80d8511 100644 --- a/config/cmake_ext_mod/FindMPI.cmake +++ b/config/cmake_ext_mod/FindMPI.cmake @@ -11,7 +11,8 @@ # of them have somewhat different include paths, libraries to link # against, etc., and this module tries to smooth out those differences. # -# === Variables === +# Variables +# ^^^^^^^^^ # # This module will set the following variables per language in your # project, where <lang> is one of C, CXX, or Fortran: @@ -37,11 +38,12 @@ # before the executable to run. # MPIEXEC_POSTFLAGS Flags to pass to MPIEXEC after other flags # -# === Usage === +# Usage +# ^^^^^ # # To use this module, simply call FindMPI from a CMakeLists.txt file, or -# run find_package(MPI), then run CMake. If you are happy with the -# auto- detected configuration for your language, then you're done. If +# run ``find_package(MPI)``, then run CMake. If you are happy with the +# auto-detected configuration for your language, then you're done. If # not, you have two options: # # :: @@ -55,24 +57,25 @@ # listed above, but these two are required. This will circumvent # autodetection entirely. # -# When configuration is successful, MPI_<lang>_COMPILER will be set to -# the compiler wrapper for <lang>, if it was found. MPI_<lang>_FOUND +# When configuration is successful, ``MPI_<lang>_COMPILER`` will be set to +# the compiler wrapper for <lang>, if it was found. ``MPI_<lang>_FOUND`` # and other variables above will be set if any MPI implementation was # found for <lang>, regardless of whether a compiler was found. # -# When using MPIEXEC to execute MPI applications, you should typically -# use all of the MPIEXEC flags as follows: +# When using ``MPIEXEC`` to execute MPI applications, you should typically +# use all of the ``MPIEXEC`` flags as follows: # # :: # # ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} PROCS # ${MPIEXEC_PREFLAGS} EXECUTABLE ${MPIEXEC_POSTFLAGS} ARGS # -# where PROCS is the number of processors on which to execute the -# program, EXECUTABLE is the MPI program, and ARGS are the arguments to +# where ``PROCS`` is the number of processors on which to execute the +# program, ``EXECUTABLE`` is the MPI program, and ``ARGS`` are the arguments to # pass to the MPI program. # -# === Backward Compatibility === +# Backward Compatibility +# ^^^^^^^^^^^^^^^^^^^^^^ # # For backward compatibility with older versions of FindMPI, these # variables are set, but deprecated: @@ -83,7 +86,7 @@ # MPI_COMPILE_FLAGS MPI_INCLUDE_PATH MPI_EXTRA_LIBRARY # MPI_LINK_FLAGS MPI_LIBRARIES # -# In new projects, please use the MPI_<lang>_XXX equivalents. +# In new projects, please use the ``MPI_<lang>_XXX`` equivalents. #============================================================================= # Copyright 2001-2011 Kitware, Inc. @@ -204,7 +207,7 @@ function (_mpi_check_compiler compiler options cmdvar resvar) # Intel MPI 5.0.1 will return a zero return code even when the # argument to the MPI compiler wrapper is unknown. Attempt to # catch this case. - if("${cmdline}" MATCHES "undefined reference") + if(cmdline MATCHES "undefined reference" OR cmdline MATCHES "unrecognized") set(success 255 ) endif() set(${cmdvar} "${cmdline}" PARENT_SCOPE) @@ -325,7 +328,7 @@ function (interrogate_mpi_compiler lang try_libs) foreach(FLAG ${MPI_ALL_COMPILE_FLAGS}) if (MPI_COMPILE_FLAGS_WORK) - set(MPI_COMPILE_FLAGS_WORK "${MPI_COMPILE_FLAGS_WORK} ${FLAG}") + string(APPEND MPI_COMPILE_FLAGS_WORK " ${FLAG}") else() set(MPI_COMPILE_FLAGS_WORK ${FLAG}) endif() @@ -355,10 +358,10 @@ function (interrogate_mpi_compiler lang try_libs) endif() # Extract linker paths from the link command line - string(REGEX MATCHALL "(^| |-Wl,)-L([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}") + string(REGEX MATCHALL "(^| |-Wl,)(-L|/LIBPATH:)([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}") set(MPI_LINK_PATH) foreach(LPATH ${MPI_ALL_LINK_PATHS}) - string(REGEX REPLACE "^(| |-Wl,)-L" "" LPATH ${LPATH}) + string(REGEX REPLACE "^(| |-Wl,)(-L|/LIBPATH:)" "" LPATH ${LPATH}) string(REPLACE "//" "/" LPATH ${LPATH}) list(APPEND MPI_LINK_PATH ${LPATH}) endforeach() @@ -374,7 +377,7 @@ function (interrogate_mpi_compiler lang try_libs) set(MPI_LINK_FLAGS_WORK) foreach(FLAG ${MPI_ALL_LINK_FLAGS}) if (MPI_LINK_FLAGS_WORK) - set(MPI_LINK_FLAGS_WORK "${MPI_LINK_FLAGS_WORK} ${FLAG}") + string(APPEND MPI_LINK_FLAGS_WORK " ${FLAG}") else() set(MPI_LINK_FLAGS_WORK ${FLAG}) endif() @@ -383,20 +386,31 @@ function (interrogate_mpi_compiler lang try_libs) # Extract the set of libraries to link against from the link command # line string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") + if(WIN32) + # The intel wrappers on windows link against static versions of the MPI libraries. + # The static libraries are simply listed on the command line without -l. + # For instance: " icl ... impi.lib " + string(REGEX MATCHALL "(^| )([^\" ]+)\\.lib" tmp "${MPI_LINK_CMDLINE}") + list(APPEND MPI_LIBNAMES ${tmp}) + endif() # add the compiler implicit directories because some compilers # such as the intel compiler have libraries that show up # in the showme list that can only be found in the implicit # link directories of the compiler. if (DEFINED CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES) - set(MPI_LINK_PATH - "${MPI_LINK_PATH};${CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES}") + string(APPEND MPI_LINK_PATH + ";${CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES}") endif () # Determine full path names for all of the libraries that one needs # to link against in an MPI program foreach(LIB ${MPI_LIBNAMES}) string(REGEX REPLACE "^ ?-l" "" LIB ${LIB}) + if(WIN32) + string(REGEX REPLACE "\\.lib$" "" LIB ${LIB}) + endif() + string(STRIP ${LIB} LIB) # MPI_LIB is cached by find_library, but we don't want that. Clear it first. set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE) find_library(MPI_LIB NAMES ${LIB} HINTS ${MPI_LINK_PATH}) @@ -597,14 +611,13 @@ foreach (lang C CXX Fortran) if (CMAKE_${lang}_COMPILER_WORKS) # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler. if (MPI_${lang}_COMPILER) - is_file_executable(MPI_${lang}_COMPILER MPI_COMPILER_IS_EXECUTABLE) - if (NOT MPI_COMPILER_IS_EXECUTABLE) + if (NOT IS_ABSOLUTE "${MPI_${lang}_COMPILER}") # Get rid of our default list of names and just search for the name the user wants. set(_MPI_${lang}_COMPILER_NAMES ${MPI_${lang}_COMPILER}) set(MPI_${lang}_COMPILER "MPI_${lang}_COMPILER-NOTFOUND" CACHE FILEPATH "Cleared" FORCE) - # If the user specifies a compiler, we don't want to try to search libraries either. - set(try_libs FALSE) endif() + # If the user specifies a compiler, we don't want to try to search libraries either. + set(try_libs FALSE) else() set(try_libs TRUE) endif() diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index ea38c58..278f814 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -65,6 +65,7 @@ set_target_properties (H5_buildiface PROPERTIES ) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) + file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared") if (WIN32) set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE}) else (WIN32) @@ -150,8 +151,6 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) set (install_targets ${install_targets} ${HDF5_F90_C_LIBSH_TARGET}) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) -set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERATED TRUE) - #----------------------------------------------------------------------------- # Fortran Modules #----------------------------------------------------------------------------- @@ -178,6 +177,7 @@ set (f90_F_BASE_SOURCES ${HDF5_F90_SRC_SOURCE_DIR}/H5Zff.F90 ) +set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERATED TRUE) set (f90_F_SOURCES ${f90_F_BASE_SOURCES} @@ -187,6 +187,19 @@ set (f90_F_SOURCES # normal distribution ${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90 ) +if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) + set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90 PROPERTIES GENERATED TRUE) + set (f90_F_SOURCES_SHARED + ${f90_F_BASE_SOURCES} + + # generated file + ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90 + + # normal distribution + ${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90 + ) +endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) + set (CMD $<TARGET_FILE:H5_buildiface>) add_custom_target (H5gen ALL @@ -195,9 +208,19 @@ add_custom_target (H5gen ALL WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} DEPENDS ${f90_F_BASE_SOURCES} ) - set_source_files_properties (${f90_F_SOURCES} PROPERTIES LANGUAGE Fortran) +if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) + add_custom_target (H5genSH ALL + COMMAND ${CMD} + #v3.2 BYPRODUCT ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90 + WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared + DEPENDS ${f90_F_BASE_SOURCES} + ) + set_source_files_properties (${f90_F_SOURCES_SHARED} PROPERTIES LANGUAGE Fortran) +endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) + + #----------------------------------------------------------------------------- # Add Main fortran library #----------------------------------------------------------------------------- @@ -224,7 +247,7 @@ endif (WIN32) set (install_targets ${install_targets} ${HDF5_F90_LIB_TARGET}) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) - add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES}) + add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES_SHARED}) set (SHARED_LINK_FLAGS " ") if (WIN32 AND MSVC) set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def") diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index f0860ac..ca890ba 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -1066,17 +1066,17 @@ if (HDF5_TEST_VFD) set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT 1800) -# if (NOT CYGWIN) -# set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800) -# endif (NOT CYGWIN) + if (NOT CYGWIN) + set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800) + endif (NOT CYGWIN) if (BUILD_SHARED_LIBS) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared) set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-istore-shared PROPERTIES TIMEOUT 1800) -# if (NOT CYGWIN) -# set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800) -# endif (NOT CYGWIN) + if (NOT CYGWIN) + set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800) + endif (NOT CYGWIN) endif (BUILD_SHARED_LIBS) if (HDF5_TEST_FHEAP_VFD) add_test (NAME VFD-${vfdname}-fheap |