[svn-r14336] Maintenance/VMS port: added new command file to install C, Fortran and C++ libraries

                      and corresponding examples; modified some command files to check installation.

Platforms tested: VMS server

6 files changed, 224 insertions, 77 deletions

diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index 4dd8145..37ee782 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -15,9 +15,10 @@ $!#
 $!
 $! Make HDF5 C++ examples
 $!
-$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
+$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
+$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
 $
-$ ccc := cxx 'cxxopt /include=([-.-.src], [-.src])
+$ ccc := cxx 'cxxopt /include=([-.-.include])
 $!
 $!
 $ cxxobj= "create.cxx, readdata.cxx, writedata.cxx, compound.cxx,"+-
@@ -29,48 +30,48 @@ $ type sys$input
 
        Creating create 
 $ cxxlink  create, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
        Creating readdata  
 $ cxxlink  readdata, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating writedata  
 $ cxxlink  writedata, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ !                              
 $ type sys$input
 
        Creating compound 
 $ cxxlink  compound, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating extend_ds  
 $ cxxlink  extend_ds, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating chunks 
 $ cxxlink  chunks, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating h5group 
 $ cxxlink  h5group, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ exit
diff --git a/vms/examples/make.com b/vms/examples/make.com
index 590ce67..0df772a 100644
--- a/vms/examples/make.com
+++ b/vms/examples/make.com
@@ -17,8 +17,9 @@ $!
 $! Make HDF5 C examples
 $!
 $! ccopt = "/float=ieee_float/nowarnings/define=H5_VMS"
-$!
-$ ccc := cc 'ccopt /include=([-.src])
+$
+$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ ccc := cc 'ccopt /include=([-.-.include])
 $ type sys$input
  	Compiling  C examples
 $!
@@ -31,49 +32,49 @@ $
 $ type sys$input
        Creating h5_write 
 $ link     h5_write, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_read 
 $ link     h5_read, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_extend_write
 $ link     h5_extend_write, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_chunk_read 
 $ link     h5_chunk_read, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_compound 
 $ link     h5_compound, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_group 
 $ link     h5_group, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_select 
 $ link     h5_select, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_attribute 
 $ link     h5_attribute, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_mount 
 $ link     h5_mount, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_reference 
 $ link     h5_reference, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_ref2reg
 $ link     h5_ref2reg, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_drivers
 $ link     h5_drivers, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ exit
diff --git a/vms/fortran/examples/make.com b/vms/fortran/examples/make.com
index 7134038..9f18198 100644
--- a/vms/fortran/examples/make.com
+++ b/vms/fortran/examples/make.com
@@ -16,8 +16,9 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 Fortran examples
 $!
-$! fcopt = "/float=ieee_float/define=H5_VMS"
-$ fff := fortran 'fcopt /module=[-.src]
+$ fcopt = "/float=ieee_float/define=H5_VMS"
+$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ fff := fortran 'fcopt /module=[-.-.include]
 $
 $ type sys$input
 	Compiling HDF5 Fortran examples
@@ -33,84 +34,84 @@ $ type sys$input
 
         Creating dsetexample 
 $ link       dsetexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating fileexample
 $ link       fileexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating rwdsetexample
 $ link       rwdsetexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating attrexample
 $ link       attrexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating groupexample
 $ link       groupexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpsexample
 $ link       grpsexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpdsetexample
 $ link       grpdsetexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating hyperslab
 $ link       hyperslab ,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating selectele
 $ link       selectele,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpit
 $ link       grpit,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating refobjexample
 $ link       refobjexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating refregexample
 $ link       refregexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating mountexample
 $ link       mountexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating compound
 $ link       compound,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ exit
