diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2015-10-16 04:14:57 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2015-10-16 04:14:57 (GMT) |
| commit | 0333b1ff03c9d2ed47604f48af1943a086ef307b (patch) | |
| tree | 22c489ab25f5b14c09ad46b4caee28d28678a2ee | |
| parent | 57583a254a58924b3cbbf662ba988cf76d662a07 (diff) | |
| download | hdf5-0333b1ff03c9d2ed47604f48af1943a086ef307b.zip hdf5-0333b1ff03c9d2ed47604f48af1943a086ef307b.tar.gz hdf5-0333b1ff03c9d2ed47604f48af1943a086ef307b.tar.bz2 | |
[svn-r28096] Updated packaging scripts and moved them from bin to bin/pkgscrpts.
Added shared library version numbers for each wrapper library file.
Tested with h5committest.new.
23 files changed, 518 insertions, 222 deletions
@@ -44,7 +44,7 @@ ./bin/COPYING ./bin/bbrelease _DO_NOT_DISTRIBUTE_ ./bin/buildhdf5 -./bin/build_and_package_hdf5_binaries.sh _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/build_and_package_hdf5_binaries.sh _DO_NOT_DISTRIBUTE_ ./bin/checkapi _DO_NOT_DISTRIBUTE_ ./bin/checkposix _DO_NOT_DISTRIBUTE_ ./bin/chkconfigure _DO_NOT_DISTRIBUTE_ @@ -54,14 +54,14 @@ ./bin/compile ./bin/config.guess ./bin/config.sub -./bin/debug-ohdr _DO_NOT_DISTRIBUTE_ +./bin/debug-ohdr _DO_NOT_DISTRIBUTE_ ./bin/dependencies ./bin/depcomp ./bin/deploy ./bin/distdep -./bin/errors _DO_NOT_DISTRIBUTE_ +./bin/errors _DO_NOT_DISTRIBUTE_ ./bin/gcov_script _DO_NOT_DISTRIBUTE_ -./bin/genltanalyze _DO_NOT_DISTRIBUTE_ +./bin/genltanalyze _DO_NOT_DISTRIBUTE_ ./bin/h5vers ./bin/install-sh ./bin/iostats @@ -71,22 +71,22 @@ ./bin/make_overflow ./bin/make_vers ./bin/makehelp -./bin/make1814TarFiles.pl _DO_NOT_DISTRIBUTE_ -./bin/makeInternal1814README.pl _DO_NOT_DISTRIBUTE_ -./bin/makeOuter1814README.pl _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/make1814TarFiles.pl _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/makeInternal1814README.pl _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/makeOuter1814README.pl _DO_NOT_DISTRIBUTE_ ./bin/missing ./bin/mkdirs ./bin/mkinstalldirs ./bin/newer -./bin/reconfigure _DO_NOT_DISTRIBUTE_ +./bin/reconfigure _DO_NOT_DISTRIBUTE_ ./bin/output_filter.sh ./bin/release -./bin/runtest _DO_NOT_DISTRIBUTE_ +./bin/runtest _DO_NOT_DISTRIBUTE_ ./bin/snapshot -./bin/snapshot_version _DO_NOT_DISTRIBUTE_ +./bin/snapshot_version _DO_NOT_DISTRIBUTE_ ./bin/test-driver -./bin/testh51814binary.sh _DO_NOT_DISTRIBUTE_ -./bin/timekeeper _DO_NOT_DISTRIBUTE_ +./bin/pkgscrpts/testh51814binary.sh _DO_NOT_DISTRIBUTE_ +./bin/timekeeper _DO_NOT_DISTRIBUTE_ ./bin/trace ./bin/yodconfigure @@ -243,6 +243,14 @@ if ($set) { @newver = @curver; } +# Note if the new version is for an official release. +# if the fourth version field is empty or contains "patch", +# "currently under development" shouldn't be printed as +# part of the version string. +my $is_official_release=""; +if ($newver[3] eq "" || $newver[3] =~ /patch\d/) { + $is_official_release="true"; +} # Note if the version increased or decreased my $version_increased=""; # Print a warning if the version got smaller (don't check annot field) @@ -276,25 +284,29 @@ if ($LT_VERS && $version_increased) { close FILE; local($_) = $contentsy; - - my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m; - my $new_lt_revision = $lt_revision+1; - ($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m; - - open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n"; - print FILE $contentsy; - close FILE; + + # As of the HDF5 v1.8.16 release, h5vers should not increment + # the LT_VERS numbers, so the next 6 lines are commented out. + # A future version may copy the numbers to H5public.h, so this + # section is retained for future reference. + #my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m; + #my $new_lt_revision = $lt_revision+1; + #($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m; + + #open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n"; + #print FILE $contentsy; + #close FILE; } + # Update the README.txt file if ($README) { open FILE, $README or die "$README: $!\n"; my @contents = <FILE>; close FILE; - $contents[0] = sprintf("HDF5 version %d.%d.%d%s %s", + $contents[0] = sprintf("HDF5 version %d.%d.%d%s\n", @newver[0,1,2], - $newver[3] eq "" ? "" : "-".$newver[3], - "currently under development\n"); + $is_official_release ? $newver[3] eq "" ? "" : "-".$newver[3] : "-".$newver[3]." currently under development"); open FILE, ">$README" or die "$README: $!\n"; print FILE @contents; close FILE; @@ -305,10 +317,9 @@ if ($RELEASE) { open FILE, $RELEASE or die "$RELEASE: $!\n"; my @contents = <FILE>; close FILE; - $contents[0] = sprintf("HDF5 version %d.%d.%d%s %s", + $contents[0] = sprintf("HDF5 version %d.%d.%d%s\n", @newver[0,1,2], - $newver[3] eq "" ? "" : "-".$newver[3], - "currently under development\n"); + $is_official_release ? $newver[3] eq "" ? "" : "-".$newver[3] : "-".$newver[3]." currently under development"); open FILE, ">$RELEASE" or die "$RELEASE: $!\n"; print FILE @contents; close FILE; @@ -317,10 +328,9 @@ if ($RELEASE) { # Update the c++/src/cpp_doc_config file if ($CPP_DOC_CONFIG) { my $data = read_file($CPP_DOC_CONFIG); - my $version_string = sprintf("\"%d.%d.%d%s %s\"", - @newver[0,1,2], - $newver[3] eq "" ? "" : "-".$newver[3], - "currently under development"); + my $version_string = sprintf("\"%d.%d.%d%s\"", + @newver[0,1,2], + $is_official_release ? $newver[3] eq "" ? "" : "-".$newver[3] : "-".$newver[3]." currently under development"); $data =~ s/PROJECT_NUMBER\s*=.*/PROJECT_NUMBER = $version_string/; diff --git a/bin/build_and_package_hdf5_binaries.sh b/bin/pkgscrpts/build_and_package_hdf5_binaries.sh index b6f67b5..1f6699b 100644 --- a/bin/build_and_package_hdf5_binaries.sh +++ b/bin/pkgscrpts/build_and_package_hdf5_binaries.sh @@ -134,7 +134,7 @@ if [ -f $LOGFILE ]; then fi ) -#(cd $HOME/snapshots-bin-${sw}${SWVERSTR}; touch $REPOLOG; $CMD -nodiff -norepo -all) > $LOGFILE 2>&1 +(cd $HOME/snapshots-bin-${sw}${SWVERSTR}; touch $REPOLOG; $CMD -nodiff -norepo -all) > $LOGFILE 2>&1 # Verify test script did complete by checking the last lines #(tail -4 $LOGFILE | grep -s "^*** finished .* in $HOSTNAME ***" > /dev/null 2>&1) || @@ -163,7 +163,7 @@ if [ $errcode -eq 0 ]; then DEPLOYDIR=`grep "deploydir \/mnt" ./snaptest.cfg | sed "s/^.*deploydir //"` echo "Make binary tar files from deployed files in $DEPLOYDIR in $BINARYDIR" CURRENT_DIR=`pwd` - cd current/bin;perl ./make1814TarFiles.pl $DEPLOYDIR $BINARYDIR + cd current/bin;perl ./make1816TarFiles.pl $DEPLOYDIR $BINARYDIR cd $CURRENT_DIR else echo "errcode was $errcode; no tar files were created." diff --git a/bin/pkgscrpts/h5rmflags b/bin/pkgscrpts/h5rmflags new file mode 100755 index 0000000..8bb28d3 --- /dev/null +++ b/bin/pkgscrpts/h5rmflags @@ -0,0 +1,169 @@ +#! /bin/sh +# +# 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 script wasextracted from h5redeploy to find hdf5 compile scripts and +## remove build paths from hdf5 compile scripts. Script is intended to be +## called from the make18xxTarFiles.pl script, so it could be stripped of options. +## Actions are predetermined and written in this script instead of in a command +## file. + +# Constants definitions +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +# Function definitions + +# show help page +usage() { + # A wonderfully informative "usage" message. + echo "usage: $prog_name [OPTIONS]" + echo " OPTIONS:" + echo " -help|help This help message" + echo " -echo Show all the shell commands executed" + echo " -force No prompt, just do it" + echo " -prefix=DIR New directory to find HDF5 lib/ and include/" + echo " subdirectories [default: current directory]" + echo " -tool=TOOL Tool to update. TOOL must be in the current" + echo " directory and writable. [default: $h5tools]" + echo " -show Show the commands without executing them" + echo " " + exit $EXIT_FAILURE +} + +# display variable values +dump_vars(){ + echo "====Showing all variable values=====" + echo prefix=$prefix + echo h5tools=$h5tools + echo "====End Showing=====" +} + +# show actions to be taken +show_action() +{ + echo "Update the following tools because they are now installed at a new directory" + for t in $foundtools; do + echo "${t}:" + echo " current setting=`sed -e '/^prefix=/s/prefix=//p' -e d $t`" + echo " new setting="\""$prefix"\" + done +} + + +# Report Error message +ERROR() +{ + echo "***ERROR***" + echo "$1" +} + +# Main +# +# Initialization +h5tools="h5cc h5pcc h5fc h5pfc h5c++" # possible hdf5 tools +foundtools= # tools found and will be modified +fmode= # force mode, default is off +prefix=`(cd ..;pwd)` + +# Parse options +for arg in $@ ; do + case "$arg" in + -prefix=*) + prefix="`expr "$arg" : '-prefix=\(.*\)'`" + ;; + -echo) + set -x + ;; + -show) + SHOW="echo" + ;; + -tool=*) + h5tools="`expr "$arg" : '-tool=\(.*\)'`" + ;; + -help|help) + usage + ;; + -force) + fmode=yes + ;; + *) + ERROR "Unknown Option($arg)" + usage + exit $EXIT_FAILURE + ;; + esac +done + +# Sanity checks +#if [ ! -d $prefix ]; then +# ERROR "prefix($prefix) is not an existing directory" +# exit $EXIT_FAILURE +#fi + +for x in $h5tools; do + if [ -f $x ]; then + foundtools="$foundtools $x" + if [ ! -w $x ]; then + ERROR "h5tool($x) is not writable" + exit $EXIT_FAILURE + fi + fi +done + +if [ -z "$foundtools" ]; then + ERROR "found no tools to modify" + exit $EXIT_FAILURE +fi + +# Show actions to be taken and get consent +show_action + + +# Update them +if [ "$SHOW" = "echo" ]; then + echo "===Update commands are:====" +# cat $CMDFILE + echo "===End Update commands=====" +fi + +for t in $foundtools; do + echo Update $t ... +# COMMAND="ed - $t" +# if [ "$SHOW" = "echo" ]; then +# echo $COMMAND +# else +# $COMMAND < $CMDFILE + ed - $t << end + g/^H5BLD_CPPFLAGS/s/-I\/.*include //g + g/^H5BLD_LDFLAGS/s/-L\/.*lib //g + g/^H5BLD_LDFLAGS/s/-L\/.*lib64 //g + . + w +end +# fi +done + + +# Cleanup +#rm -f $CMDFILE +exit $EXIT_SUCCESS + +# Some possible future features to add +# CCBASE - Name of the alternative C compiler +# CLINKERBASE - Name of the alternative linker +# LDFLAGS - Path to different libraries your application will link with +# (this path should include the path to the zlib library) +# LIBS - Libraries your application will link with diff --git a/bin/make1814TarFiles.pl b/bin/pkgscrpts/make1816TarFiles.pl index 9ff3b91..64cb7e0 100755 --- a/bin/make1814TarFiles.pl +++ b/bin/pkgscrpts/make1816TarFiles.pl @@ -4,54 +4,29 @@ use warnings; use strict; use Cwd; - - - -my %destsubdir = ('duck' => 'mac-lion-x86_64', - 'emu' => 'solaris', - 'emu64' => 'solaris64', - 'freedom' => 'freebsd-amd64', - 'jam' => 'linux', - 'jamgnu482' => 'linux-gnu482', - 'koala' => 'linux-x86_64', - 'koalagnu482' => 'linux-x86_64-gnu482', - 'loyalty' => 'freebsd', - 'ostrich' => 'linux-ppc64', - 'ostrichxl' => 'linux-ppc64xl', - 'platypus' => 'linux-centos6-x86_64', - 'hdf-duck' => 'mac-lion-x86_64', - 'kite' => 'mac-mountainlion-x86_64', - 'quail' => 'mac-mavericks-x86_64'); -#my %destsubdir = ('jam' => 'linux', -# 'jamgnu481' => 'linux-gnu481', -# 'koalagnu481' => 'linux-x86_64-gnu481', -# 'koala' => 'linux-x86_64'); - - -my %szipdir = ('duck' => '/mnt/hdf/packages/szip/shared/encoder/macOS-10.8', - 'duck-static' => '/mnt/hdf/packages/szip/static/encoder/mac-intel-x86_64', - 'emu' => '/mnt/hdf/packages/szip/shared/encoder/SunOS-5.10', +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', + 'kite' => 'osx-10.8-x86_64-clang5.1', + 'quail' => 'osx-10.9-x86_64-clang6.0', + 'osx1010test' => 'osx-10.10-x86_64-clang6.0'); + + +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', - 'hdf-duck' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8', - 'hdf-duck-static' => '/mnt/hdf/packages/szip/static/encoder/mac-intel-x86_64', - 'jam' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-gcc', - 'jamgnu482' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-gcc', - 'jam-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-gcc', - 'jamgnu482-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-gcc', 'kite' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8', 'kite-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8', - 'koala' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc', - 'koalagnu482' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc', - 'koala-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-x86_64-gcc', - 'koalagnu482-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-x86_64-gcc', - 'jam-new' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-gcc', - 'jam-new-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-gcc', - 'koala-new' => '/mnt/hdf/packages/szip/shared/encoder/Linux2.6-x86_64-gcc', - 'koala-new-static' => '/mnt/hdf/packages/szip/static/encoder/Linux2.6-x86_64-gcc', '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', @@ -62,35 +37,19 @@ my %szipdir = ('duck' => '/mnt/hdf/packages/szip/shared/encoder/macOS-10.8', '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', + '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', 'quail' => '/mnt/hdf/packages/szip/shared/encoder/MacOS-10.8', 'quail-static' => '/mnt/hdf/packages/szip-PIC/static/encoder/MacOS-10.8'); -my %zlibdir = ('duck' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64', - 'duck-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64', - 'emu' => '/mnt/hdf/packages/zlib-125/shared/SunOS-5.10', +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', - 'fred' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64', - 'fred-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64', 'freedom' => '/mnt/hdf/packages/zlib-125/shared/FreeBSD-64', 'freedom-static' => '/mnt/hdf/packages/zlib-125/static/FreeBSD-64', - 'hdf-duck' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64', - 'hdf-duck-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64', - 'jam' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-gcc', - 'jamgnu482' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-gcc', - 'jam-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-gcc', - 'jamgnu482-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-gcc', 'kite' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64', 'kite-static' => ' /mnt/hdf/packages/zlib-125/static/mac-intel-x86_64', - 'koala' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-x86_64-gcc', - 'koalagnu482' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-x86_64-gcc', - 'koala-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-x86_64-gcc', - 'koalagnu482-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-x86_64-gcc', - 'jam-new' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-gcc', - 'jam-new-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-gcc', - 'koala-new' => '/mnt/hdf/packages/zlib-125/shared/Linux2.6-x86_64-gcc', - 'koala-new-static' => '/mnt/hdf/packages/zlib-125/static/Linux2.6-x86_64-gcc', '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', @@ -101,8 +60,12 @@ my %zlibdir = ('duck' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_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', + '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', 'quail' => ' /mnt/hdf/packages/zlib-125/shared/mac-intel-x86_64', - 'quail-static' => ' /mnt/hdf/packages/zlib-125/static/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'); my $indirectory = "."; $indirectory = shift; @@ -113,6 +76,8 @@ $outdirectory = shift; my $key = "."; #$key = shift; +my $scriptdirname = dirname(__FILE__); + unless (-d $outdirectory) { print "$outdirectory not found. Create it or choose another one and try again.\n"; exit 1; @@ -166,7 +131,7 @@ sub addzandszlibs { print $output; chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; - } elsif ($dir eq "duck" || $dir eq "quail" || $dir eq "kite") { + } elsif ($dir eq "osx1010test" || $dir eq "quail" || $dir eq "kite") { #we've been using the static libraries for the macs - built with -fPIC # $cmd = "cp $szdir/lib/libsz.a $indirectory/$dir/lib"; # $output = `$cmd`; @@ -299,7 +264,7 @@ foreach $key (keys %destsubdir) { } else { print "Make the Outer README file: "; - $cmd = "perl ./makeOuter1814README.pl $indirectory/$key $outdirectory $directoryname"; + $cmd = "perl ./makeOuter1816README.pl $indirectory/$key $outdirectory $directoryname"; print $cmd, "\n"; my $output = `$cmd`; print $output; @@ -314,16 +279,22 @@ foreach $key (keys %destsubdir) { foreach my $dir (@dirnames) { next if $dir eq ""; print "Make the Inner README files.\n"; - $cmd = "perl ./makeInternal1814README.pl $indirectory/$dir"; + $cmd = "perl ./makeInternal1816README.pl $indirectory/$dir"; print $cmd, "\n"; $output = `$cmd`; print $output; print "Add the zlib and szip files for $dir.\n"; &addzandszlibs($dir, $indirectory); my $currentdir = getcwd(); - + + print "Remove all lib*.la files from $dir/lib*.\n"; + $cmd = "rm $indirectory/$dir/lib*/lib*.la"; + print $cmd, "\n"; + $output = `$cmd`; + print $output; + chdir "$indirectory/$dir/bin" or die "Couldn't change directory to $indirectory/$dir/bin, $!"; - $cmd = "/home/lrknox/hdf/release_scripts/h5rmflags -force"; + $cmd = "$scriptdirname/h5rmflags -force"; $output = `$cmd`; print $output; chdir $currentdir or die "Couldn't change directory back to $currentdir, $!"; diff --git a/bin/makeInternal1814README.pl b/bin/pkgscrpts/makeInternal1816README.pl index 624f9cb..1171218 100755 --- a/bin/makeInternal1814README.pl +++ b/bin/pkgscrpts/makeInternal1816README.pl @@ -125,8 +125,6 @@ elsif ($hostname =~ /freedom/) { $platformstring = "\nthat was compiled on: " . $hostnamestring[0]." " . $hostnamestring[2]." " . $hostnamestring[-1] . " "; } elsif ($hostname =~ /emu/) { $platformstring = "\nthat was compiled on: " . $hostnamestring[0]." " . $hostnamestring[2] . " " . $hostnamestring[-2] . " "; -} elsif ($hostname =~ /fred/) { - $platformstring = "\nthat was compiled on: " . $hostnamestring[0]." " . $hostnamestring[2] . " " . $hostnamestring[-1] . " "; } else { $_ = $hostnamestring[2]; my $pos = index $_, '-'; @@ -164,22 +162,28 @@ 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 =~ /gnu482/) { +if ($indirectory =~ /gcc482/) { print OUTFILE "\tgcc, g++, and gfortran 4.8.2\n\n"; -} elsif ($hostname =~ /jam/ || $hostname =~ /koala/) { - print OUTFILE "\tgcc, g++, and gfortran 4.1.2\n\n"; -} elsif ($hostname =~ /platypus/) { + 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/) { print OUTFILE "\tgcc, g++, and gfortran 4.4.7\n\n"; +} elsif ($hostname =~ /moohan/) { + print OUTFILE "\tgcc, g++, and gfortran 4.8.3\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/) { print OUTFILE "\tgcc, g++, and gfortran 4.6.1\n\n"; -} elsif ($hostname =~ /duck/) { - print OUTFILE "\tApple clang/clang++ 3.0 from Xcode 4.6.1 and gfortran 4.8.2\n\n"; } elsif ($hostname =~ /kite/) { - print OUTFILE "\tApple clang/clang++ 5.1 from Xcode 5.0.2 and gfortran 4.8.2\n\n"; + 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++ 5.1 from Xcode 5.1 and gfortran 4.8.2\n\n"; + print OUTFILE "\tgcc, g++ 6.0 from Xcode 6.2.0 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 $section2; diff --git a/bin/makeOuter1814README.pl b/bin/pkgscrpts/makeOuter1816README.pl index 6218ecc..0c03a4e 100755 --- a/bin/makeOuter1814README.pl +++ b/bin/pkgscrpts/makeOuter1816README.pl @@ -81,26 +81,22 @@ 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"; - $compilerstring = " gcc, g++, and gfortran 4.4.7)\n"; -} -elsif ($indirectory =~ /jam/) { -# $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 =~ /gnu482/) { - $compilerstring = " gcc, g++, and gfortran 4.8.2)\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.1.2)\n"; + $compilerstring = " gcc, g++, and gfortran 4.4.7)\n"; } } -elsif ($indirectory =~ /koala/) { +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"; - if ($indirectory =~ /gnu482/) { - $compilerstring = " gcc, g++, and gfortran 4.8.2)\n"; - } else { - $compilerstring = " gcc, g++, and gfortran 4.1.2)\n"; + $compilerstring = " gcc, g++, and gfortran 4.8.3)\n"; } } elsif ($indirectory =~ /emu/) { @@ -109,23 +105,23 @@ elsif ($indirectory =~ /emu/) { $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 =~ /duck/) { - $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++ 3.0 from Xcode 4.6.1, - gfortran 4.6.2)\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.0 from Xcode 5.0.2, + $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++ 5.1 from Xcode 5.1, - gfortran 4.8.2)\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; diff --git a/bin/testh51814binary.sh b/bin/pkgscrpts/testbinaries.sh index 531ef8f..eb6279f 100644 --- a/bin/testh51814binary.sh +++ b/bin/pkgscrpts/testbinaries.sh @@ -19,6 +19,23 @@ EXAMPLE1LOG="" EXAMPLE2LOG="" FAILED_TEST_LOGS="" +# for the 1.8.14 release, binaries built with gcc 4.8.2 need the compiler +# directory added to the front of the PATH. +USING_482="" +USING_482=`ls | grep 482` +if [ -n "$USING_482" ] ; then + PATH=/opt/gcc/4.8.2/bin:$PATH + export PATH + check_gfortran=`file /opt/gcc/4.8.2/bin/gfortran | grep 32-bit` + RETVAL=$? + if [ "$RETVAL" = "0" ]; then + LD_LIBRARY_PATH=/opt/gcc/4.8.2/lib + else + LD_LIBRARY_PATH=/opt/gcc/4.8.2/lib64 + fi + export LD_LIBRARY_PATH +fi + # step 0: Check presence of top-level README file STEP0RESULT=0 README_FILE="" @@ -305,9 +322,9 @@ 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.9.dylib libhdf5_hl_cpp.9.dylib libhdf5_hl.9.dylib libhdf5.9.dylib libsz.a" + SHARED_LIBFILES="libhdf5_cpp.11.dylib libhdf5_hl_cpp.10.dylib libhdf5_hl.10.dylib libhdf5.10.dylib libsz.a" elif [ -n "$IS_PPC64" ]; then - 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" + 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" 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" fi @@ -428,6 +445,7 @@ for f in $FILE_LIST ; do rm -rf hdf5-examples fi svn co https://svn.hdfgroup.uiuc.edu/hdf5-examples/trunk/ hdf5-examples > checkout.log + CC=$THIS_DIR/$EXTRACTED/bin/h5cc export CC FC=$THIS_DIR/$EXTRACTED/bin/h5fc diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am index 84af348..6cd4768 100644 --- a/c++/src/Makefile.am +++ b/c++/src/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src lib_LTLIBRARIES=libhdf5_cpp.la # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am) -libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_cpp_la_LDFLAGS= -version-info $(LT_CXX_VERS_INTERFACE):$(LT_CXX_VERS_REVISION):$(LT_CXX_VERS_AGE) $(AM_LDFLAGS) bin_SCRIPTS=h5c++ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 2acaf12..f1491ea 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -673,12 +673,30 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 11 LT_VERS_REVISION = 0 LT_VERS_AGE = 1 +LT_CXX_VERS_INTERFACE = 11 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 10 +LT_F_VERS_REVISION = 2 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 10 +LT_HL_VERS_REVISION = 2 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 10 +LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 10 +LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 10 +LT_TOOLS_VERS_REVISION = 2 +LT_TOOLS_VERS_AGE = 0 # This is our main target lib_LTLIBRARIES = libhdf5_cpp.la # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am) -libhdf5_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_cpp_la_LDFLAGS = -version-info $(LT_CXX_VERS_INTERFACE):$(LT_CXX_VERS_REVISION):$(LT_CXX_VERS_AGE) $(AM_LDFLAGS) bin_SCRIPTS = h5c++ # Source files for the library diff --git a/config/lt_vers.am b/config/lt_vers.am index ed7de1b..c1d11cc 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -39,11 +39,31 @@ LT_VERS_AGE = 1 ## ## Note that this versioning system doesn't attempt to handle ## the effects of the H5_V1_x_COMPAT flag. -## -## Since the revision number is automatically incremented by -## bin/h5vers, don't move LT_VERS_REVISION from the fourth line -## without also editing the script! +## Version numbers for wrapper shared library files. +LT_CXX_VERS_INTERFACE = 11 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 + +LT_F_VERS_INTERFACE = 10 +LT_F_VERS_REVISION = 2 +LT_F_VERS_AGE = 0 + +LT_HL_VERS_INTERFACE = 10 +LT_HL_VERS_REVISION = 2 +LT_HL_VERS_AGE = 0 + +LT_HL_CXX_VERS_INTERFACE = 10 +LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_AGE = 0 + +LT_HL_F_VERS_INTERFACE = 10 +LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_AGE = 0 + +LT_TOOLS_VERS_INTERFACE = 10 +LT_TOOLS_VERS_REVISION = 2 +LT_TOOLS_VERS_AGE = 0 # Copyright by The HDF Group. # Copyright by the Board of Trustees of the University of Illinois. @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 28012 2015-10-08 21:47:38Z lrknox . +# From configure.ac Id: configure.ac 28033 2015-10-11 13:51:41Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for HDF5 1.8.17-snap1. # diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index a4b3843..b199bce 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -32,7 +32,7 @@ AM_FCLIBS=$(LIBHDF5) lib_LTLIBRARIES=libhdf5_fortran.la # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am) -libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS) # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index e23aab7..749e76b 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -726,13 +726,31 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 11 LT_VERS_REVISION = 0 LT_VERS_AGE = 1 +LT_CXX_VERS_INTERFACE = 11 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 10 +LT_F_VERS_REVISION = 2 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 10 +LT_HL_VERS_REVISION = 2 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 10 +LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 10 +LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 10 +LT_TOOLS_VERS_REVISION = 2 +LT_TOOLS_VERS_AGE = 0 AM_FCLIBS = $(LIBHDF5) # This is our main target, the fortran library lib_LTLIBRARIES = libhdf5_fortran.la # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am) -libhdf5_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_fortran_la_LDFLAGS = -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS) @BUILD_PARALLEL_CONDITIONAL_FALSE@PARALLEL_COND_SRC = HDF5.f90 # Include HDF5.f90 if parallel is disabled, HDF5mpiof* if parallel is enabled diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index b268948..c78f5fa 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src lib_LTLIBRARIES=libhdf5_hl_cpp.la # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am) -libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_HL_CXX_VERS_INTERFACE):$(LT_HL_CXX_VERS_REVISION):$(LT_HL_CXX_VERS_AGE) $(AM_LDFLAGS) # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 7ff2405..4617d79 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -664,12 +664,30 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 11 LT_VERS_REVISION = 0 LT_VERS_AGE = 1 +LT_CXX_VERS_INTERFACE = 11 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 10 +LT_F_VERS_REVISION = 2 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 10 +LT_HL_VERS_REVISION = 2 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 10 +LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 10 +LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 10 +LT_TOOLS_VERS_REVISION = 2 +LT_TOOLS_VERS_AGE = 0 # This is our main target lib_LTLIBRARIES = libhdf5_hl_cpp.la # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am) -libhdf5_hl_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_cpp_la_LDFLAGS = -version-info $(LT_HL_CXX_VERS_INTERFACE):$(LT_HL_CXX_VERS_REVISION):$(LT_HL_CXX_VERS_AGE) $(AM_LDFLAGS) # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index 512c2c8..f4d39e3 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -30,7 +30,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s lib_LTLIBRARIES=libhdf5hl_fortran.la # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am) -libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS) # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index ade1ead..25240f0 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -682,12 +682,30 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 11 LT_VERS_REVISION = 0 LT_VERS_AGE = 1 +LT_CXX_VERS_INTERFACE = 11 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 10 +LT_F_VERS_REVISION = 2 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 10 +LT_HL_VERS_REVISION = 2 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 10 +LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 10 +LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 10 +LT_TOOLS_VERS_REVISION = 2 +LT_TOOLS_VERS_AGE = 0 # Our main target, the high-level fortran library lib_LTLIBRARIES = libhdf5hl_fortran.la # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am) -libhdf5hl_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5hl_fortran_la_LDFLAGS = -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS) # Source files for the library #if BUILD_PARALLEL_CONDITIONAL diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index 6ca95c54..36591d3 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -1641,229 +1641,229 @@ yyreduce: switch (yyn) { case 2: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 101 "H5LTparse.y" { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ } break; case 3: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 102 "H5LTparse.y" { return (yyval.hid);} break; case 13: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 116 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); } break; case 14: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 117 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); } break; case 15: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 118 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); } break; case 16: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 119 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); } break; case 17: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 120 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); } break; case 18: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 121 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); } break; case 19: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 122 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); } break; case 20: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 123 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); } break; case 21: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 124 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); } break; case 22: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 125 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); } break; case 23: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 126 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); } break; case 24: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 127 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); } break; case 25: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 128 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); } break; case 26: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 129 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); } break; case 27: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 130 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); } break; case 28: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 131 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); } break; case 29: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 132 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); } break; case 30: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 133 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); } break; case 31: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 134 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); } break; case 32: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 135 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); } break; case 33: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 136 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); } break; case 34: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 137 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); } break; case 35: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 138 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); } break; case 36: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 139 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); } break; case 37: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 140 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); } break; case 38: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 141 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); } break; case 39: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 142 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); } break; case 40: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 145 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); } break; case 41: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 146 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); } break; case 42: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 147 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); } break; case 43: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 148 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); } break; case 44: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 149 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); } break; case 45: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 150 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); } break; case 46: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 151 "H5LTparse.y" { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); } break; case 47: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 155 "H5LTparse.y" { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ } break; case 48: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 157 "H5LTparse.y" { (yyval.hid) = cmpd_stack[csindex].id; cmpd_stack[csindex].id = 0; @@ -1873,13 +1873,13 @@ yyreduce: break; case 51: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 166 "H5LTparse.y" { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ } break; case 52: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 168 "H5LTparse.y" { size_t origin_size, new_size; @@ -1915,7 +1915,7 @@ yyreduce: break; case 53: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 201 "H5LTparse.y" { (yyval.sval) = yylval.sval; @@ -1923,25 +1923,25 @@ yyreduce: break; case 54: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 206 "H5LTparse.y" { (yyval.ival) = 0; } break; case 55: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 208 "H5LTparse.y" { (yyval.ival) = yylval.ival; } break; case 57: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 212 "H5LTparse.y" { asindex++; /*pushd onto the stack*/ } break; case 58: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 214 "H5LTparse.y" { (yyval.hid) = H5Tarray_create2((yyvsp[(5) - (6)].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims); @@ -1952,13 +1952,13 @@ yyreduce: break; case 61: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 224 "H5LTparse.y" { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ } break; case 62: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 225 "H5LTparse.y" { unsigned ndims = arr_stack[asindex].ndims; arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; @@ -1968,19 +1968,19 @@ yyreduce: break; case 65: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 236 "H5LTparse.y" { (yyval.hid) = H5Tvlen_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); } break; case 66: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 241 "H5LTparse.y" { is_opq_size = 1; } break; case 67: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 242 "H5LTparse.y" { size_t size = (size_t)yylval.ival; @@ -1990,13 +1990,13 @@ yyreduce: break; case 68: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 247 "H5LTparse.y" { is_opq_tag = 1; } break; case 69: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 248 "H5LTparse.y" { H5Tset_tag((yyvsp[(7) - (13)].hid), yylval.sval); @@ -2005,19 +2005,19 @@ yyreduce: break; case 70: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 252 "H5LTparse.y" { (yyval.hid) = (yyvsp[(7) - (15)].hid); } break; case 73: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 260 "H5LTparse.y" { is_str_size = 1; } break; case 74: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 261 "H5LTparse.y" { if((yyvsp[(5) - (6)].ival) == H5T_VARIABLE_TOKEN) @@ -2029,7 +2029,7 @@ yyreduce: break; case 75: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 269 "H5LTparse.y" { if((yyvsp[(9) - (10)].ival) == H5T_STR_NULLTERM_TOKEN) @@ -2042,7 +2042,7 @@ yyreduce: break; case 76: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 278 "H5LTparse.y" { if((yyvsp[(13) - (14)].ival) == H5T_CSET_ASCII_TOKEN) @@ -2053,7 +2053,7 @@ yyreduce: break; case 77: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 285 "H5LTparse.y" { if((yyvsp[(17) - (18)].hid) == H5T_C_S1_TOKEN) @@ -2064,7 +2064,7 @@ yyreduce: break; case 78: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 292 "H5LTparse.y" { hid_t str_id = (yyvsp[(19) - (20)].hid); @@ -2085,67 +2085,67 @@ yyreduce: break; case 79: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 309 "H5LTparse.y" {(yyval.ival) = H5T_VARIABLE_TOKEN;} break; case 81: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 312 "H5LTparse.y" {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;} break; case 82: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 313 "H5LTparse.y" {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;} break; case 83: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 314 "H5LTparse.y" {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;} break; case 84: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 316 "H5LTparse.y" {(yyval.ival) = H5T_CSET_ASCII_TOKEN;} break; case 85: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 317 "H5LTparse.y" {(yyval.ival) = H5T_CSET_UTF8_TOKEN;} break; case 86: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 319 "H5LTparse.y" {(yyval.hid) = H5T_C_S1_TOKEN;} break; case 87: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 320 "H5LTparse.y" {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;} break; case 88: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 324 "H5LTparse.y" { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); } break; case 89: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 326 "H5LTparse.y" { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; } break; case 92: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 331 "H5LTparse.y" { is_enum_memb = 1; /*indicate member of enum*/ @@ -2158,7 +2158,7 @@ yyreduce: break; case 93: -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 340 "H5LTparse.y" { char char_val=(char)yylval.ival; @@ -2205,7 +2205,7 @@ yyreduce: break; -/* Line 1807 of yacc.c */ +/* Line 1792 of yacc.c */ #line 2191 "H5LTparse.c" default: break; } diff --git a/hl/src/H5LTparse.h b/hl/src/H5LTparse.h index 621dacd..1461830 100644 --- a/hl/src/H5LTparse.h +++ b/hl/src/H5LTparse.h @@ -109,7 +109,7 @@ extern int H5LTyydebug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 2065 of yacc.c */ +/* Line 2058 of yacc.c */ #line 68 "H5LTparse.y" int ival; /*for integer token*/ @@ -117,7 +117,7 @@ typedef union YYSTYPE hid_t hid; /*for hid_t token*/ -/* Line 2065 of yacc.c */ +/* Line 2058 of yacc.c */ #line 122 "H5LTparse.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 diff --git a/hl/src/Makefile.am b/hl/src/Makefile.am index 09c24dc..f2b90d0 100644 --- a/hl/src/Makefile.am +++ b/hl/src/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src lib_LTLIBRARIES=libhdf5_hl.la # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am) -libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS) # List sources to include in the HDF5 HL Library. libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index a1cbcc7..d350979 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -663,12 +663,30 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 11 LT_VERS_REVISION = 0 LT_VERS_AGE = 1 +LT_CXX_VERS_INTERFACE = 11 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 10 +LT_F_VERS_REVISION = 2 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 10 +LT_HL_VERS_REVISION = 2 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 10 +LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 10 +LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 10 +LT_TOOLS_VERS_REVISION = 2 +LT_TOOLS_VERS_AGE = 0 # This library is our main target. lib_LTLIBRARIES = libhdf5_hl.la # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am) -libhdf5_hl_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_la_LDFLAGS = -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS) # List sources to include in the HDF5 HL Library. libhdf5_hl_la_SOURCES = H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c diff --git a/src/Makefile.in b/src/Makefile.in index fdbbc8e..65eaf02 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -721,6 +721,24 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 11 LT_VERS_REVISION = 0 LT_VERS_AGE = 1 +LT_CXX_VERS_INTERFACE = 11 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 10 +LT_F_VERS_REVISION = 2 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 10 +LT_HL_VERS_REVISION = 2 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 10 +LT_HL_CXX_VERS_REVISION = 2 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 10 +LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 10 +LT_TOOLS_VERS_REVISION = 2 +LT_TOOLS_VERS_AGE = 0 # Our main target, the HDF5 library lib_LTLIBRARIES = libhdf5.la |