philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2842 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_7 to hdf5_1_10_7

Browse Source 
* commit '7a3f80a31e702c029ce7668bb985f37f485fdfc6':
  Merge pull request #2841 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
  Revert "Merge pull request #2840 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_7 to hdf5_1_10_7"
This commit is contained in:
Larry Knox
2020-08-25 16:48:31 -05:00
parent c6916356c2 7a3f80a31e
commit 58d4e30e6c
10 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -339,7 +339,7 @@ set (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}"
set (HDF5_PACKAGE_VERSION_MAJOR "${H5_VERS_MAJOR}.${H5_VERS_MINOR}")
set (HDF5_PACKAGE_VERSION_MINOR "${H5_VERS_RELEASE}")
if (H5_VERS_SUBRELEASE)
set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}")
set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}.${H5_VERS_SUBRELEASE}")
else ()
set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
endif ()

2
README.txt
View File

@@ -1,4 +1,4 @@
HDF5 version 1.10.7.1 currently under development
HDF5 version 1.10.7-1 currently under development
------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.

21
bin/h5vers
View File

@@ -100,8 +100,7 @@ sub setvers {
$_[0] =~ s/^(\#\s*define\s+H5_VERS_SUBRELEASE\s+\")[^\"]*/$1$vers[3]/m;
$_[0] =~ s/^(\#\s*define\s+H5_VERS_INFO\s+\")[^\"]*/
sprintf("%sHDF5 library version: %d.%d.%d%s%s", $1, @vers[0,1,2],
$vers[3]?".":"", $vers[3])/me;
# $vers[3]?"-":"", $vers[3])/me;
$vers[3]?"-":"", $vers[3])/me;
}
sub usage {
@@ -214,7 +213,7 @@ my (@curver) = getvers $contents;
# Determine the new version number.
my @newver; #new version
if ($set) {
if ($set =~ /(\d+)\.(\d+)\.(\d+)([-\.]([\da-zA-Z]\w*))?/) {
if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([\da-zA-Z]\w*))?/) {
@newver = ($1, $2, $3, $5);
} elsif ($set =~ /(\d+)\D+(\d+)\D+(\d+)(\s*\(([a-zA-Z]\w*)\))?\D*$/) {
@newver = ($1, $2, $3, $5);
@@ -311,7 +310,7 @@ if ($README) {
close FILE;
$contents[0] = sprintf("HDF5 version %d.%d.%d%s %s",
@newver[0,1,2],
$newver[3] eq "" ? "" : ".".$newver[3],
$newver[3] eq "" ? "" : "-".$newver[3],
"currently under development\n");
open FILE, ">$README" or die "$README: $!\n";
print FILE @contents;
@@ -325,7 +324,7 @@ if ($RELEASE) {
close FILE;
$contents[0] = sprintf("HDF5 version %d.%d.%d%s %s",
@newver[0,1,2],
$newver[3] eq "" ? "" : ".".$newver[3],
$newver[3] eq "" ? "" : "-".$newver[3],
"currently under development\n");
open FILE, ">$RELEASE" or die "$RELEASE: $!\n";
print FILE @contents;
@@ -338,7 +337,7 @@ if ($CPP_DOC_CONFIG) {
my $sub_rel_ver_str = (
$newver[3] eq ""
? sprintf("%s", "")
: sprintf("%s", ".".$newver[3].", currently under development")
: sprintf("%s", "-".$newver[3].", currently under development")
);
my $version_string = sprintf("\"%d.%d.%d%s%s\"",
@newver[0,1,2],
@@ -355,7 +354,7 @@ if ($HDF5CONFIGCMAKE) {
my $sub_rel_ver_str = (
$newver[3] eq ""
? sprintf("\"%s\"", "")
: sprintf("\"%s\"", ".".$newver[3])
: sprintf("\"%s\"", "-".$newver[3])
);
my $version_string = sprintf("\"%d.%d.%d\"", @newver[0,1,2]);
@@ -372,7 +371,7 @@ if ($H5_JAVA) {
my $sub_rel_ver_str = (
$newver[3] eq ""
? sprintf("\"%s\"", "")
: sprintf("\"%s\"", ".".$newver[3].", currently under development")
: sprintf("\"%s\"", "-".$newver[3].", currently under development")
);
my $version_string1 = sprintf("%d.%d.%d", @newver[0,1,2]);
my $version_string2 = sprintf("%d, %d, %d", @newver[0,1,2]);
@@ -390,7 +389,7 @@ if ($TESTH5_JAVA) {
my $sub_rel_ver_str = (
$newver[3] eq ""
? sprintf("\"%s\"", "")
: sprintf("\"%s\"", ".".$newver[3].", currently under development")
: sprintf("\"%s\"", "-".$newver[3].", currently under development")
);
my $version_string1 = sprintf("%d, %d, %d", @newver[0,1,2]);
my $version_string2 = sprintf("int majnum = %d, minnum = %d, relnum = %d", @newver[0,1,2]);
@@ -452,7 +451,7 @@ sub gen_configure {
if ($contents[$i] =~ /^AC_INIT/) {
$contents[$i] = sprintf("AC_INIT([$name], [%d.%d.%d%s], [help\@hdfgroup.org])\n",
@newver[0,1,2],
$newver[3] eq "" ? "" : ".".$newver[3]);
$newver[3] eq "" ? "" : "-".$newver[3]);
last;
}
}
@@ -520,7 +519,7 @@ if ($verbose) {
$newver[3] eq "" ? "" : " (".$newver[3].")");
} else {
printf("%d.%d.%d%s\n", @newver[0,1,2],
$newver[3] eq "" ? "" : ".".$newver[3]);
$newver[3] eq "" ? "" : "-".$newver[3]);
}
exit 0;

2
c++/src/cpp_doc_config
View File

@@ -38,7 +38,7 @@ PROJECT_NAME =
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = "1.10.7.1, currently under development"
PROJECT_NUMBER = "1.10.7-1, currently under development"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

2
config/cmake/scripts/HDF5config.cmake
View File

@@ -37,7 +37,7 @@ cmake_minimum_required (VERSION 3.12)
##############################################################################
set (CTEST_SOURCE_VERSION "1.10.7")
set (CTEST_SOURCE_VERSEXT ".1")
set (CTEST_SOURCE_VERSEXT "-1")
##############################################################################
# handle input parameters to script.

1
config/cmake/scripts/HDF5options.cmake
View File

@@ -97,7 +97,6 @@ endif()
#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON")
### Create install package with external libraries (szip, zlib)
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=TRUE")
#############################################################################################
### use a toolchain file

22
configure vendored
View File

@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for HDF5 1.10.7.1.
# Generated by GNU Autoconf 2.69 for HDF5 1.10.7-1.
#
# Report bugs to <help@hdfgroup.org>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HDF5'
PACKAGE_TARNAME='hdf5'
PACKAGE_VERSION='1.10.7.1'
PACKAGE_STRING='HDF5 1.10.7.1'
PACKAGE_VERSION='1.10.7-1'
PACKAGE_STRING='HDF5 1.10.7-1'
PACKAGE_BUGREPORT='help@hdfgroup.org'
PACKAGE_URL=''
@@ -1559,7 +1559,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures HDF5 1.10.7.1 to adapt to many kinds of systems.
\`configure' configures HDF5 1.10.7-1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1629,7 +1629,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of HDF5 1.10.7.1:";;
short | recursive ) echo "Configuration of HDF5 1.10.7-1:";;
esac
cat <<\_ACEOF
@@ -1912,7 +1912,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
HDF5 configure 1.10.7.1
HDF5 configure 1.10.7-1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2827,7 +2827,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by HDF5 $as_me 1.10.7.1, which was
It was created by HDF5 $as_me 1.10.7-1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3699,7 +3699,7 @@ fi
# Define the identity of the package.
PACKAGE='hdf5'
VERSION='1.10.7.1'
VERSION='1.10.7-1'
cat >>confdefs.h <<_ACEOF
@@ -32208,7 +32208,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
HDF5 config.lt 1.10.7.1
HDF5 config.lt 1.10.7-1
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -34276,7 +34276,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by HDF5 $as_me 1.10.7.1, which was
This file was extended by HDF5 $as_me 1.10.7-1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -34342,7 +34342,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
HDF5 config.status 1.10.7.1
HDF5 config.status 1.10.7-1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
AC_INIT([HDF5], [1.10.7.1], [help@hdfgroup.org])
AC_INIT([HDF5], [1.10.7-1], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])

2
release_docs/RELEASE.txt
View File

@@ -1,4 +1,4 @@
HDF5 version 1.10.7.1 currently under development
HDF5 version 1.10.7-1 currently under development
================================================================================

2
src/H5public.h
View File

@@ -99,7 +99,7 @@ extern "C" {
#define H5_VERS_RELEASE 7 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "1" /* For pre-releases like snap0 */
/* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.10.7.1" /* Full version string */
#define H5_VERS_INFO "HDF5 library version: 1.10.7-1" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)