diff --git a/VERSION b/VERSION index 24f3114c..d782fca8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.11.1-pre2 +4.11.1 diff --git a/configure b/configure index 0958f305..20a1437c 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 silo 4.11.1-pre2. +# Generated by GNU Autoconf 2.69 for silo 4.11.1. # # Report bugs to . # @@ -596,8 +596,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='silo' PACKAGE_TARNAME='silo' -PACKAGE_VERSION='4.11.1-pre2' -PACKAGE_STRING='silo 4.11.1-pre2' +PACKAGE_VERSION='4.11.1' +PACKAGE_STRING='silo 4.11.1' PACKAGE_BUGREPORT='visit-users@elist.ornl.gov' PACKAGE_URL='' @@ -1448,7 +1448,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 silo 4.11.1-pre2 to adapt to many kinds of systems. +\`configure' configures silo 4.11.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1522,7 +1522,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of silo 4.11.1-pre2:";; + short | recursive ) echo "Configuration of silo 4.11.1:";; esac cat <<\_ACEOF @@ -1668,7 +1668,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -silo configure 4.11.1-pre2 +silo configure 4.11.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2627,7 +2627,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 silo $as_me 4.11.1-pre2, which was +It was created by silo $as_me 4.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3491,7 +3491,7 @@ fi # Define the identity of the package. PACKAGE='silo' - VERSION='4.11.1-pre2' + VERSION='4.11.1' cat >>confdefs.h <<_ACEOF @@ -4827,13 +4827,13 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac # Grab the version number { $as_echo "$as_me:${as_lineno-$LINENO}: checking what version the package is" >&5 $as_echo_n "checking what version the package is... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 4.11.1-pre2" >&5 -$as_echo "4.11.1-pre2" >&6; } - SILO_VERS_MAJ="`echo 4.11.1-pre2 | cut -d'.' -f1`" - SILO_VERS_MIN="`echo 4.11.1-pre2 | cut -d'.' -f2 | cut -d'-' -f1`" - SILO_VERS_PAT="`echo 4.11.1-pre2 | cut -d'.' -f3 | cut -d'-' -f1`" - SILO_VERS_PRE="`echo 4.11.1-pre2 | grep pre | cut -d'-' -f2 | cut -d'e' -f2`" - SILO_VERS_TAG="`echo Silo_version 4.11.1-pre2 | sed -e 's/ /_/' -e 's/\./_/g' -e 's/-/_/g'`" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 4.11.1" >&5 +$as_echo "4.11.1" >&6; } + SILO_VERS_MAJ="`echo 4.11.1 | cut -d'.' -f1`" + SILO_VERS_MIN="`echo 4.11.1 | cut -d'.' -f2 | cut -d'-' -f1`" + SILO_VERS_PAT="`echo 4.11.1 | cut -d'.' -f3 | cut -d'-' -f1`" + SILO_VERS_PRE="`echo 4.11.1 | grep pre | cut -d'-' -f2 | cut -d'e' -f2`" + SILO_VERS_TAG="`echo Silo_version 4.11.1 | sed -e 's/ /_/' -e 's/\./_/g' -e 's/-/_/g'`" CONFIG_CMD="`echo $0 $ac_configure_args`" @@ -28779,7 +28779,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 silo $as_me 4.11.1-pre2, which was +This file was extended by silo $as_me 4.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28845,7 +28845,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="\\ -silo config.status 4.11.1-pre2 +silo config.status 4.11.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/tests/package.m4 b/tests/package.m4 index 7ba6e962..a90d1915 100644 --- a/tests/package.m4 +++ b/tests/package.m4 @@ -1,6 +1,6 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [silo]) m4_define([AT_PACKAGE_TARNAME], [silo]) -m4_define([AT_PACKAGE_VERSION], [4.11.1-pre2]) -m4_define([AT_PACKAGE_STRING], [silo 4.11.1-pre2]) +m4_define([AT_PACKAGE_VERSION], [4.11.1]) +m4_define([AT_PACKAGE_STRING], [silo 4.11.1]) m4_define([AT_PACKAGE_BUGREPORT], [visit-users@elist.ornl.gov]) diff --git a/tests/testsuite b/tests/testsuite index 3e98598a..242f9f44 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -991,7 +991,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -silo 4.11.1-pre2 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS" test groups: +silo 4.11.1 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS" test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1032,7 +1032,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (silo 4.11.1-pre2)" && + $as_echo "$as_me (silo 4.11.1)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1236,11 +1236,11 @@ exec 5>>"$at_suite_log" # Banners and logs. sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## silo 4.11.1-pre2 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ## +## silo 4.11.1 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ## _ASBOX { sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## silo 4.11.1-pre2 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ## +## silo 4.11.1 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ## _ASBOX echo @@ -2084,7 +2084,7 @@ _ASBOX $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [silo 4.11.1-pre2] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [silo 4.11.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may @@ -2111,15 +2111,15 @@ This version of the Silo library is greater than or equal to 4 This version of the Silo library is NOT greater than or equal to 9 This version of the Silo library is greater than or equal to 4.6 This version of the Silo library is NOT greater than or equal to 90.5.2 -DBVersion() returns "4.11.1-pre2" +DBVersion() returns "4.11.1" DBVersionGE(4,6,0) returns 1 DBVersionGE(90,5,2) returns 0 On file handle returned from DBCreate... - DBFileVersion() returns "4.11.1-pre2" + DBFileVersion() returns "4.11.1" DBFileVersionGE(4,6,0) returns 1 DBFileVersionGE(90,5,2) returns 0 On file handle returned from DBOpen... - DBFileVersion() returns "4.11.1-pre2" + DBFileVersion() returns "4.11.1" DBFileVersionGE(4,6,0) returns 1 DBFileVersionGE(90,5,2) returns 0 On old silo file handle returned from DBOpen...