[svn-r29896] Check in new versions of binary packaging and test scripts.

5 files changed, 280 insertions, 241 deletions

diff --git a/bin/pkgscrpts/make1816TarFiles.pl b/bin/pkgscrpts/makeHDF5ReleaseTarFiles.pl
index 64cb7e0..d25796f 100755
--- a/bin/pkgscrpts/make1816TarFiles.pl
+++ b/bin/pkgscrpts/makeHDF5ReleaseTarFiles.pl
@@ -6,39 +6,42 @@ use strict;
 use Cwd;
 use File::Basename;
 
+
 my %destsubdir = ('emu' => 'sunos-5.11-sparc-32-sunc512',
                   'emu64' => 'sunos-5.11-sparc-64-sunc512',
-                  'freedom' => 'freebsd-8.2-amd64-gcc461',
-                  'loyalty' => 'freebsd-8.2-i386-gcc461',
                   'ostrich' => 'linux-el6-ppc64-gcc447',
                   'ostrichxl' => 'linux-el6-ppc64-xl13.1',
                   'platypus' => 'linux-centos6-x86_64-gcc447',
-                  'moohan' => 'linux-centos7-x86_64-gcc483',
+                  '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');
-
+                  'osx1010test' => 'osx-10.10-x86_64-clang6.1',
+                  'osx1011test' => 'osx-10.11-x86_64-clang7.3');
 
 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',
-               'freedom' => '/mnt/hdf/packages/szip/shared/encoder/FreeBSD-64',
-               'freedom-static' => '/mnt/hdf/packages/szip/static/encoder/FreeBSD-64',
                'kite' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8',
                'kite-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8',
-               'loyalty' => '/mnt/hdf/packages/szip/shared/encoder/FreeBSD',
-               'loyalty-static' => '/mnt/hdf/packages/szip/static/encoder/FreeBSD',
                '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',
-               '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',
+               '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');
 
@@ -46,26 +49,26 @@ 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',
-               'freedom' => '/mnt/hdf/packages/zlib-125/shared/FreeBSD-64',
-               'freedom-static' => '/mnt/hdf/packages/zlib-125/static/FreeBSD-64',
                'kite' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64',
                'kite-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64',
-               'loyalty' => '/mnt/hdf/packages/zlib-125/shared/FreeBSD',
-               'loyalty-static' => '/mnt/hdf/packages/zlib-125/static/FreeBSD',
                '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',
-               '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',
+               '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',
-               'osx1010test' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64',
-               'osx1010test-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64');
+               'quail-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64');
 
 my $indirectory = ".";
 $indirectory = shift;
