[svn-r16464] I brought them up to date. I'm testing them on OpenVMS now.

9 files changed, 43 insertions, 39 deletions

diff --git a/vms/tools/h5copy/make.com b/vms/tools/h5copy/make.com
index b262663..1a95f58 100644
--- a/vms/tools/h5copy/make.com
+++ b/vms/tools/h5copy/make.com
@@ -16,7 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5copy tool 
 $!
-$! ccopt = "/float=ieee_float"
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
diff --git a/vms/tools/h5diff/check_h5diff.com b/vms/tools/h5diff/check_h5diff.com
index 9d16b12..0773c16 100644
--- a/vms/tools/h5diff/check_h5diff.com
+++ b/vms/tools/h5diff/check_h5diff.com
@@ -15,7 +15,7 @@ $!#
 $!
 $ !
 $ ! This command file tests h5diff utility. The command file has to
-$ ! run in the [hdf5-top.tools.testfiles] directory.
+$ ! run in the [hdf5-top.tools.h5diff.testfiles] directory.
 $ !
 $ !
 $ type sys$input
@@ -29,8 +29,8 @@ $ !
 $! set message/notext/nofacility/noidentification/noseverity
 $ current_dir = F$DIRECTRY()
 $ len = F$LENGTH(current_dir)
-$ temp = F$EXTRACT(0, len-10, current_dir)
-$ h5diff_dir = temp + "H5DIFF]"
+$ temp = F$EXTRACT(0, len-11, current_dir)
+$ h5diff_dir = temp + "]"
 $ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe
 $ !
 
@@ -152,8 +152,6 @@ $!# ############################################################################
 $!# # -d 
 $!# ##############################################################################
 $!
-$!# 6.2: no value
-$ CALL TOOLTEST h5diff_602.txt "-d h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.3: negative value
 $ CALL TOOLTEST h5diff_603.txt "-d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
@@ -185,8 +183,6 @@ $!# # -p
 $!# ##############################################################################
 $!
 $!
-$!# 6.11: no value
-$ CALL TOOLTEST h5diff_611.txt "-r -p h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.12: negative value
 $ CALL TOOLTEST h5diff_612.txt "-p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
@@ -219,8 +215,6 @@ $!# # -n
 $!# ##############################################################################
 $!
 $!
-$!# 6.20: no value
-$ CALL TOOLTEST h5diff_620.txt "-n h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.21: negative value
 $ CALL TOOLTEST h5diff_621.txt "-n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
@@ -290,9 +284,6 @@ $ ! Run the test and save output in the 'actual' file
 $ !
 $ define/nolog sys$output 'actual'
 $ define/nolog sys$error  'actual_err'
-$ write  sys$output "#############################"
-$ write  sys$output "Expected output for 'h5diff ''P2''"
-$ write  sys$output "#############################"
 $ ON ERROR THEN CONTINUE
 $ h5diff 'P2
 $ deassign sys$output
diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com
index 9c69c85..c1e0078 100644
--- a/vms/tools/h5diff/make.com
+++ b/vms/tools/h5diff/make.com
@@ -16,8 +16,11 @@ $! Makefile for VAX/VMX systems.
 $!
 $! Make h5diff tool 
 $!
-$! ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $!
 $ cobj= "h5diff_main, h5diff_common, h5diffgentest"
diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com
index 96ab968..612b524 100644
--- a/vms/tools/h5dump/make.com
+++ b/vms/tools/h5dump/make.com
@@ -16,14 +16,14 @@ $! Makefile for VMS systems.
 $!
 $! Make h5dump tool 
 $!
-$! ccopt = "/float=ieee_float"
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
-$ 
-$
 $ cobj= "h5dump.c, h5dumpgentest.c "
-
-$                               
 $ ccc 'cobj 
 $ type sys$input
        Creating h5dumpgentest ...
@@ -31,8 +31,6 @@ $ link     h5dumpgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
  	Finished  h5dumpgentest
-
-$
 $ type sys$input
        Creating h5dump ...
 $ link     h5dump, -
diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com
index 347c87c..6afbd70 100644
--- a/vms/tools/h5import/make.com
+++ b/vms/tools/h5import/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5import tool 
 $!
-$! ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
        Creating  h5import ...
@@ -26,7 +29,6 @@ $ cobj= "h5import, h5importtest "
 
 $!                               
 $ ccc 'cobj 
-$
 $ link     h5import,-
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
diff --git a/vms/tools/h5jam/make.com b/vms/tools/h5jam/make.com
index 086143f..d57b5e9 100644
--- a/vms/tools/h5jam/make.com
+++ b/vms/tools/h5jam/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$! ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
 	Creating h5jam
@@ -26,7 +29,6 @@ $ cobj= "h5jam, h5unjam, tellub, getub, h5jamgentest"
 
 $!                               
 $ ccc 'cobj 
-$
 $ type sys$input
        Creating tellub
 $ link     tellub -
diff --git a/vms/tools/h5ls/make.com b/vms/tools/h5ls/make.com
index 2ab721f..51d57c6 100644
--- a/vms/tools/h5ls/make.com
+++ b/vms/tools/h5ls/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$! ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
 	Creating h5ls
@@ -26,7 +29,6 @@ $ cobj= "h5ls.c "
 
 $!                               
 $ ccc 'cobj 
-$
 $ type sys$input
        Creating h5ls
 $ link     h5ls, -
diff --git a/vms/tools/h5repack/check_h5repack.com b/vms/tools/h5repack/check_h5repack.com
index 1dcbc78..207951e 100644
--- a/vms/tools/h5repack/check_h5repack.com
+++ b/vms/tools/h5repack/check_h5repack.com
@@ -15,7 +15,7 @@ $!#
 $!
 $ !
 $ ! This command file tests h5repack utility. The command file has to
-$ ! run in the [hdf5-top.tools.testfiles] directory.
+$ ! run in the [hdf5-top.tools.h5repack.testfiles] directory.
 $ !
 $ !
 $ type sys$input
@@ -29,10 +29,11 @@ $ !
 $! set message/notext/nofacility/noidentification/noseverity
 $ current_dir = F$DIRECTRY()
 $ len = F$LENGTH(current_dir)
-$ temp = F$EXTRACT(0, len-10, current_dir)
-$ h5diff_dir = temp + "H5DIFF]"
+$ temp = F$EXTRACT(0, len-11, current_dir)
+$ temp1 = F$EXTRACT(0, len-19, current_dir)
+$ h5diff_dir = temp1 + "H5DIFF]"
 $ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe
-$ h5repack_dir = temp + "H5REPACK]"
+$ h5repack_dir = temp + "]"
 $ h5repack :== $sys$disk:'h5repack_dir'h5repack.exe
 $ !
 $ !
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index f9a42c4..0de0e2b 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -16,8 +16,11 @@ $! Makefile for VMS systems.
 $!
 $! Make h5repack tool 
 $!
-$! ccopt = "/float=ieee_float"
-$
+$! The next two lines should be uncommented only when building by hand in the
+$! current directory. Use build.com in the vms directory to build
+$! the distribution. Make sure that location of the zlib library is correct.
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir"
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
        Creating h5repack ...
@@ -37,7 +40,6 @@ $ link/exe=h5repack.exe -
 $ type sys$input
        Finished  h5repack
 
-$
 $ type sys$input
        Creating h5repacktst ...
 $ link/exe=h5repacktst.exe -
@@ -47,7 +49,6 @@ $ link/exe=h5repacktst.exe -
            h5repack_verify, -
            [-.lib]libh5tools.olb/lib,[-.-.test]libh5test.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$
 $ type sys$input
        Finished  h5repacktst
 $!