summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MANIFEST18
-rwxr-xr-xconfigure2
-rw-r--r--configure.in1
-rw-r--r--tools/Makefile.in2
-rw-r--r--tools/h5jam/Dependencies83
-rw-r--r--tools/h5jam/h5jam.c6
-rw-r--r--tools/h5jam/h5unjam.c6
-rw-r--r--tools/h5jam/tellub.c6
8 files changed, 30 insertions, 94 deletions
diff --git a/MANIFEST b/MANIFEST
index be8abd5..a9883d5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1799,5 +1799,23 @@
./tools/testfiles/test5.h5
./tools/testfiles/h5repack_info.txt
+# jam utility and tests
+./tools/h5jam/Dependencies
+./tools/h5jam/h5jam.c
+./tools/h5jam/h5unjam.c
+./tools/h5jam/Makefile.in
+./tools/h5jam/h5jamgentest.c
+./tools/h5jam/testh5jam.sh.in
+./tools/h5jam/tellub.c
+./tools/h5jam/getub.c
+
+# test files for jam
+./tools/testfiles/twithub.h5
+./tools/testfiles/twithub513.h5
+./tools/testfiles/u10.txt
+./tools/testfiles/u511.txt
+./tools/testfiles/u512.txt
+./tools/testfiles/u513.txt
+
# windows
./windows/all.zip
diff --git a/configure b/configure
index 69ef184..0283931 100755
--- a/configure
+++ b/configure
@@ -32212,7 +32212,7 @@ if test "X$HAVE_PABLO" = "Xyes"; then
fi
fi
-ac_config_files="$ac_config_files src/libhdf5.settings config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/Makefile $PABLO_MAKE test/Makefile $PARALLEL_MAKE perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/gifconv/Makefile examples/Makefile doc/Makefile doc/html/Makefile doc/html/ed_libs/Makefile doc/html/ed_styles/Makefile doc/html/ADGuide/Makefile doc/html/Graphics/Makefile doc/html/Intro/Makefile doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/cpplus/Makefile doc/html/cpplus_RM/Makefile doc/html/cpplus_RM/header_files/Makefile doc/html/fortran/Makefile"
+ac_config_files="$ac_config_files src/libhdf5.settings config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/Makefile $PABLO_MAKE test/Makefile $PARALLEL_MAKE perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/gifconv/Makefile examples/Makefile doc/Makefile doc/html/Makefile doc/html/ed_libs/Makefile doc/html/ed_styles/Makefile doc/html/ADGuide/Makefile doc/html/Graphics/Makefile doc/html/Intro/Makefile doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/cpplus/Makefile doc/html/cpplus_RM/Makefile doc/html/cpplus_RM/header_files/Makefile doc/html/fortran/Makefile"
cat >confcache <<\_ACEOF
diff --git a/configure.in b/configure.in
index 6c5ff70..af7befe 100644
--- a/configure.in
+++ b/configure.in
@@ -2432,6 +2432,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
tools/h5dump/testh5dump.sh
tools/h5import/Makefile
tools/h5diff/Makefile
+ tools/h5jam/Makefile
tools/h5repack/Makefile
tools/h5repack/h5repack.sh
tools/h5ls/Makefile
diff --git a/tools/Makefile.in b/tools/Makefile.in
index ddee5d8..7b0df04 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -19,7 +19,7 @@ srcdir=@srcdir@
## All subdirectories except for the ``lib'' subdirectory.
##
-SUBDIRS=h5dump h5diff h5ls misc gifconv h5import h5repack
+SUBDIRS=h5dump h5diff h5ls misc gifconv h5import h5repack h5jam
## Add include directory to the C preprocessor flags, add -lh5tools and
## -lhdf5 to the list of libraries.
diff --git a/tools/h5jam/Dependencies b/tools/h5jam/Dependencies
index be3a92b..e69de29 100644
--- a/tools/h5jam/Dependencies
+++ b/tools/h5jam/Dependencies
@@ -1,83 +0,0 @@
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
-
-h5jam.lo: \
- $(top_srcdir)/tools/h5jam/h5jam.c \
- $(top_srcdir)/src/hdf5.h \
- $(top_srcdir)/src/H5public.h \
- $(top_builddir)/src/H5pubconf.h \
- $(top_srcdir)/src/H5api_adpt.h \
- $(top_srcdir)/src/H5Apublic.h \
- $(top_srcdir)/src/H5Ipublic.h \
- $(top_srcdir)/src/H5ACpublic.h \
- $(top_srcdir)/src/H5Bpublic.h \
- $(top_srcdir)/src/H5Dpublic.h \
- $(top_srcdir)/src/H5Epublic.h \
- $(top_srcdir)/src/H5Epubgen.h \
- $(top_srcdir)/src/H5Fpublic.h \
- $(top_srcdir)/src/H5FDpublic.h \
- $(top_srcdir)/src/H5FPpublic.h \
- $(top_srcdir)/src/H5Gpublic.h \
- $(top_srcdir)/src/H5Opublic.h \
- $(top_srcdir)/src/H5HGpublic.h \
- $(top_srcdir)/src/H5HLpublic.h \
- $(top_srcdir)/src/H5MMpublic.h \
- $(top_srcdir)/src/H5Ppublic.h \
- $(top_srcdir)/src/H5Tpublic.h \
- $(top_srcdir)/src/H5Zpublic.h \
- $(top_srcdir)/src/H5Rpublic.h \
- $(top_srcdir)/src/H5Spublic.h \
- $(top_srcdir)/src/H5FDcore.h \
- $(top_srcdir)/src/H5FDfamily.h \
- $(top_srcdir)/src/H5FDgass.h \
- $(top_srcdir)/src/H5FDlog.h \
- $(top_srcdir)/src/H5FDmpi.h \
- $(top_srcdir)/src/H5FDfphdf5.h \
- $(top_srcdir)/src/H5FDmpio.h \
- $(top_srcdir)/src/H5FDmpiposix.h \
- $(top_srcdir)/src/H5FDmulti.h \
- $(top_srcdir)/src/H5FDsec2.h \
- $(top_srcdir)/src/H5FDsrb.h \
- $(top_srcdir)/src/H5FDstdio.h \
- $(top_srcdir)/src/H5FDstream.h \
- $(top_srcdir)/tools/lib/h5tools_utils.h
-h5unjam.lo: \
- $(top_srcdir)/tools/h5jam/h5unjam.c \
- $(top_srcdir)/src/hdf5.h \
- $(top_srcdir)/src/H5public.h \
- $(top_builddir)/src/H5pubconf.h \
- $(top_srcdir)/src/H5api_adpt.h \
- $(top_srcdir)/src/H5Apublic.h \
- $(top_srcdir)/src/H5Ipublic.h \
- $(top_srcdir)/src/H5ACpublic.h \
- $(top_srcdir)/src/H5Bpublic.h \
- $(top_srcdir)/src/H5Dpublic.h \
- $(top_srcdir)/src/H5Epublic.h \
- $(top_srcdir)/src/H5Epubgen.h \
- $(top_srcdir)/src/H5Fpublic.h \
- $(top_srcdir)/src/H5FDpublic.h \
- $(top_srcdir)/src/H5FPpublic.h \
- $(top_srcdir)/src/H5Gpublic.h \
- $(top_srcdir)/src/H5Opublic.h \
- $(top_srcdir)/src/H5HGpublic.h \
- $(top_srcdir)/src/H5HLpublic.h \
- $(top_srcdir)/src/H5MMpublic.h \
- $(top_srcdir)/src/H5Ppublic.h \
- $(top_srcdir)/src/H5Tpublic.h \
- $(top_srcdir)/src/H5Zpublic.h \
- $(top_srcdir)/src/H5Rpublic.h \
- $(top_srcdir)/src/H5Spublic.h \
- $(top_srcdir)/src/H5FDcore.h \
- $(top_srcdir)/src/H5FDfamily.h \
- $(top_srcdir)/src/H5FDgass.h \
- $(top_srcdir)/src/H5FDlog.h \
- $(top_srcdir)/src/H5FDmpi.h \
- $(top_srcdir)/src/H5FDfphdf5.h \
- $(top_srcdir)/src/H5FDmpio.h \
- $(top_srcdir)/src/H5FDmpiposix.h \
- $(top_srcdir)/src/H5FDmulti.h \
- $(top_srcdir)/src/H5FDsec2.h \
- $(top_srcdir)/src/H5FDsrb.h \
- $(top_srcdir)/src/H5FDstdio.h \
- $(top_srcdir)/src/H5FDstream.h \
- $(top_srcdir)/tools/lib/h5tools_utils.h
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index d78e28c..487a0a4 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -159,7 +159,7 @@ main (int argc, const char *argv[])
int h5fid;
int ofid;
void *edata;
- H5E_auto_stack_t func;
+ H5E_auto_t func;
hid_t ifile;
hid_t plist;
herr_t status;
@@ -175,8 +175,8 @@ main (int argc, const char *argv[])
int res;
/* Disable error reporting */
- H5Eget_auto_stack (H5E_DEFAULT, &func, &edata);
- H5Eset_auto_stack (H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto (&func, &edata);
+ H5Eset_auto (NULL, NULL);
parse_command_line (argc, argv);
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 20378e5..05ef606 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -161,7 +161,7 @@ main(int argc, const char *argv[])
int ufid;
int h5fid;
void *edata;
- H5E_auto_stack_t func;
+ H5E_auto_t func;
hid_t ifile;
off_t fsize;
hsize_t usize;
@@ -172,8 +172,8 @@ main(int argc, const char *argv[])
struct stat sbuf;
/* Disable error reporting */
- H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
- H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto(&func, &edata);
+ H5Eset_auto(NULL, NULL);
parse_command_line(argc, argv);
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index ab88f4d..3b21aff 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -127,7 +127,7 @@ main (int argc, const char *argv[])
{
char *ifname;
void *edata;
- H5E_auto_stack_t func;
+ H5E_auto_t func;
hid_t ifile;
hsize_t usize;
htri_t testval;
@@ -135,8 +135,8 @@ main (int argc, const char *argv[])
hid_t plist;
/* Disable error reporting */
- H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
- H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto(&func, &edata);
+ H5Eset_auto(NULL, NULL);
parse_command_line (argc, argv);
generated by cgit v0.12 at 2024-09-04 08:08:33 (GMT)