@@ -131,7 +134,7 @@ sub addzandszlibs {
          print $output;
 
          chdir $currentdir or die "Couldn't change directory back to $currentdir, $!";
-      } elsif ($dir eq "osx1010test" || $dir eq "quail" || $dir eq "kite") {
+      } 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`;
@@ -139,7 +142,7 @@ sub addzandszlibs {
 #         $cmd = "cp $zldir/lib/libz.a $indirectory/$dir/lib";
 #         $output = `$cmd`;
 #         print $output;
-         $cmd = "cp $szdir/lib/libsz.so.2.0.0.dylib $indirectory/$dir/lib";
+         $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";
@@ -147,11 +150,11 @@ sub addzandszlibs {
          print $output;
 
          chdir "$indirectory/$dir/lib" or die "Couldn't change directory to $indirectory/$dir/lib, $!";
-         $cmd = "ln -s libsz.so.2.0.0.dylib libsz.2.dylib";
+         $cmd = "ln -s libsz.2.0.0.dylib libsz.2.dylib";
          $output = `$cmd`;
          print $output;
 
-         $cmd = "ln -s libsz.so.2.0.0.dylib libsz.cylib";
+         $cmd = "ln -s libsz.2.0.0.dylib libsz.dylib";
          $output = `$cmd`;
          print $output;
 
@@ -184,10 +187,39 @@ sub addzandszlibs {
 
          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;
@@ -249,7 +281,7 @@ foreach $key (keys %destsubdir) {
    # doesn't exist.
    $cmd = "grep \"HDF5 Version\" $indirectory/$key/lib/libhdf5.settings";
    $_ = `$cmd`;
-   #print OUTFILE $_, "\n";
+   print $_, "\n";
    s/HDF5 Version://;
    s/^\s+//;
    chomp;
@@ -264,7 +296,7 @@ foreach $key (keys %destsubdir) {
    }
    else {
       print "Make the Outer README file:  ";
-      $cmd = "perl ./makeOuter1816README.pl $indirectory/$key $outdirectory $directoryname";
+      $cmd = "perl ./makeOuterREADME.pl $indirectory/$key $outdirectory $directoryname";
       print $cmd, "\n";
       my $output = `$cmd`;
       print $output;
@@ -279,7 +311,7 @@ foreach $key (keys %destsubdir) {
    foreach my $dir (@dirnames) {
       next if $dir eq "";
       print "Make the Inner README files.\n";
-      $cmd = "perl ./makeInternal1816README.pl $indirectory/$dir";
+      $cmd = "perl ./makeInternalREADME.pl $indirectory/$dir";
       print $cmd, "\n";
       $output = `$cmd`;
       print $output;
@@ -294,6 +326,7 @@ foreach $key (keys %destsubdir) {
       print $output;
 
       chdir "$indirectory/$dir/bin" or die "Couldn't change directory to $indirectory/$dir/bin, $!";
+
       $cmd = "$scriptdirname/h5rmflags -force";
       $output = `$cmd`;
       print $output;
diff --git a/bin/pkgscrpts/makeInternal1816README.pl b/bin/pkgscrpts/makeInternalREADME.pl
index 1171218..a3bc04f 100755
--- a/bin/pkgscrpts/makeInternal1816README.pl
+++ b/bin/pkgscrpts/makeInternalREADME.pl
@@ -16,9 +16,12 @@ The contents of this directory are:
     bin/        - Directory containing HDF5 pre-compiled utilities
     include/    - Directory containing HDF5 include files
     lib/        - Directory containing HDF5 libraries and settings
-    share/      - Directory containing HDF5 C, C++ and Fortran example
-		  program code and scripts to test compile scripts
-                  h5cc, h5c++ and h5fc
+    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 
@@ -42,39 +45,29 @@ 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 is included with the binaries)
-    bin/h5c++ - for C++ (if C++ is included with the binaries)
+    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:
-
-  1) Run ./h5redeploy in the bin directory to change site specific paths in the scripts.
-
-  2) Edit each script and update the paths for the external libraries
-     in LDFLAGS and CPPFLAGS.
+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 alternative C compiler
-  CLINKERBASE - Name of the alternative linker
+  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 the ./release_docs/
-directory of the HDF5 source code:
-
+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/.
 
-Source code can be found on the THG ftp server in:
-
-    ftp://ftp.hdfgroup.org/HDF5/current/src/
-
-Please send questions, comments, and suggestions to:
-
-    http://hdfgroup.org/about/contact.html 
+Please send questions, comments, and suggestions to the appropriate 
+contact address from http://www.hdfgroup.org/about/contact.html 
 
 
 ";
@@ -85,6 +78,10 @@ my $linktype = "shared";
 if ($indirectory =~ /static/) {
    $linktype = "static";
 }
+my $modestring="";
+if ($indirectory =~ /32/) {
+    $modestring = "in 32 bit mode ";
+}
 
 my $version;
 
@@ -119,17 +116,19 @@ my @hostnamestring = split / /, $hostnamestring;
 $hostname = $hostnamestring[1];
 #my $size = scalar @hostnamestring;
 if ($hostname =~ /loyalty/) {
-   $platformstring = "\nthat was compiled on: " . $hostnamestring[0]." " . $hostnamestring[2]." " . $hostnamestring[-1] . " ";
+   $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0]." " . $hostnamestring[2]." " . $hostnamestring[-1] . " ";
 }
 elsif ($hostname =~ /freedom/) {
-   $platformstring = "\nthat was compiled on: " . $hostnamestring[0]." " . $hostnamestring[2]." " . $hostnamestring[-1] . " ";
+   $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0]." " . $hostnamestring[2]." " . $hostnamestring[-1] . " ";
 } elsif ($hostname =~ /emu/) {
-   $platformstring = "\nthat was compiled on: " . $hostnamestring[0]." " . $hostnamestring[2] . " " . $hostnamestring[-2] . " ";
+   $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 on: " . $hostnamestring[0] . " " . $os . " " . $hostnamestring[-2] . " ";
+   $platformstring = "\nthat was compiled " . $modestring . "on: " . $hostnamestring[0] . " " . $os . " " . $hostnamestring[-2] . " ";
 }
 
 
@@ -155,25 +154,31 @@ print OUTFILE $platformstring."\n\n";
 #   print OUTFILE "compilers:\n\n";
 #}
 #else {
-print OUTFILE "\n\nIt includes the C, C++, and F90 APIs, built using the following\n";
+#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 =~ /gcc482/) {
-   print OUTFILE "\tgcc, g++, and gfortran 4.8.2\n\n";
-   print OUTFILE "\tWarning!\n";
-   print OUTFILE "\tIf the 4.8.2 version is not the system default, the scripts listed below\n";
-   print OUTFILE "\tfor compiling applications will not work unless either the environment\n";
-   print OUTFILE "\tis modified or the full path to the 4.8.2 compiler version is added to\n";
-   print OUTFILE "\tthe scripts in variables CCBASE, CCLINKERBASE for h5cc and corresponding\n";
-   print OUTFILE "\tvariables for other compilers.\n\n";
-} elsif ($hostname =~ /platypus/ || $hostname =~ /ostrich/) {
+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.3\n\n";
+   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/) {
@@ -181,9 +186,11 @@ if ($indirectory =~ /gcc482/) {
 } elsif ($hostname =~ /kite/) {
    print OUTFILE "\tApple clang/clang++ 5.1 from Xcode 5.1 and gfortran 4.8.2\n\n";
 } elsif ($hostname =~ /quail/) {
-   print OUTFILE "\tgcc, g++ 6.0 from Xcode 6.2.0 and gfortran 4.9.2\n\n";
+   print OUTFILE "\tgcc, g++ 6.1 from Xcode 6.2 and gfortran 4.9.2\n\n";
 } elsif ($hostname =~ /osx1010test/) {
-   print OUTFILE "\tgcc, g++ 6.0 from Xcode 7.0.0 and gfortran 4.9.2\n\n";
+   print OUTFILE "\tgcc, g++ 6.1 from Xcode 7.0 and gfortran 4.9.2\n\n";
+} elsif ($hostname =~ /osx1011test/) {
+   print OUTFILE "\tgcc, g++ 7.3 from Xcode 7.3 and gfortran 5.2.0\n\n";
 }
 
 print OUTFILE $section2;
diff --git a/bin/pkgscrpts/makeOuter1816README.pl b/bin/pkgscrpts/makeOuter1816README.pl
deleted file mode 100755
index 0c03a4e..0000000
--- a/bin/pkgscrpts/makeOuter1816README.pl
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/usr/bin/perl
-# makeOuterREADME.pl
-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="";
-
-print $indirectory, "\n";
- 
-if ($indirectory =~ /loyalty/) {
-#   $line1 = "  5-$version-$outsubdir-16API.tar.gz   - Includes C and C++ APIs (using\n";
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C APIs (using\n";
-   $compilerstring = "                                        gcc, g++, and gfortran 4.6.1)\n";
-}
-elsif ($indirectory =~ /freedom/) {
-#   $line1 = "  5-$version-$outsubdir-16API.tar.gz - Includes C and C++ APIs (using\n";
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C APIs (using\n";
-   $compilerstring = "                                        gcc, g++, and gfortran 4.6.1)\n";
-}
-elsif ($indirectory =~ /ostrich/) {
-#   $line1 = "  5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n";
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $compilerstring = "                                        gcc, g++, and gfortran 4.4.7)\n";
-}
-elsif ($indirectory =~ /platypus/) {
-#   $line1 = "  5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n";
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   if ($indirectory =~ /gcc482/) {
-      my $cs1 = "                                        gcc, g++, and gfortran 4.8.2)\n";
-      my $cs2 = "\tWarning!";
-      my $cs3 = "\tIf the 4.8.2 version is not the system default, the scripts listed provided for compiling";
-      my $cs4 = "\tapplications (h5cc, hf5c, etc.) will not work unless either the environment is modified";
-      my $cs5 = "\tor the full path to the 4.8.2 compiler versions is added to the scripts.\n\n";
-      $compilerstring = join "\n", $cs1, $cs2, $cs3, $cs4, $cs5;
-   } else {    
-      $compilerstring = "                                        gcc, g++, and gfortran 4.4.7)\n";
-   }
-}
-elsif ($indirectory =~ /moohan/) {
-#   $line1 = "  5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n";
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $compilerstring = "                                        gcc, g++, and gfortran 4.8.3)\n";
-   }
-} 
-elsif ($indirectory =~ /emu/) {
-#   $line1 = "  5-$version-$outsubdir-16API.tar.gz - Includes C, C++, F90 APIs (using\n";
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $compilerstring = "                                        Sun C and C++ 5.12, Sun Fortran 95 8.6)\n";
-}
-elsif ($indirectory =~ /kite/) {
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $compilerstring = "                                        Apple clang/clang++ 5.1 from Xcode 5.1,
-                                                              gfortran 4.8.2)\n";
-}
-elsif ($indirectory =~ /quail/) {
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $compilerstring = "                                        Apple clang/clang++ 6.0 from Xcode 6.2,
-                                                              gfortran 4.9.2)\n";
-}
-elsif ($indirectory =~ /osx1010test/) {
-   $line3 = "  5-$version-$outsubdir-static.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $line5 = "  5-$version-$outsubdir-shared.tar.gz  - Includes C, C++, F90 APIs (using\n";
-   $compilerstring = "                                        Apple clang/clang++ 6.0 from Xcode 7.0,
-                                                              gfortran 4.9.2)\n";
-}
-
-    print OUTFILE $line3;
-    print OUTFILE $compilerstring."\n";
-if ($line5 ne "") {
-    print OUTFILE $line5;
-    print OUTFILE $compilerstring."\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/bin/pkgscrpts/makeOuterREADME.pl b/bin/pkgscrpts/makeOuterREADME.pl
new file mode 100755
index 0000000..189b79a
--- /dev/null
+++ b/bin/pkgscrpts/makeOuterREADME.pl
@@ -0,0 +1,168 @@
+#!/usr/bin/perl
+# makeOuterREADME.pl
+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.1,
+                                                              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 6.2,
+                                                              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 7.0,
+                                                              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.3.0 from Xcode 7.3,
+                                                              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/bin/pkgscrpts/testbinaries.sh b/bin/pkgscrpts/testbinaries.sh
index eb6279f..98c9f72 100644
--- a/bin/pkgscrpts/testbinaries.sh
+++ b/bin/pkgscrpts/testbinaries.sh
@@ -322,11 +322,11 @@ for f in $FILE_LIST ; do
     done
     if [ -n "$IS_MAC" ]; then  
       # Currently no shared libraries for Fortran are produced on the mac-intel machines
-      SHARED_LIBFILES="libhdf5_cpp.11.dylib libhdf5_hl_cpp.10.dylib libhdf5_hl.10.dylib libhdf5.10.dylib libsz.a"
+      SHARED_LIBFILES="libhdf5_cpp.12.dylib libhdf5_hl_cpp.11.dylib libhdf5_hl.10.dylib libhdf5.10.dylib libsz.a"
     elif [ -n "$IS_PPC64" ]; then
-      SHARED_LIBFILES="libhdf5_cpp.so.11.0.0 libhdf5_fortran.so.10.0.2 libhdf5_hl_cpp.so.10.0.2 libhdf5hl_fortran.so.10.0.2 libhdf5_hl.so.10.0.2 libhdf5.so.10.1.0"
+      SHARED_LIBFILES="libhdf5_cpp.so.12.0.0 libhdf5_fortran.so.10.0.3 libhdf5_hl_cpp.so.11.1.0 libhdf5hl_fortran.so.10.0.3 libhdf5_hl.so.10.1.0 libhdf5.so.10.2.0"
     else
-      SHARED_LIBFILES="libhdf5_cpp.so.9.0.0 libhdf5_fortran.so.9.0.0 libhdf5_hl_cpp.so.9.0.0 libhdf5hl_fortran.so.9.0.0 libhdf5_hl.so.9.0.0 libhdf5.so.9.0.0 libsz.so.2.0.0 libz.so.1.2.5"
+      SHARED_LIBFILES="libhdf5_cpp.so.12.0.0 libhdf5_fortran.so.10.0.3 libhdf5_hl_cpp.so.11.1.0 libhdf5hl_fortran.so.10.0.3 libhdf5_hl.so.10.1.0 libhdf5.so.10.2.0 libsz.so.2.0.0 libz.so.1.2.5"
     fi
     if [ -n "${SHAREDLIBS}" ]; then
       for s in $SHARED_LIBFILES ; do