Skip to content

Commit

Permalink
Bump version to 3.0.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
wbhart committed Feb 14, 2017
1 parent d90aef8 commit 1b3d597
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 45 deletions.
11 changes: 6 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@
# 2.5.2 11:3:4 4:20:3
# 2.6.0 11:0:5 4:21:3 Clearly wrong!!
# 2.7.0 16:0:6 8:0:4 Attempt to correct wrt all prev
# 2.7.1 22:1:6 12:1:4 Due to traiing space for 2.7.1
# 2.7.1 22:1:6 12:1:4 Due to trailing space for 2.7.1
# 2.7.2 22:2:6 12:2:4
# 3.0.0 23:3:0 12:3:4
#
# Starting at 3:0:0 is a slight abuse of the versioning system, but it
# ensures we're past soname libgmp.so.2, which was used on Debian GNU/Linux
Expand All @@ -91,12 +92,12 @@
# it's still good to get the shared library filename (like
# libgmpxx.so.3.0.4) incrementing, to make it clear which GMP it's from.

LIBGMP_LT_CURRENT = 22
LIBGMP_LT_REVISION = 2
LIBGMP_LT_AGE = 6
LIBGMP_LT_CURRENT = 23
LIBGMP_LT_REVISION = 3
LIBGMP_LT_AGE = 0

LIBGMPXX_LT_CURRENT = 12
LIBGMPXX_LT_REVISION = 2
LIBGMPXX_LT_REVISION = 3
LIBGMPXX_LT_AGE = 4

SUBDIRS = tests
Expand Down
10 changes: 5 additions & 5 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
# 2.5.2 11:3:4 4:20:3
# 2.6.0 11:0:5 4:21:3 Clearly wrong!!
# 2.7.0 16:0:6 8:0:4 Attempt to correct wrt all prev
# 2.7.1 22:1:6 12:1:4 Due to traiing space for 2.7.1
# 2.7.1 22:1:6 12:1:4 Due to trailing space for 2.7.1
# 2.7.2 22:2:6 12:2:4
#
# Starting at 3:0:0 is a slight abuse of the versioning system, but it
Expand Down Expand Up @@ -565,11 +565,11 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
LIBGMP_LT_CURRENT = 22
LIBGMP_LT_REVISION = 2
LIBGMP_LT_AGE = 6
LIBGMP_LT_CURRENT = 23
LIBGMP_LT_REVISION = 3
LIBGMP_LT_AGE = 0
LIBGMPXX_LT_CURRENT = 12
LIBGMPXX_LT_REVISION = 2
LIBGMPXX_LT_REVISION = 3
LIBGMPXX_LT_AGE = 4
SUBDIRS = tests $(am__append_1) mpn fft mpz mpq mpf printf scanf cxx \
tune doc
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision: 1.11 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for MPIR 2.7.2.
# Generated by GNU Autoconf 2.69 for MPIR 3.0.0.
#
# Report bugs to <http://groups.google.co.uk/group/mpir-devel/>.
#
Expand Down Expand Up @@ -616,8 +616,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='MPIR'
PACKAGE_TARNAME='mpir'
PACKAGE_VERSION='2.7.2'
PACKAGE_STRING='MPIR 2.7.2'
PACKAGE_VERSION='3.0.0'
PACKAGE_STRING='MPIR 3.0.0'
PACKAGE_BUGREPORT='http://groups.google.co.uk/group/mpir-devel/'
PACKAGE_URL=''

