From ec34b34767482ceccd87159c401a7db13c7dc505 Mon Sep 17 00:00:00 2001 From: lrknox Date: Fri, 17 Nov 2017 16:06:31 -0600 Subject: Switch default build mode from development to production. Increment version string to pre2. --- README.txt | 2 +- c++/src/cpp_doc_config | 2 +- config/cmake/scripts/HDF5config.cmake | 2 +- configure | 28 +++++++++++++++------------- configure.ac | 8 +++++--- release_docs/RELEASE.txt | 2 +- src/H5public.h | 4 ++-- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.txt b/README.txt index 1a82f8a..4a3b7eb 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.20-pre1 currently under development +HDF5 version 1.8.20-pre2 currently under development Please refer to the release_docs/INSTALL file for installation instructions. ------------------------------------------------------------------------------ diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 30f9c87..d9b36c6 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -49,7 +49,7 @@ PROJECT_NAME = "HDF5 C++ API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.8.20-pre1, currently under development" +PROJECT_NUMBER = "1.8.20-pre2, 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 diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index f1becd6..04f01dd 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR) ############################################################################## set (CTEST_SOURCE_VERSION "1.8.20") -set (CTEST_SOURCE_VERSEXT "-pre1") +set (CTEST_SOURCE_VERSEXT "-pre2") ############################################################################## # handle input parameters to script. diff --git a/configure b/configure index 35dfa26..fca5f47 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for HDF5 1.8.20-pre1. +# Generated by GNU Autoconf 2.69 for HDF5 1.8.20-pre2. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.8.20-pre1' -PACKAGE_STRING='HDF5 1.8.20-pre1' +PACKAGE_VERSION='1.8.20-pre2' +PACKAGE_STRING='HDF5 1.8.20-pre2' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1480,7 +1480,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.8.20-pre1 to adapt to many kinds of systems. +\`configure' configures HDF5 1.8.20-pre2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1550,7 +1550,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.8.20-pre1:";; + short | recursive ) echo "Configuration of HDF5 1.8.20-pre2:";; esac cat <<\_ACEOF @@ -1745,7 +1745,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.8.20-pre1 +HDF5 configure 1.8.20-pre2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2682,7 +2682,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.8.20-pre1, which was +It was created by HDF5 $as_me 1.8.20-pre2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3553,7 +3553,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.8.20-pre1' + VERSION='1.8.20-pre2' cat >>confdefs.h <<_ACEOF @@ -22385,6 +22385,8 @@ fi ## ---------------------------------------------------------------------- ## Production flags? Save the value in $CONFIG_MODE so we have it for ## the record. +## To switch the default between production and development, move X-| +## to X-yes) or X-no) ## { $as_echo "$as_me:${as_lineno-$LINENO}: checking for production mode" >&5 $as_echo_n "checking for production mode... " >&6; } @@ -22395,7 +22397,7 @@ fi case "X-$enable_production" in - X-yes) + X-|X-yes) enable_production="yes" { $as_echo "$as_me:${as_lineno-$LINENO}: result: production" >&5 $as_echo "production" >&6; } @@ -22405,7 +22407,7 @@ $as_echo "production" >&6; } H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS" H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS" ;; - X-|X-no) + X-no) enable_production="no" { $as_echo "$as_me:${as_lineno-$LINENO}: result: development" >&5 $as_echo "development" >&6; } @@ -29313,7 +29315,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -HDF5 config.lt 1.8.20-pre1 +HDF5 config.lt 1.8.20-pre2 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -31373,7 +31375,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.8.20-pre1, which was +This file was extended by HDF5 $as_me 1.8.20-pre2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31439,7 +31441,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.8.20-pre1 +HDF5 config.status 1.8.20-pre2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0d9d79e..4564a0f 100644 --- a/configure.ac +++ b/configure.ac @@ -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.8.20-pre1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.8.20-pre2], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) @@ -777,6 +777,8 @@ fi ## ---------------------------------------------------------------------- ## Production flags? Save the value in $CONFIG_MODE so we have it for ## the record. +## To switch the default between production and development, move X-| +## to X-yes) or X-no) ## AC_MSG_CHECKING([for production mode]) AC_ARG_ENABLE([production], @@ -784,7 +786,7 @@ AC_ARG_ENABLE([production], [Determines how to run the compiler.])]) case "X-$enable_production" in - X-yes) + X-|X-yes) enable_production="yes" AC_MSG_RESULT([production]) CONFIG_MODE=production @@ -793,7 +795,7 @@ case "X-$enable_production" in H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS" H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS" ;; - X-|X-no) + X-no) enable_production="no" AC_MSG_RESULT([development]) CONFIG_MODE=development diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index b9435bb..3ed5046 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.20-pre1 currently under development +HDF5 version 1.8.20-pre2 currently under development ================================================================================ INTRODUCTION diff --git a/src/H5public.h b/src/H5public.h index 9ff88f2..6336b5a 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -93,9 +93,9 @@ extern "C" { #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 8 /* For minor interface/format changes */ #define H5_VERS_RELEASE 20 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "pre1" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "pre2" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.8.20-pre1" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.8.20-pre2" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) -- cgit v0.12