Skip to content

Commit

Permalink
Initial preparation of hdf5-1_10_11 release branch for HDF5 1.10.11
Browse files Browse the repository at this point in the history
release:

  Updated configure.ac for release: switched configure default to production mode and disabled maintainer mode.
  Set HDF5_GENERATE_HEADERS to OFF in src/CMakeLists.txt.
  Generated release files including Makefile.ins with autogen.sh, autoconf 2.71 and automake 1.16.2
  Incremented version to 1.10.11-2.
  • Loading branch information
lrknox committed Sep 20, 2023
1 parent 8c4d90e commit 1808ce0
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.10.11-1 currently under development
HDF5 version 1.10.11-2 currently under development

![HDF5 Logo](doxygen/img/HDF5.png)

Expand Down
2 changes: 1 addition & 1 deletion c++/src/cpp_doc_config
Original file line number Diff line number Diff line change
Expand Up @@ -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.11-1, currently under development"
PROJECT_NUMBER = "1.10.11-2, 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
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/scripts/HDF5config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.12)
##############################################################################

set (CTEST_SOURCE_VERSION "1.10.11")
set (CTEST_SOURCE_VERSEXT "-1")
set (CTEST_SOURCE_VERSEXT "-2")

##############################################################################
# handle input parameters to script.
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ AC_PREREQ([2.71])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
AC_INIT([HDF5], [1.10.11-1], [help@hdfgroup.org])
AC_INIT([HDF5],[1.10.11-2],[help@hdfgroup.org])

AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])
Expand Down Expand Up @@ -74,7 +74,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # use silent rules where a
##
## By default, maintainer mode is enabled in development branches and disabled
## in release branches.
AM_MAINTAINER_MODE([enable])
AM_MAINTAINER_MODE([disable])

## ----------------------------------------------------------------------
## Set prefix default (install directory) to a directory in the build area.
Expand Down Expand Up @@ -425,14 +425,14 @@ AC_ARG_ENABLE([build-mode],
(i.e.: a 'clean slate' configuration).
All these settings can be overridden by using
specific configure flags.
[default=debug]
[default=production]
])],
[BUILD_MODE=$enableval])

## Set the default
## Depends on branch, set via script at branch creation time
if test "X-$BUILD_MODE" = X- ; then
BUILD_MODE=debug
BUILD_MODE=production
fi

## Allow this variable to be substituted in
Expand Down
2 changes: 1 addition & 1 deletion java/src/hdf/hdf5lib/H5.java
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public class H5 implements java.io.Serializable {
* </ul>
* Make sure to update the versions number when a different library is used.
*/
public final static int LIB_VERSION[] = {1, 10, 10};
public final static int LIB_VERSION[] = {1, 10, 11};

/**
* @ingroup JH5
Expand Down
2 changes: 1 addition & 1 deletion release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.10.11-1 currently under development
HDF5 version 1.10.11-2 currently under development
================================================================================


Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ set (H5_PUBLIC_GENERATED_HEADERS
${HDF5_SRC_DIR}/H5overflow.h
)

option (HDF5_GENERATE_HEADERS "Rebuild Generated Files" ON)
option (HDF5_GENERATE_HEADERS "Rebuild Generated Files" OFF)
if (HDF5_GENERATE_HEADERS)
set_source_files_properties(${H5_GENERATED_HEADERS} PROPERTIES GENERATED TRUE)
if (H5_PERL_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/H5public.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ extern "C" {
/**
* For pre-releases like \c snap0. Empty string for official releases.
*/
#define H5_VERS_SUBRELEASE "1"
#define H5_VERS_SUBRELEASE "2"
/**
* Full version string
*/
#define H5_VERS_INFO "HDF5 library version: 1.10.11-1"
#define H5_VERS_INFO "HDF5 library version: 1.10.11-2"

#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)

Expand Down

0 comments on commit 1808ce0

Please sign in to comment.