summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vms/build.com10
-rw-r--r--vms/c++/examples/make.com42
-rw-r--r--vms/c++/src/make.com81
-rw-r--r--vms/c++/test/make.com18
-rw-r--r--vms/fortran/examples/make.com2
-rw-r--r--vms/fortran/src/make.com17
-rw-r--r--vms/fortran/test/make.com7
-rw-r--r--vms/install.com9
-rw-r--r--vms/make.com28
-rw-r--r--vms/test/check.com5
-rw-r--r--vms/tools/h5copy/make.com6
-rw-r--r--vms/tools/h5diff/check_h5diff.com15
-rw-r--r--vms/tools/h5diff/make.com7
-rw-r--r--vms/tools/h5dump/make.com12
-rw-r--r--vms/tools/h5import/make.com8
-rw-r--r--vms/tools/h5jam/make.com8
-rw-r--r--vms/tools/h5ls/make.com8
-rw-r--r--vms/tools/h5repack/check_h5repack.com9
-rw-r--r--vms/tools/h5repack/make.com9
19 files changed, 170 insertions, 131 deletions
diff --git a/vms/build.com b/vms/build.com
index c1de293..ee13379 100644
--- a/vms/build.com
+++ b/vms/build.com
@@ -14,7 +14,7 @@ $!# access to either file, you may request a copy from help@hdfgroup.org.
$!#
$!
$!
-$! This file builds C, Frtran, C++ HDF5 librraies and runs the tests
+$! This file builds C, Fortran, C++ HDF5 libraries and runs the tests
$! Specify location of the top HDF5 source directory
$
$ hdf5top == "sys$sysusers:[pourmal.hdf5]"
@@ -25,6 +25,8 @@ $ hdf5ctest = tmp + ".TEST]"
$ hdf5f90test = tmp + ".FORTRAN.TEST]"
$ hdf5cxxtest = tmp + ".C__.TEST]"
$ hdf5toolstest = tmp + ".TOOLS.TESTFILES]"
+$ hdf5toolstest_h5diff = tmp + ".TOOLS.H5DIFF.TESTFILES]"
+$ hdf5toolstest_h5repack = tmp + ".TOOLS.H5REPACK.TESTFILES]"
$ h5importtest = tmp + ".TOOLS.H5IMPORT.TESTFILES]"
$ set def 'hdf5vms'
$@make
@@ -37,11 +39,13 @@ $@check
$ set def 'hdf5toolstest'
$ copy [-.h5dump]check_h5dump.com check_h5dump.com
$ copy [-.h5ls]check_h5ls.com check_h5ls.com
-$ copy [-.h5diff]check_h5diff.com check_h5diff.com
-$ copy [-.h5repack]check_h5repack.com check_h5repack.com
$@check_h5dump.com
$@check_h5ls.com
+$ set def 'hdf5toolstest_h5diff'
+$ copy [-]check_h5diff.com check_h5diff.com
$@check_h5diff.com
+$ set def 'hdf5toolstest_h5repack'
+$ copy [-]check_h5repack.com check_h5repack.com
$@check_h5repack.com
$!
$ set def 'h5importtest'
diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index 37ee782..cde20e2 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -15,63 +15,65 @@ $!#
$!
$! Make HDF5 C++ examples
$!
-$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
-$
+$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS/include=zlib_dir"
$ ccc := cxx 'cxxopt /include=([-.-.include])
$!
$!
-$ cxxobj= "create.cxx, readdata.cxx, writedata.cxx, compound.cxx,"+-
- "extend_ds.cxx, chunks.cxx, h5group.cxx"
+$ cxxobj= "chunks.cxx, compound.cxx, create.cxx, extend_ds.cxx, h5group.cxx, "+-
+ "readdata.cxx, writedata.cxx"
$!
$!
$ ccc 'cxxobj
$ type sys$input
- Creating create
-$ cxxlink create, -
+ Creating chunks
+$ cxxlink chunks, -
[-.-.lib]hdf5_cplus.olb/lib, -
[-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
$ type sys$input
- Creating readdata
-$ cxxlink readdata, -
+ Creating compound
+$ cxxlink compound, -
[-.-.lib]hdf5_cplus.olb/lib, -
[-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
$!
$ type sys$input
- Creating writedata
-$ cxxlink writedata, -
+ Creating create
+$ cxxlink create, -
[-.-.lib]hdf5_cplus.olb/lib, -
[-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$ !
+$!
$ type sys$input
- Creating compound
-$ cxxlink compound, -
+ Creating extend_ds
+$ cxxlink extend_ds, -
[-.-.lib]hdf5_cplus.olb/lib, -
[-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
$!
$ type sys$input
- Creating extend_ds
-$ cxxlink extend_ds, -
+ Creating h5group
+$ cxxlink h5group, -
[-.-.lib]hdf5_cplus.olb/lib, -
[-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
$!
$ type sys$input
- Creating chunks
-$ cxxlink chunks, -
+ Creating readdata
+$ cxxlink readdata, -
[-.-.lib]hdf5_cplus.olb/lib, -
[-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
$!
$ type sys$input
- Creating h5group
-$ cxxlink h5group, -
+ Creating writedata
+$ cxxlink writedata, -
[-.-.lib]hdf5_cplus.olb/lib, -
[-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
$!
$ exit
diff --git a/vms/c++/src/make.com b/vms/c++/src/make.com
index f407caf..37525bc 100644
--- a/vms/c++/src/make.com
+++ b/vms/c++/src/make.com
@@ -16,6 +16,10 @@ $! Makefile for VMS systems.
$!
$! Make HDF5 C++ library
$!
+$! 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]
$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
$ ccc := cxx 'cxxopt /include=([-.-.src])
$!
@@ -23,60 +27,59 @@ $! type sys$input
$! Creating HDF5 C++ library
$!
$ lib/create/object hdf5_cplus.olb
-$ ccc H5Exception.cxx
-$ lib/insert/object hdf5_cplus H5Exception
-$ ccc H5IdComponent.cxx
-$ lib/insert/object hdf5_cplus H5IdComponent
-$ ccc H5Library.cxx
-$ lib/insert/object hdf5_cplus H5Library
+$ ccc H5AbstractDs.cxx
+$ lib/insert/object hdf5_cplus H5AbstractDs
+$ ccc H5ArrayType.cxx
+$ lib/insert/object hdf5_cplus H5ArrayType
+$ ccc H5AtomType.cxx
+$ lib/insert/object hdf5_cplus H5AtomType
$ ccc H5Attribute.cxx
$ lib/insert/object hdf5_cplus H5Attribute
-$ ccc H5Object.cxx
-$ lib/insert/object hdf5_cplus H5Object
-$ ccc H5PropList.cxx
-$ lib/insert/object hdf5_cplus H5PropList
-$ ccc H5FaccProp.cxx
-$ lib/insert/object hdf5_cplus H5FaccProp
-$ ccc H5FcreatProp.cxx
-$ lib/insert/object hdf5_cplus H5FcreatProp
+$ ccc H5CommonFG.cxx
+$ lib/insert/object hdf5_cplus H5CommonFG
+$ ccc H5CompType.cxx
+$ lib/insert/object hdf5_cplus H5CompType
+$ ccc H5DataSet.cxx
+$ lib/insert/object hdf5_cplus H5DataSet
+$ ccc H5DataSpace.cxx
+$ lib/insert/object hdf5_cplus H5DataSpace
+$ ccc H5DataType.cxx
+$ lib/insert/object hdf5_cplus H5DataType
$ ccc H5DcreatProp.cxx
$ lib/insert/object hdf5_cplus H5DcreatProp
$ ccc H5DxferProp.cxx
$ lib/insert/object hdf5_cplus H5DxferProp
-$ ccc H5DataType.cxx
-$ lib/insert/object hdf5_cplus H5DataType
-$ ccc H5DataSpace.cxx
-$ lib/insert/object hdf5_cplus H5DataSpace
-$ ccc H5AbstractDs.cxx
-$ lib/insert/object hdf5_cplus H5AbstractDs
-$ ccc H5AtomType.cxx
-$ lib/insert/object hdf5_cplus H5AtomType
-$ ccc H5PredType.cxx
-$ lib/insert/object hdf5_cplus H5PredType
$ ccc H5EnumType.cxx
$ lib/insert/object hdf5_cplus H5EnumType
-$ ccc H5IntType.cxx
-$ lib/insert/object hdf5_cplus H5IntType
+$ ccc H5Exception.cxx
+$ lib/insert/object hdf5_cplus H5Exception
+$ ccc H5FaccProp.cxx
+$ lib/insert/object hdf5_cplus H5FaccProp
+$ ccc H5FcreatProp.cxx
+$ lib/insert/object hdf5_cplus H5FcreatProp
+$ ccc H5File.cxx
+$ lib/insert/object hdf5_cplus H5File
$ ccc H5FloatType.cxx
$ lib/insert/object hdf5_cplus H5FloatType
+$ ccc H5Group.cxx
+$ lib/insert/object hdf5_cplus H5Group
+$ ccc H5IdComponent.cxx
+$ lib/insert/object hdf5_cplus H5IdComponent
+$ ccc H5IntType.cxx
+$ lib/insert/object hdf5_cplus H5IntType
+$ ccc H5Library.cxx
+$ lib/insert/object hdf5_cplus H5Library
+$ ccc H5Object.cxx
+$ lib/insert/object hdf5_cplus H5Object
+$ ccc H5PredType.cxx
+$ lib/insert/object hdf5_cplus H5PredType
+$ ccc H5PropList.cxx
+$ lib/insert/object hdf5_cplus H5PropList
$ ccc H5StrType.cxx
$ lib/insert/object hdf5_cplus H5StrType
-$ ccc H5ArrayType.cxx
-$ lib/insert/object hdf5_cplus H5ArrayType
$ ccc H5VarLenType.cxx
$ lib/insert/object hdf5_cplus H5VarLenType
-$ ccc H5CompType.cxx
-$ lib/insert/object hdf5_cplus H5CompType
-$ ccc H5DataSet.cxx
-$ lib/insert/object hdf5_cplus H5DataSet
-$ ccc H5CommonFG.cxx
-$ lib/insert/object hdf5_cplus H5CommonFG
-$ ccc H5Group.cxx
-$ lib/insert/object hdf5_cplus H5Group
-$ ccc H5File.cxx
-$ lib/insert/object hdf5_cplus H5File
$!
$ type sys$input
Done
$ exit
-
diff --git a/vms/c++/test/make.com b/vms/c++/test/make.com
index bcf26ce..47d9370 100644
--- a/vms/c++/test/make.com
+++ b/vms/c++/test/make.com
@@ -16,30 +16,34 @@ $! Makefile for VMS systems.
$!
$! Make HDF5 C++ library tests
$!
+$! 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]
$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
$
$ ccc := cxx 'cxxopt /include=([-.-.src], [-.-.test], [-.src])
$!
$!
$!
+$ ccc h5cpputil
$ ccc tattr
-$ ccc tfile
$ ccc tcompound
+$ ccc testhdf5
+$ ccc tfile
$ ccc tfilter
+$ ccc th5s
$ ccc trefer
$ ccc ttypes
$ ccc tvlstr
-$ ccc th5s
-$ ccc h5cpputil
-$ ccc testhdf5
$ type sys$input
Creating testhdf5
-$ cxxlink testhdf5,tattr,tfile, th5s, -
- tcompound, tfilter, trefer, tvlstr, ttypes, h5cpputil, -
+$ cxxlink testhdf5, h5cpputil, tattr, tcompound, tfile, tfilter, th5s, -
+ trefer, ttypes, tvlstr, -
[-.src]hdf5_cplus.olb/lib, [-.-.test]libh5test.olb/lib, -
[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
$!
-$ !
+$!
$ ccc dsets
$ type sys$input
Creating dsets
diff --git a/vms/fortran/examples/make.com b/vms/fortran/examples/make.com
index 9f18198..591ba63 100644
--- a/vms/fortran/examples/make.com
+++ b/vms/fortran/examples/make.com
@@ -17,7 +17,7 @@ $!
$! Make HDF5 Fortran examples
$!
$ fcopt = "/float=ieee_float/define=H5_VMS"
-$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
$ fff := fortran 'fcopt /module=[-.-.include]
$
$ type sys$input
diff --git a/vms/fortran/src/make.com b/vms/fortran/src/make.com
index 8c75d9a..5ad89ff 100644
--- a/vms/fortran/src/make.com
+++ b/vms/fortran/src/make.com
@@ -16,8 +16,13 @@ $! Makefile for VMS systems.
$!
$! Make HDF5 Fortran library
$!
-$ ccopt = "/float=ieee_float/define=H5_VMS"
-$ fcopt = "/float=ieee_float/define=H5_VMS"
+$! The thre 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/debug/nooptimize/include=zlib_dir"
+$! fcopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir"
$ ccc := cc 'ccopt /include=[-.-.src]
$ fff := fortran 'fcopt
$ type sys$input
@@ -48,17 +53,17 @@ $ type sys$input
Creating HDF5 Fortran library
$!
$ cobj="H5f90kit, H5_f, H5Af, H5Df, H5Ef, H5Ff, H5Gf, "+-
- "H5If, H5Pf, H5Rf, H5Sf, H5Tf, H5Zf"
+ "H5If, H5Lf, H5Of, H5Pf, H5Rf, H5Sf, H5Tf, H5Zf"
$ ffiles= "H5_ff.f90, H5Aff.f90, H5Dff.f90, H5Eff.f90,"+-
+ "H5Lff.f90, H5Off.f90,"+-
"H5Fff.f90, H5Gff.f90, H5Iff.f90, H5Pff.f90, H5Rff.f90, H5Sff.f90,"+-
"H5Tff.f90, H5Zff.f90, H5_DBLE_InterfaceInclude.f90, HDF5.f90"
-$ fobj="H5fortran_flags, H5f90global, "+-
+$ fobj="H5f90global, "+-
"H5fortran_types, H5_ff, H5Aff, H5Dff, H5Eff,"+-
- "H5Fff, H5Gff, H5Iff, H5Pff, H5Rff, H5Sff,"+-
+ "H5Fff, H5Gff, H5Iff, H5Lff, H5Off, H5Pff, H5Rff, H5Sff,"+-
"H5Tff, H5Zff, H5_DBLE_InterfaceInclude, HDF5"
$!
$ ccc 'cobj
-$ fff H5fortran_flags.f90
$ fff H5fortran_types.f90
$ fff H5f90global.f90
$
diff --git a/vms/fortran/test/make.com b/vms/fortran/test/make.com
index 120fa7b..478c64c 100644
--- a/vms/fortran/test/make.com
+++ b/vms/fortran/test/make.com
@@ -16,8 +16,9 @@ $! Makefile for VMS systems.
$!
$! Make HDF5 Fortran tests
$!
-$ ccopt = "/float=ieee_float/define=H5_VMS"
-$ fcopt = "/float=ieee_float/define=H5_VMS"
+$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3]
+$! ccopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir"
+$! fcopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir"
$ ccc := cc 'ccopt /include=[-.-.src]
$ fff := fortran 'fcopt /module=[-.src]
$
@@ -58,7 +59,7 @@ $ link/exec=fortranlib_test.exe -
[-.src]hdf5_fortran.olb/lib,-
[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
$ link/exec=fortranlib_test_1_8.exe -
- fortranlib_test_1_8.obj, tH5F.obj, tH5A_1_8.obj, tH5G_1_8.obj,-
+ fortranlib_test_1_8.obj, tH5F.obj, tH5O.obj, tH5A_1_8.obj, tH5G_1_8.obj,-
h5test_fortran.olb/lib,[-.-.test]libh5test.olb/lib, -
[-.src]hdf5_fortran.olb/lib,-
[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
diff --git a/vms/install.com b/vms/install.com
index 21ebbbd..f1f9304 100644
--- a/vms/install.com
+++ b/vms/install.com
@@ -33,6 +33,8 @@ $ hdf5tools_h5ls = hdf5top_dir + "TOOLS.H5LS]"
$ hdf5tools_h5repack = hdf5top_dir + "TOOLS.H5REPACK]"
$ hdf5tools_h5jam = hdf5top_dir + "TOOLS.H5JAM]"
$ hdf5tools_h5import = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5tools_h5stat = hdf5top_dir + "TOOLS.H5STAT]"
+$ hdf5tools_h5misc = hdf5top_dir + "TOOLS.H5MISC]"
$ hdf5fortran_examples = hdf5top_dir + "FORTRAN.EXAMPLES]"
$ hdf5fortran_src = hdf5top_dir + "FORTRAN.SRC]"
$ hdf5cxx_src = hdf5top_dir + "C__.SRC]"
@@ -137,6 +139,13 @@ $!
$ set def 'hdf5tools_h5import'
$ copy h5import.exe 'hdf5install_bin'
$!
+$ set def 'hdf5tools_h5stat'
+$ copy h5stat.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5misc'
+$ copy h5debug.exe 'hdf5install_bin'
+$ copy h5mkgrp.exe 'hdf5install_bin'
+$!
$ write sys$output "Installing examples"
$ set def 'hdf5examples'
$ copy *.c 'hdf5install_examples_c'
diff --git a/vms/make.com b/vms/make.com
index a5d0f10..5af9469 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -31,8 +31,10 @@ $ copy [.tools.h5diff]*.com [-.tools.h5diff]
$ copy [.tools.h5repack]*.com [-.tools.h5repack]
$ copy [.tools.h5import]*.com [-.tools.h5import]
$ copy [.tools.h5jam]*.com [-.tools.h5jam]
+$ copy [.tools.h5stat]*.com [-.tools.h5stat]
$ copy [.tools.lib]make.com [-.tools.lib]
$ copy [.tools.testfiles]*.ddl [-.tools.testfiles]
+$ copy [.tools.misc]make.com [-.tools.misc]
$!
$! Define location of ZLIB library. If you do not have it on your system, download
$! source code from http://www.zlib.net/, build and install on your system
@@ -59,10 +61,12 @@ $ hdf5tools_lib = hdf5top_dir + "TOOLS.LIB]"
$ hdf5tools_h5copy = hdf5top_dir + "TOOLS.H5COPY]"
$ hdf5tools_h5diff = hdf5top_dir + "TOOLS.H5DIFF]"
$ hdf5tools_h5dump = hdf5top_dir + "TOOLS.H5DUMP]"
+$ hdf5tools_h5import = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5tools_h5jam = hdf5top_dir + "TOOLS.H5JAM]"
$ hdf5tools_h5ls = hdf5top_dir + "TOOLS.H5LS]"
$ hdf5tools_h5repack = hdf5top_dir + "TOOLS.H5REPACK]"
-$ hdf5tools_h5jam = hdf5top_dir + "TOOLS.H5JAM]"
-$ hdf5tools_h5import = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5tools_h5stat = hdf5top_dir + "TOOLS.H5STAT]"
+$ hdf5tools_misc = hdf5top_dir + "TOOLS.MISC]"
$ hdf5fortran_examples = hdf5top_dir + "FORTRAN.EXAMPLES]"
$ hdf5fortran_src = hdf5top_dir + "FORTRAN.SRC]"
$ hdf5fortran_test = hdf5top_dir + "FORTRAN.TEST]"
@@ -95,20 +99,28 @@ $ write sys$output "Building h5dump"
$ set def 'hdf5tools_h5dump'
$ @make.com
$!
-$ write sys$output "Building h5repack"
-$ set def 'hdf5tools_h5repack'
+$ write sys$output "Building h5import"
+$ set def 'hdf5tools_h5import'
+$ @make.com
+$!
+$ write sys$output "Building h5jam"
+$ set def 'hdf5tools_h5jam'
$ @make.com
$!
$ write sys$output "Building h5ls"
$ set def 'hdf5tools_h5ls'
$ @make.com
$!
-$ write sys$output "Building h5jam"
-$ set def 'hdf5tools_h5jam'
+$ write sys$output "Building h5repack"
+$ set def 'hdf5tools_h5repack'
$ @make.com
$!
-$ write sys$output "Building h5import"
-$ set def 'hdf5tools_h5import'
+$ write sys$output "Building h5stat"
+$ set def 'hdf5tools_h5stat'
+$ @make.com
+$!
+$ write sys$output "Building misc"
+$ set def 'hdf5tools_misc'
$ @make.com
$!
$ write sys$output "Building Fortran library"
diff --git a/vms/test/check.com b/vms/test/check.com
index de1ef3c..402f17a 100644
--- a/vms/test/check.com
+++ b/vms/test/check.com
@@ -56,11 +56,6 @@ $ run cache
$ type sys$input
$ type sys$input
-------- Running cache_common -------
-$ run cache_common
-$ type sys$input
-
-$ type sys$input
------- Running chunk_info -------
$ run chunk_info
$ type sys$input
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
$!
generated by cgit v0.12 at 2024-11-07 06:13:13 (GMT)