diff options
| -rwxr-xr-x | bin/h5vers | 56 | ||||
| -rwxr-xr-x | c++/configure | 18 | ||||
| -rw-r--r-- | c++/configure.in | 2 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | fortran/configure | 22 | ||||
| -rw-r--r-- | fortran/configure.in | 2 |
7 files changed, 86 insertions, 34 deletions
@@ -59,6 +59,8 @@ use strict; # the command line) then the first line of the README.txt and RELEASE.txt files # one directory above the H5public.h file is also modified so it looks # something like: This is hdf5-1.2.3-pre1 currently under development. +# The AC_INIT macro in configure.in will also change in this case to be +# something like: AC_INIT([HDF5], [hdf5-1.2.3-pre1], [hdfhelp@ncsa.uiuc.edu]) ############################################################################## sub getvers { @@ -136,8 +138,9 @@ while ($_ = shift) { } die "mutually exclusive options given\n" if $set && $inc; -# Determine file to use as H5public.h, README.txt and release_docs/RELEASE.txt. -# The README.txt and release_docs/RELEASE.txt files are always in the +# Determine file to use as H5public.h, README.txt, +# release_docs/RELEASE.txt, and configure.in. The README.txt, +# release_docs/RELEASE.txt, and configure.in files are always in the # directory above H5public.h unless ($file) { for (@files) { @@ -154,6 +157,18 @@ die "unable to read file: $README\n" unless -r $file; my $RELEASE = $file; $RELEASE =~ s/[^\/]*$/..\/release_docs\/RELEASE.txt/; die "unable to read file: $RELEASE\n" unless -r $file; +# configure.in +my $CONFIGURE = $file; +$CONFIGURE =~ s/[^\/]*$/..\/configure.in/; +die "unable to read file: $CONFIGURE\n" unless -r $file; +# fortran/configure.in +my $FORTRAN_CONFIGURE = $file; +$FORTRAN_CONFIGURE =~ s/[^\/]*$/..\/fortran\/configure.in/; +die "unable to read file: $FORTRAN_CONFIGURE\n" unless -r $file; +# c++/configure.in +my $CXX_CONFIGURE = $file; +$CXX_CONFIGURE =~ s/[^\/]*$/..\/c++\/configure.in/; +die "unable to read file: $CXX_CONFIGURE\n" unless -r $file; # Get the current version number. open FILE, $file or die "unable to open $file: $!\n"; @@ -200,6 +215,9 @@ if ($set) { # Nothing to do but print result $README = ""; $RELEASE = ""; + $CONFIGURE = ""; + $FORTRAN_CONFIGURE = ""; + $CXX_CONFIGURE = ""; @newver = @curver; } @@ -250,6 +268,40 @@ if ($RELEASE) { close FILE; } +sub gen_configure { + my ($conf) = @_; + + open FILE, $conf or die "$conf: $!\n"; + my @contents = <FILE>; + close FILE; + + for (my $i = 0; $i < $#contents; ++$i) { + if ($contents[$i] =~ /^AC_INIT/) { + $contents[$i] = sprintf("AC_INIT([HDF5], [%d.%d.%d%s], [hdfhelp\@ncsa.uiuc.edu])\n", + @newver[0,1,2], + $newver[3] eq "" ? "" : "-".$newver[3]); + last; + } + } + + open FILE, ">$conf" or die "$conf: $!\n"; + print FILE @contents; + close FILE; + + $conf =~ /^(.*?)\/?configure.in$/; + + if ($1) { + system("cd $1 && autoconf && rm -rf autom4te.cache"); + } else { + system("autoconf && rm -rf autom4te.cache"); + } +} + +# Update the configure.in files and regenerate them +gen_configure $CONFIGURE if $CONFIGURE; +gen_configure $FORTRAN_CONFIGURE if $FORTRAN_CONFIGURE; +gen_configure $CXX_CONFIGURE if $CXX_CONFIGURE; + # Print the new version number if ($verbose) { printf("version %d.%d release %d%s\n", @newver[0,1,2], diff --git a/c++/configure b/c++/configure index b04c849..6b020f3 100755 --- a/c++/configure +++ b/c++/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for HDF5 1.5. +# Generated by GNU Autoconf 2.53 for HDF5 1.5.27. # # Report bugs to <hdfhelp@ncsa.uiuc.edu>. # @@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='HDF5 1.5' +PACKAGE_VERSION='1.5.27' +PACKAGE_STRING='HDF5 1.5.27' PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/H5Library.cpp" @@ -934,7 +934,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.5 to adapt to many kinds of systems. +\`configure' configures HDF5 1.5.27 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -995,7 +995,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.5:";; + short | recursive ) echo "Configuration of HDF5 1.5.27:";; esac cat <<\_ACEOF @@ -1093,7 +1093,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.5 +HDF5 configure 1.5.27 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1108,7 +1108,7 @@ cat >&5 <<_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.5, which was +It was created by HDF5 $as_me 1.5.27, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -8491,7 +8491,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by HDF5 $as_me 1.5, which was +This file was extended by HDF5 $as_me 1.5.27, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8545,7 +8545,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 config.status 1.5 +HDF5 config.status 1.5.27 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/c++/configure.in b/c++/configure.in index 00cc442..51e1829 100644 --- a/c++/configure.in +++ b/c++/configure.in @@ -18,7 +18,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5], [1.5], [hdfhelp@ncsa.uiuc.edu]) +AC_INIT([HDF5], [1.5.27], [hdfhelp@ncsa.uiuc.edu]) AC_CONFIG_SRCDIR([src/H5Library.cpp]) AC_CONFIG_AUX_DIR([../bin]) @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for HDF5 1.5. +# Generated by GNU Autoconf 2.53 for HDF5 1.5.27. # # Report bugs to <hdfhelp@ncsa.uiuc.edu>. # @@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='HDF5 1.5' +PACKAGE_VERSION='1.5.27' +PACKAGE_STRING='HDF5 1.5.27' PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/H5.c" @@ -923,7 +923,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.5 to adapt to many kinds of systems. +\`configure' configures HDF5 1.5.27 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -984,7 +984,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.5:";; + short | recursive ) echo "Configuration of HDF5 1.5.27:";; esac cat <<\_ACEOF @@ -1114,7 +1114,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.5 +HDF5 configure 1.5.27 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1129,7 +1129,7 @@ cat >&5 <<_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.5, which was +It was created by HDF5 $as_me 1.5.27, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -29924,7 +29924,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by HDF5 $as_me 1.5, which was +This file was extended by HDF5 $as_me 1.5.27, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29986,7 +29986,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 config.status 1.5 +HDF5 config.status 1.5.27 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 80b39b9..6f017ff 100644 --- a/configure.in +++ b/configure.in @@ -16,7 +16,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5], [1.5], [hdfhelp@ncsa.uiuc.edu]) +AC_INIT([HDF5], [1.5.27], [hdfhelp@ncsa.uiuc.edu]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADER([src/H5config.h]) diff --git a/fortran/configure b/fortran/configure index 234b58f..c8d2f97 100755 --- a/fortran/configure +++ b/fortran/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for HDF5 Fortran 1.5. +# Generated by GNU Autoconf 2.53 for HDF5 1.5.27. # # Report bugs to <hdfhelp@ncsa.uiuc.edu>. # @@ -414,10 +414,10 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME='HDF5 Fortran' -PACKAGE_TARNAME='hdf5-fortran' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='HDF5 Fortran 1.5' +PACKAGE_NAME='HDF5' +PACKAGE_TARNAME='hdf5' +PACKAGE_VERSION='1.5.27' +PACKAGE_STRING='HDF5 1.5.27' PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/HDF5.f90" @@ -922,7 +922,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 Fortran 1.5 to adapt to many kinds of systems. +\`configure' configures HDF5 1.5.27 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -983,7 +983,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 Fortran 1.5:";; + short | recursive ) echo "Configuration of HDF5 1.5.27:";; esac cat <<\_ACEOF @@ -1079,7 +1079,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -HDF5 Fortran configure 1.5 +HDF5 configure 1.5.27 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1094,7 +1094,7 @@ cat >&5 <<_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 Fortran $as_me 1.5, which was +It was created by HDF5 $as_me 1.5.27, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -8867,7 +8867,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by HDF5 Fortran $as_me 1.5, which was +This file was extended by HDF5 $as_me 1.5.27, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8926,7 +8926,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 Fortran config.status 1.5 +HDF5 config.status 1.5.27 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/fortran/configure.in b/fortran/configure.in index a27db47..f8bb515 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -18,7 +18,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5 Fortran], [1.5], [hdfhelp@ncsa.uiuc.edu]) +AC_INIT([HDF5], [1.5.27], [hdfhelp@ncsa.uiuc.edu]) AC_CONFIG_SRCDIR([src/HDF5.f90]) AC_CONFIG_HEADER([src/H5config_fortran.h]) |