diff --git a/vms/install.com b/vms/install.com
new file mode 100644
index 0000000..1546d1a
--- /dev/null
+++ b/vms/install.com
@@ -0,0 +1,160 @@
+$!#
+$!# 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.
+$!#
+$!
+$!
+$! This command file installs built binaries, header files, examples and
+$! scripts under [.hdf5] directory in the main distribution
+$!
+$ 
+$!
+$!
+$ hdf5top      = F$DIRECTORY()
+$ len          = F$LENGTH(hdf5top)
+$ hdf5top_dir  = F$EXTRACT(0, len-4, hdf5top)
+$ hdf5top_dir1 = F$EXTRACT(0, len-5, hdf5top)
+$!
+$ hdf5src               = hdf5top_dir + "SRC]"
+$ hdf5examples          = hdf5top_dir + "EXAMPLES]"
+$ hdf5tools_h5copy      = hdf5top_dir + "TOOLS.H5COPY]"
+$ hdf5tools_h5diff      = hdf5top_dir + "TOOLS.H5DIFF]"
+$ hdf5tools_h5dump      = hdf5top_dir + "TOOLS.H5DUMP]"
+$ hdf5tools_h5ls        = hdf5top_dir + "TOOLS.H5LS]"
+$ hdf5tools_h5repack    = hdf5top_dir + "TOOLS.H5REPACK]"
+$ hdf5tools_h5jam       = hdf5top_dir + "TOOLS.H5JAM]"
+$ hdf5tools_h5import    = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5fortran_examples  = hdf5top_dir + "FORTRAN.EXAMPLES]"
+$ hdf5fortran_src       = hdf5top_dir + "FORTRAN.SRC]"
+$ hdf5cxx_src           = hdf5top_dir + "C__.SRC]"
+$ hdf5cxx_examples      = hdf5top_dir + "C__.EXAMPLES]"
+$!
+$ hdf5install            = hdf5top_dir + "HDF5]"
+$ hdf5install_include    = hdf5top_dir + "HDF5.INCLUDE]"
+$ hdf5install_examples   = hdf5top_dir + "HDF5.EXAMPLES]"
+$ hdf5install_examples_c         = hdf5top_dir + "HDF5.EXAMPLES.C]"
+$ hdf5install_examples_f90       = hdf5top_dir + "HDF5.EXAMPLES.F90]"
+$ hdf5install_examples_cxx       = hdf5top_dir + "HDF5.EXAMPLES.CXX]"
+$ hdf5install_lib        = hdf5top_dir + "HDF5.LIB]"
+$ hdf5install_bin        = hdf5top_dir + "HDF5.BIN]"
+$
+$ install_dir = hdf5top_dir1 + "]HDF5.DIR"
+$ if F$SEARCH(install_dir) .NES. ""
+$    then write sys$output "''install_dir' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''instal_dir'..."
+$    create/dir 'install_dir'
+$ endif
+$
+$ if F$SEARCH(hdf5install_include) .NES. ""
+$    then write sys$output "''hdf5install_include' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_include'..."
+$    create/dir 'hdf5install_include' 
+$ endif
+$ if F$SEARCH(hdf5install_lib) .NES. ""
+$    then write sys$output "''hdf5install_lib' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_lib'..."
+$    create/dir 'hdf5install_lib' 
+$ endif
+$ if F$SEARCH(hdf5install_bin) .NES. ""
+$    then write sys$output "''hdf5install_bin' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_bin'..."
+$    create/dir 'hdf5install_bin' 
+$ endif
+$ if F$SEARCH(hdf5install_examples) .NES. ""
+$    then write sys$output "''hdf5install_examples' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples'..."
+$    create/dir 'hdf5install_examples' 
+$ endif
+$ if F$SEARCH(hdf5install_examples_c) .NES. ""
+$    then write sys$output "''hdf5install_examples_c' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples_c'..."
+$    create/dir 'hdf5install_examples_c' 
+$ endif
+$ if F$SEARCH(hdf5install_examples_f90) .NES. ""
+$    then write sys$output "''hdf5install_examples_f90' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples_f90'..."
+$    create/dir 'hdf5install_examples_f90' 
+$ endif
+$ if F$SEARCH(hdf5install_examples_cxx) .NES. ""
+$    then write sys$output "''hdf5install_examples_cxx' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples_cxx'..."
+$    create/dir 'hdf5install_examples_cxx' 
+$ endif
+
+$!
+$ write sys$output "Installing C library and header files"
+$ set def 'hdf5src'
+$ copy HDF5.olb 'hdf5install_lib'
+$ copy *.h      'hdf5install_include'
+$ del 'hdf5install_include'*private*.*;*
+$!
+$ write sys$output "Installing Fortran library module files"
+$ set def 'hdf5fortran_src'
+$ copy HDF5_FORTRAN.olb 'hdf5install_lib'
+$ copy *.F90$MOD      'hdf5install_include'
+$!
+$ write sys$output "Installing C++ library and header files"
+$ set def 'hdf5cxx_src'
+$ copy HDF5_CPLUS.olb 'hdf5install_lib'
+$ copy *.h      'hdf5install_include'
+$ del 'hdf5install_include'*private*.h;*
+$!
+$ write sys$output "Installing utilties"
+$ set def 'hdf5tools_h5copy'
+$ copy h5copy.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5diff'
+$ copy h5diff.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5dump'
+$ copy h5dump.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5repack'
+$ copy h5repack.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5ls'
+$ copy h5ls.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5jam'
+$ copy h5jam.exe   'hdf5install_bin'
+$ copy h5unjam.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5import'
+$ copy h5import.exe 'hdf5install_bin'
+$!
+$ write sys$output "Installing examples"
+$ set def 'hdf5examples'
+$ copy *.c 'hdf5install_examples_c'
+$!
+$ set def 'hdf5fortran_examples'
+$ copy *.f90 'hdf5install_examples_f90'
+$!
+$ set def 'hdf5cxx_examples'
+$ rename *.cpp *.cxx
+$ copy *.cxx 'hdf5install_examples_cxx'
+$
+$ 
+$!
+$ set def 'hdf5top'
+$ copy [.examples]*.com 'hdf5install_examples_c'
+$ copy [.fortran.examples]*.com 'hdf5install_examples_f90'
+$ copy [.c__.examples]*.com 'hdf5install_examples_cxx'
+$ exit
diff --git a/vms/make.com b/vms/make.com
index 5a9b698..62c834f 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -17,16 +17,13 @@ $!
 $! This file copies all make files from the VMS directory to the 
 $! source directories and builds libraries, tests, and utilties
 $!
