summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-07-24 21:48:11 (GMT)
committerGitHub <noreply@github.com>2023-07-24 21:48:11 (GMT)
commit31cbc8965f5dca7eefb923f928071a7618896ff6 (patch)
treed031d74ab0f2eb74e57afb49b63270c3835bd014
parent9d7760b25cc2ebae68074fb4dd501182b0d201e9 (diff)
downloadhdf5-31cbc8965f5dca7eefb923f928071a7618896ff6.zip
hdf5-31cbc8965f5dca7eefb923f928071a7618896ff6.tar.gz
hdf5-31cbc8965f5dca7eefb923f928071a7618896ff6.tar.bz2
sync bin dir with develop (#3269)
-rw-r--r--COPYING2
-rwxr-xr-xbin/buildhdf52
-rwxr-xr-xbin/chkcopyright6
-rwxr-xr-xbin/cmakehdf59
-rwxr-xr-xbin/format_source18
-rwxr-xr-xbin/h5vers7
-rwxr-xr-xbin/make_err2
-rwxr-xr-xbin/make_overflow2
-rwxr-xr-xbin/make_vers4
-rw-r--r--bin/output_filter.sh2
-rwxr-xr-xbin/release6
-rwxr-xr-xbin/switch_maint_mode2
-rwxr-xr-xbin/warnhist3
13 files changed, 26 insertions, 39 deletions
diff --git a/COPYING b/COPYING
index 9d32232..9bd0402 100644
--- a/COPYING
+++ b/COPYING
@@ -49,7 +49,7 @@ works thereof, in binary and source code form.
Limited portions of HDF5 were developed by Lawrence Berkeley National
Laboratory (LBNL). LBNL's Copyright Notice and Licensing Terms can be
found here: COPYING_LBNL_HDF5 file in this directory or at
-http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5.
+https://raw.githubusercontent.com/hdfgroup/hdf5/develop/COPYING_LBNL_HDF5.
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
diff --git a/bin/buildhdf5 b/bin/buildhdf5
index a2a13cb..8dfb821 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -12,8 +12,6 @@
#
# Build HDF5 library by doing configure, make, and tests.
# Usage: See USAGE()
-# Programmer: Albert Cheng
-# Creation date: Jul 9, 2003
# Some handy definitions
USAGE()
diff --git a/bin/chkcopyright b/bin/chkcopyright
index 756afe8..3464927 100755
--- a/bin/chkcopyright
+++ b/bin/chkcopyright
@@ -14,10 +14,6 @@
# Check that all the files have the proper copyright notice.
# It goes down directories recursively.
#
-# Programmer: Albert Cheng
-# Created Data: 2003/07/22
-# Modification:
-# Rewrote most of it. Albert Cheng, 2005/10/10.
# Setup
#
@@ -363,7 +359,7 @@ MATCH_COPYRIGHT()
false
else
if [ $begin -gt 1 ]; then
- begin=`expr $begin - 1`
+ begin=`expr $begin`
fi
end=`expr $begin + $nlines - 1`
sed -n -e "${begin},${end}p" < $f > ${EXTRACTEDFILE}
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index f17b9c4..6d31b34 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -1,10 +1,5 @@
-#! /bin/sh
+#!/bin/sh
# Build and Test HDF5 using cmake.
-# Author: Allen Byrne
-# Albert Cheng
-# Creation Date: Nov 2012
-# Modified:
-# Changed to use the quick steps described in INSTALL_CMake.txt. (AKC 2014/1/1)
# Copyright: The HDF Group, 2012-14
@@ -365,7 +360,7 @@ STEP "Configure..." \
$with_zlib \
$with_szlib \
$srcdir" $configlog &&\
- cat $config_summary >> $configlog
+ cat src/$config_summary >> $configlog
# 5. Build the C library, tools and tests with this command:
STEP "Build the library, tools and tests, ..." "cmake --build . --config Release -- $njobs" $makelog
diff --git a/bin/format_source b/bin/format_source
index 1d9e88a..dea771c 100755
--- a/bin/format_source
+++ b/bin/format_source
@@ -5,8 +5,20 @@
#
# Note that any files or directories that are excluded here should also be
# added to the 'exclude' list in .github/workflows/clang-format-check.yml
-#
-# (Remember to update both bin/format_source and bin/format_source_patch)
+
+COMMAND="clang-format"
+
+if [ $# -eq 1 ]; then
+ COMMAND="$COMMAND-$1"
+fi
+
+echo ""
+echo "bin/format_source <version>"
+echo ""
+echo "Format the HDF5 C source using clang-format. The <version>"
+echo "parameter is optional and can be used to force a specific"
+echo "installed version of clang-format to be used."
+echo ""
find . \( -type d -path ./config -prune -and -not -path ./config \) \
-or \( \( \! \( \
@@ -21,6 +33,6 @@ find . \( -type d -path ./config -prune -and -not -path ./config \) \
-or -name H5overflow.h \
\) \) \
-and \( -iname *.h -or -iname *.c -or -iname *.cpp -or -iname *.hpp -or -iname *.java \) \) \
- | xargs -P0 -n1 clang-format -style=file -i -fallback-style=none
+ | xargs -P0 -n1 ${COMMAND} -style=file -i -fallback-style=none
exit 0
diff --git a/bin/h5vers b/bin/h5vers
index 6716794..1133451 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -16,8 +16,6 @@ use strict;
# If you do not have access to either file, you may request a copy from
# help@hdfgroup.org.
#
-# Robb Matzke
-# 17 July 1998
### Purpose
# Increments the hdf5 version number by changing the value of
@@ -118,8 +116,9 @@ Usage: $prog [OPTS] [FILE]
as \"version 1.1 release 0 (pre1)\" will be printed.
FILE
The name of the file that contains version information. This is
- seldom necessary since files H5public.h, src/H5public.h and
- ../src/H5public.h are automatically checked.
+ seldom necessary since the file H5public.h is checked for current
+ working directory at the top level, one level down, or in the src
+ directory where H5public.h resides.
EOF
exit 1;
}
diff --git a/bin/make_err b/bin/make_err
index 31cb964..39c6ce5 100755
--- a/bin/make_err
+++ b/bin/make_err
@@ -20,8 +20,6 @@ use warnings;
# Read in the error description text file and create the appropriate headers
# needed by the library.
#
-# Programmer: Quincey Koziol
-# Creation Date: 2003/08/12
##############################################################################
# Print the copyright into an open file
diff --git a/bin/make_overflow b/bin/make_overflow
index 33cbdfe..1cb5104 100755
--- a/bin/make_overflow
+++ b/bin/make_overflow
@@ -22,8 +22,6 @@ my @ctypes = ( () );
# Create assignment overflow #ifdefs
#
-# Programmer: Quincey Koziol
-# Creation Date: 2009/04/09
##############################################################################
# Parse a meaningful line (not a comment or blank line) into the appropriate
diff --git a/bin/make_vers b/bin/make_vers
index 956fbfd..f428763 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -34,8 +34,6 @@ $indent = 2;
# Read in the public symbol version description text file and create the
# appropriate headers needed by the library.
#
-# Programmer: Quincey Koziol
-# Creation Date: 2007/07/10
##############################################################################
# Print the copyright into an open file
@@ -509,7 +507,7 @@ for $file (@ARGV) {
close SOURCE;
# Create header files
- print "Generating '", $prefix, "H5version.h'\n";
+ print "Generating 'H5version.h'\n";
create_public($prefix);
#for $name (sort keys %functions) {
diff --git a/bin/output_filter.sh b/bin/output_filter.sh
index a2216fd..1b7175c 100644
--- a/bin/output_filter.sh
+++ b/bin/output_filter.sh
@@ -11,8 +11,6 @@
# This contains function definitions of output filtering.
# This file should only be sourced in by another shell script.
#
-# Programmer: Albert Cheng
-# Created Date: 2011/5/3
# Comment added to address HDFFV-8270:
diff --git a/bin/release b/bin/release
index ea75c19..5e34db7 100755
--- a/bin/release
+++ b/bin/release
@@ -206,7 +206,7 @@ tar2cmakezip()
cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.zip $cmziptmpsubdir
- cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_0.zip $cmziptmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_1.zip $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpsubdir
@@ -298,7 +298,7 @@ tar2cmaketgz()
cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.tar.gz $cmgztmpsubdir
- cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_0.tar.gz $cmgztmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_1.tar.gz $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
@@ -377,7 +377,7 @@ tar2hpccmaketgz()
cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.tar.gz $cmgztmpsubdir
- cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_0.tar.gz $cmgztmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_1.tar.gz $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
diff --git a/bin/switch_maint_mode b/bin/switch_maint_mode
index 9813eeb..7f894ff 100755
--- a/bin/switch_maint_mode
+++ b/bin/switch_maint_mode
@@ -12,8 +12,6 @@
#
# Switch AM_MAINTAINER_MODE value in configure.ac
# Usage: See USAGE()
-# Programmer: Dana Robinson
-# Creation date: January 2016
USAGE()
{
diff --git a/bin/warnhist b/bin/warnhist
index fc42209..1e63a55 100755
--- a/bin/warnhist
+++ b/bin/warnhist
@@ -13,9 +13,6 @@ use warnings;
# If you do not have access to either file, you may request a copy from
# help@hdfgroup.org.
#
-# Quincey Koziol
-# 9 Aug 2013
-#
# Purpose: Given an input file containing the output from a build of the
# library, gather the file names and line numbers, alias
# identical types of warnings together into a single bin and