Expand Down Expand Up @@ -1392,7 +1392,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 MPIR 2.7.2 to adapt to many kinds of systems.
\`configure' configures MPIR 3.0.0 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1462,7 +1462,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of MPIR 2.7.2:";;
short | recursive ) echo "Configuration of MPIR 3.0.0:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1587,7 +1587,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
MPIR configure 2.7.2
MPIR configure 3.0.0
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2587,7 +2587,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 MPIR $as_me 2.7.2, which was
It was created by MPIR $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3562,7 +3562,7 @@ fi

# Define the identity of the package.
PACKAGE='mpir'
VERSION='2.7.2'
VERSION='3.0.0'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -26615,7 +26615,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 MPIR $as_me 2.7.2, which was
This file was extended by MPIR $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -26685,7 +26685,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="\\
MPIR config.status 2.7.2
MPIR config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
20 changes: 10 additions & 10 deletions devel/setversion
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
# run this script from the devel directory

# set version number
VERSION=2
VERSION_MINOR=5
VERSION_PATCHLEVEL=1
VERSION=3
VERSION_MINOR=0
VERSION_PATCHLEVEL=0

# these are the library soname numbers see
# http://sources.redhat.com/autobook/autobook/autobook_91.html
# or the start of Makefile.am to see what was done before

LIBGMP_LT_CURRENT=11
LIBGMP_LT_REVISION=2
LIBGMP_LT_AGE=4
LIBGMP_LT_CURRENT=23
LIBGMP_LT_REVISION=3
LIBGMP_LT_AGE=0

LIBGMPXX_LT_CURRENT=4
LIBGMPXX_LT_REVISION=19
LIBGMPXX_LT_AGE=3
LIBGMPXX_LT_CURRENT=12
LIBGMPXX_LT_REVISION=3
LIBGMPXX_LT_AGE=4

echo "Setting MPIR to"
echo "MPIR-$VERSION.$VERSION_MINOR.$VERSION_PATCHLEVEL"
Expand Down Expand Up @@ -62,6 +62,6 @@ makeinfo mpir.texi
makeinfo version.texi
cd ..

autoreconf -f
autoreconf -fiv --no-recursive
rm -f $TMPFILE
cd devel
2 changes: 1 addition & 1 deletion doc/mpir.info
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This is mpir.info, produced by makeinfo version 5.2 from mpir.texi.

This manual describes how to install and use MPIR, the Multiple
Precision Integers and Rationals library, version 2.7.2.
Precision Integers and Rationals library, version 3.0.0.

Copyright 1991, 1993-2016 Free Software Foundation, Inc.

Expand Down
10 changes: 5 additions & 5 deletions doc/mpir.info-1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This is mpir.info, produced by makeinfo version 5.2 from mpir.texi.

This manual describes how to install and use MPIR, the Multiple
Precision Integers and Rationals library, version 2.7.2.
Precision Integers and Rationals library, version 3.0.0.

Copyright 1991, 1993-2016 Free Software Foundation, Inc.

Expand All @@ -26,7 +26,7 @@ MPIR
****

This manual describes how to install and use MPIR, the Multiple
Precision Integers and Rationals library, version 2.7.2.
Precision Integers and Rationals library, version 3.0.0.

Copyright 1991, 1993-2016 Free Software Foundation, Inc.

Expand Down Expand Up @@ -236,7 +236,7 @@ Build Directory
directory. For example

cd /my/build/dir
/my/sources/mpir-2.7.2/configure
/my/sources/mpir-3.0.0/configure

Not all 'make' programs have the necessary features ('VPATH') to
support this. In particular, SunOS and Solaris 'make' have bugs
Expand Down Expand Up @@ -1495,7 +1495,7 @@ File: mpir.info, Node: Useful Macros and Constants, Next: Compatibility with o

-- Global Constant: const char * const mpir_version
The MPIR version number, as a null-terminated string, in the form
"i.j.k". This release is "2.7.2".
"i.j.k". This release is "3.0.0".


File: mpir.info, Node: Compatibility with older versions, Next: Efficiency, Prev: Useful Macros and Constants, Up: MPIR Basics
Expand Down Expand Up @@ -1756,7 +1756,7 @@ Source File Paths
to the source directory.

cd /my/build/dir
/my/source/dir/gmp-2.7.2/configure
/my/source/dir/gmp-3.0.0/configure

This works via 'VPATH', and might require GNU 'make'. Alternately
it might be possible to change the '.c.lo' rules appropriately.
Expand Down
2 changes: 1 addition & 1 deletion doc/mpir.info-2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This is mpir.info, produced by makeinfo version 5.2 from mpir.texi.

This manual describes how to install and use MPIR, the Multiple
Precision Integers and Rationals library, version 2.7.2.
Precision Integers and Rationals library, version 3.0.0.

Copyright 1991, 1993-2016 Free Software Foundation, Inc.

Expand Down
8 changes: 4 additions & 4 deletions doc/version.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@set UPDATED 19 November 2015
@set UPDATED-MONTH November 2015
@set EDITION 2.7.2
@set VERSION 2.7.2
@set UPDATED 14 February 2017
@set UPDATED-MONTH February 2017
@set EDITION 3.0.0
@set VERSION 3.0.0
8 changes: 4 additions & 4 deletions gmp-h.in
Original file line number Diff line number Diff line change
Expand Up @@ -2501,11 +2501,11 @@ enum
#define GMP_VERSION "6.0.0"
#define __GNU_MP_RELEASE (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL)

#define __MPIR_VERSION 2
#define __MPIR_VERSION_MINOR 7
#define __MPIR_VERSION_PATCHLEVEL 2
#define __MPIR_VERSION 3
#define __MPIR_VERSION_MINOR 0
#define __MPIR_VERSION_PATCHLEVEL 0
#if defined( _MSC_VER )
#define _MSC_MPIR_VERSION "2.7.2"
#define _MSC_MPIR_VERSION "3.0.0"
#endif
#define __MPIR_RELEASE (__MPIR_VERSION * 10000 + __MPIR_VERSION_MINOR * 100 + __MPIR_VERSION_PATCHLEVEL)

Expand Down

5 comments on commit 1b3d597

@dimpase
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need to edit configure? I think most, if not all, of this can be accomplished by

diff --git a/configure.ac b/configure.ac
index 20b4a5cd..a782aca0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AH_TOP(/*GMP_COPYRIGHT*/)
 
 AC_REVISION($Revision: 1.11 $)
 AC_PREREQ(2.68)
-AC_INIT(MPIR, MPIR_VERSION, http://groups.google.co.uk/group/mpir-devel/, mpir)
+AC_INIT(MPIR, 3.0.0, http://groups.google.co.uk/group/mpir-devel/, mpir)
 AC_CONFIG_SRCDIR(gmp-impl.h)
 m4_pattern_forbid([^[ \t]*GMP_])
 m4_pattern_allow(GMP_LDFLAGS)

and re-running autogen.sh, no?

@wbhart
Copy link
Owner Author

@wbhart wbhart commented on 1b3d597 Nov 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My guess is the script for updating the version is out-of-date. I don't think we need to edit configure any more.

@dimpase
Copy link
Contributor

@dimpase dimpase commented on 1b3d597 Nov 26, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wbhart
Copy link
Owner Author

@wbhart wbhart commented on 1b3d597 Nov 26, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimpase
Copy link
Contributor

@dimpase dimpase commented on 1b3d597 Nov 26, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.