-$ copy [.c__.examples]*.com     [-.c__.examples]
 $ copy [.c__.src]make.com       [-.c__.src]
 $ copy [.c__.test]*.com         [-.c__.test]
-$ copy [.fortran.examples]*.com [-.fortran.examples]
 $ copy [.fortran.src]make.com   [-.fortran.src]
 $ copy [.fortran.test]*.com     [-.fortran.test]
 $ copy [.src]make.com           [-.src]
 $ copy [.src]h5pubconf.h        [-.src]
 $ copy [.test]*.com             [-.test]
-$ copy [.examples]*.com         [-.examples]
 $ copy [.tools.h5copy]*.com     [-.tools.h5copy]
 $ copy [.tools.h5dump]*.com     [-.tools.h5dump]
 $ copy [.tools.h5ls]*.com       [-.tools.h5ls]
@@ -131,18 +128,5 @@ $ set def 'hdf5cxx_test'
 $ rename *.cpp *.cxx
 $ @make.com
 $!
-$ write sys$output "Building C examples"
-$ set def 'hdf5examples'
-$ @make.com
-$!
-$ write sys$output "Building Fortran examples"
-$ set def 'hdf5fortran_examples'
-$ @make.com
-$!
-$ write sys$output "Building C++ examples"
-$ set def 'hdf5cxx_examples'
-$ rename *.cpp *.cxx
-$ @make.com
-$!
 $ set def 'hdf5top'
 $ exit
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index c554bfc..15ff275 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -44,7 +44,7 @@ $ type sys$input
 $ link/exe=h5repacktst.exe -
            h5repacktst,  -
            h5repack, h5repack_copy, h5repack_refs, h5repack_filters, -
-           h5repack_list, h5repack_opttable, h5repack_parse, -
+           h5repack_opttable, h5repack_parse, -
            h5repack_verify, -
            [-.lib]libh5tools.olb/lib,[-.-.test]libh5test.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib