From 3c1d759619f38bbd5916380df292cfc1dafba7f5 Mon Sep 17 00:00:00 2001 From: Ted Ralphs Date: Thu, 5 May 2022 17:17:30 -0400 Subject: [PATCH] version number updates for release 2.10.8 --- Cbc/configure | 22 +++++++++++----------- Cbc/configure.ac | 4 ++-- Cbc/src/config_cbc_default.h | 4 ++-- README.md | 26 +++++++++++++++++++------- configure | 20 ++++++++++---------- configure.ac | 2 +- 6 files changed, 45 insertions(+), 33 deletions(-) diff --git a/Cbc/configure b/Cbc/configure index cd3ff9133..3529023f8 100755 --- a/Cbc/configure +++ b/Cbc/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Cbc 2.10. +# Generated by GNU Autoconf 2.59 for Cbc 2.10.8. # # Report bugs to . # @@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Cbc' PACKAGE_TARNAME='cbc' -PACKAGE_VERSION='2.10' -PACKAGE_STRING='Cbc 2.10' +PACKAGE_VERSION='2.10.8' +PACKAGE_STRING='Cbc 2.10.8' PACKAGE_BUGREPORT='cbc@lists.coin-or.org' ac_unique_file="src/CbcTree.hpp" @@ -1009,7 +1009,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 Cbc 2.10 to adapt to many kinds of systems. +\`configure' configures Cbc 2.10.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1075,7 +1075,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Cbc 2.10:";; + short | recursive ) echo "Configuration of Cbc 2.10.8:";; esac cat <<\_ACEOF @@ -1324,7 +1324,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Cbc configure 2.10 +Cbc configure 2.10.8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1344,7 +1344,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 Cbc $as_me 2.10, which was +It was created by Cbc $as_me 2.10.8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1870,7 +1870,7 @@ _ACEOF # Capture libtool library version, if given. - + coin_libversion=13:8:10 @@ -4577,7 +4577,7 @@ fi # Define the identity of the package. PACKAGE='cbc' - VERSION='2.10' + VERSION='2.10.8' cat >>confdefs.h <<_ACEOF @@ -32542,7 +32542,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Cbc $as_me 2.10, which was +This file was extended by Cbc $as_me 2.10.8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32605,7 +32605,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Cbc config.status 2.10 +Cbc config.status 2.10.8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Cbc/configure.ac b/Cbc/configure.ac index 2a3d7c691..e416799c5 100644 --- a/Cbc/configure.ac +++ b/Cbc/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Cbc],[2.10],[cbc@lists.coin-or.org]) +AC_INIT([Cbc],[2.10.8],[cbc@lists.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others. @@ -41,7 +41,7 @@ AC_CANONICAL_BUILD # the source root directory contains definition of where to find those # externals. The following macro ensures that those externals are # retrieved by svn if they are not there yet. -AC_COIN_PROJECTDIR_INIT(Cbc) +AC_COIN_PROJECTDIR_INIT(Cbc,13:8:10) # Check if user wants to produce debugging code AC_COIN_DEBUG_COMPILE(Cbc) diff --git a/Cbc/src/config_cbc_default.h b/Cbc/src/config_cbc_default.h index e55e9cdd3..976807dd6 100644 --- a/Cbc/src/config_cbc_default.h +++ b/Cbc/src/config_cbc_default.h @@ -5,7 +5,7 @@ /***************************************************************************/ /* Version number of project */ -#define CBC_VERSION "2.10" +#define CBC_VERSION "2.10.8" /* Major Version number of project */ #define CBC_VERSION_MAJOR 2 @@ -14,7 +14,7 @@ #define CBC_VERSION_MINOR 10 /* Release Version number of project */ -#define CBC_VERSION_RELEASE 9999 +#define CBC_VERSION_RELEASE 8 /* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2 */ diff --git a/README.md b/README.md index 8ed9660f4..55ff5f05f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cbc 2.10 +# Cbc 2.10.8 [![A COIN-OR Project](https://coin-or.github.io/coin-or-badge.png)](https://www.coin-or.org) @@ -70,9 +70,9 @@ Code: [![DOI](https://zenodo.org/badge/173509563.svg)](https://zenodo.org/badge/ ## CURRENT BUILD STATUS -[![Windows Builds](https://github.com/coin-or/Cbc/actions/workflows/windows-ci.yml/badge.svg?branch=stable/2.10)](https://github.com/coin-or/Cbc/actions/workflows/windows-ci.yml?query=branch%3Astable/2.10) +[![Windows Builds](https://github.com/coin-or/Cbc/actions/workflows/windows-ci.yml/badge.svg?branch=releases/2.10.8)](https://github.com/coin-or/Cbc/actions/workflows/windows-ci.yml?query=branch%3Areleases/2.10.8) -[![Linux and MacOS Builds](https://github.com/coin-or/Cbc/actions/workflows/linux-ci.yml/badge.svg?branch=stable/2.10)](https://github.com/coin-or/Cbc/actions/workflows/linux-ci.yml?query=branch%3Astable/2.10) +[![Linux and MacOS Builds](https://github.com/coin-or/Cbc/actions/workflows/linux-ci.yml/badge.svg?branch=releases/2.10.8)](https://github.com/coin-or/Cbc/actions/workflows/linux-ci.yml?query=branch%3Areleases/2.10.8) ## DOWNLOAD @@ -163,7 +163,7 @@ following on the command line. ``` wget https://raw.githubusercontent.com/coin-or/coinbrew/master/coinbrew chmod u+x coinbrew -./coinbrew fetch Cbc@2.10 +./coinbrew fetch Cbc@2.10.8 ./coinbrew build Cbc ``` For more detailed instructions on coinbrew, see https://coin-or.github.io/coinbrew. @@ -241,7 +241,7 @@ If you have `Doxygen` available, you can build a HTML documentation by typing `make doxygen-docs` in the build directory. If Cbc was built via `coinbrew`, then the build -directory will be `./build/Cbc/2.10` by default. The doxygen documentation main file +directory will be `./build/Cbc/2.10.8` by default. The doxygen documentation main file is found at `/doxydoc/html/index.html`. If you don't have `doxygen` installed locally, you can use also find the @@ -323,8 +323,19 @@ documentation [here](http://coin-or.github.io/Cbc/Doxygen). - `oddwext`: strategy used to search for wheel centers for the cuts found by CglOddWheel - 0=off, 1=one variable, 2=clique - default=2. - CglClique was replaced by CglBKClique as the default clique separator in CbcSolver.cpp. + * Release 2.10.8 + * Re-generate binaries due to mistake in Github Actions configuration and + incorporate new release of Cgl. + + * Release 2.10.7 + * Fix a bug that would cause the unit test not to run correctly if the + MIPLIB3 project was not present + + * Release 2.10.6 + * Accumulated fixes related to build, test, and CI. + * Release 2.10.5 - * revert fix that stopped Clp when timelimit reached, as that lead to + * Revert fix that stopped Clp when timelimit reached, as that lead to all cleanup solves afterwards to stop without proper finishing and giving wrong results @@ -334,7 +345,8 @@ documentation [here](http://coin-or.github.io/Cbc/Doxygen). * More bugfixes. * Release 2.10.3 - * Improve performance of some primal heuristics, incl. feasibility pump, by making integer slacks continuous + * Improve performance of some primal heuristics, incl. feasibility pump, + by making integer slacks continuous * Added additional timelimit checks * Fixed initialization of Cbc_clone result * Additional bugfixes diff --git a/configure b/configure index a98722ff8..2a32fd0e8 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac 0.9. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Cbc 2.10. +# Generated by GNU Autoconf 2.59 for Cbc 2.10.8. # # Report bugs to . # @@ -430,8 +430,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Cbc' PACKAGE_TARNAME='cbc' -PACKAGE_VERSION='2.10' -PACKAGE_STRING='Cbc 2.10' +PACKAGE_VERSION='2.10.8' +PACKAGE_STRING='Cbc 2.10.8' PACKAGE_BUGREPORT='cbc@lists.coin-or.org' ac_unique_file="configure.ac" @@ -1042,7 +1042,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 Cbc 2.10 to adapt to many kinds of systems. +\`configure' configures Cbc 2.10.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1108,7 +1108,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Cbc 2.10:";; + short | recursive ) echo "Configuration of Cbc 2.10.8:";; esac cat <<\_ACEOF @@ -1336,7 +1336,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Cbc configure 2.10 +Cbc configure 2.10.8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1356,7 +1356,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 Cbc $as_me 2.10, which was +It was created by Cbc $as_me 2.10.8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -5113,7 +5113,7 @@ fi # Define the identity of the package. PACKAGE='cbc' - VERSION='2.10' + VERSION='2.10.8' cat >>confdefs.h <<_ACEOF @@ -23559,7 +23559,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Cbc $as_me 2.10, which was +This file was extended by Cbc $as_me 2.10.8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23617,7 +23617,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Cbc config.status 2.10 +Cbc config.status 2.10.8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 594105099..7f2b60662 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Cbc],[2.10],[cbc@lists.coin-or.org]) +AC_INIT([Cbc],[2.10.8],[cbc@lists.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others.