Skip to content

Commit 9a3efaa

Browse files
committed
version number updates for release 1.17.10
1 parent 5c9a9ee commit 9a3efaa

File tree

6 files changed

+60
-60
lines changed

6 files changed

+60
-60
lines changed

Clp/configure

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.59 for Clp 1.17.
3+
# Generated by GNU Autoconf 2.59 for Clp 1.17.10.
44
#
55
# Report bugs to <clp@list.coin-or.org>.
66
#
@@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
429429
# Identity of this package.
430430
PACKAGE_NAME='Clp'
431431
PACKAGE_TARNAME='clp'
432-
PACKAGE_VERSION='1.17'
433-
PACKAGE_STRING='Clp 1.17'
432+
PACKAGE_VERSION='1.17.10'
433+
PACKAGE_STRING='Clp 1.17.10'
434434
PACKAGE_BUGREPORT='clp@list.coin-or.org'
435435

436436
ac_unique_file="src/ClpSimplex.cpp"
@@ -1025,7 +1025,7 @@ if test "$ac_init_help" = "long"; then
10251025
# Omit some internal or obsolete options to make the list less imposing.
10261026
# This message is too long to be a string in the A/UX 3.1 sh.
10271027
cat <<_ACEOF
1028-
\`configure' configures Clp 1.17 to adapt to many kinds of systems.
1028+
\`configure' configures Clp 1.17.10 to adapt to many kinds of systems.
10291029

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

@@ -1091,7 +1091,7 @@ fi
10911091

10921092
if test -n "$ac_init_help"; then
10931093
case $ac_init_help in
1094-
short | recursive ) echo "Configuration of Clp 1.17:";;
1094+
short | recursive ) echo "Configuration of Clp 1.17.10:";;
10951095
esac
10961096
cat <<\_ACEOF
10971097

@@ -1314,7 +1314,7 @@ fi
13141314
test -n "$ac_init_help" && exit 0
13151315
if $ac_init_version; then
13161316
cat <<\_ACEOF
1317-
Clp configure 1.17
1317+
Clp configure 1.17.10
13181318
generated by GNU Autoconf 2.59
13191319

13201320
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1334,7 +1334,7 @@ cat >&5 <<_ACEOF
13341334
This file contains any messages produced by compilers while
13351335
running configure, to aid debugging if configure makes a mistake.
13361336

1337-
It was created by Clp $as_me 1.17, which was
1337+
It was created by Clp $as_me 1.17.10, which was
13381338
generated by GNU Autoconf 2.59. Invocation command line was
13391339

13401340
$ $0 $@
@@ -1860,7 +1860,7 @@ _ACEOF
18601860

18611861

18621862
# Capture libtool library version, if given.
1863-
1863+
coin_libversion=15:10:14
18641864

18651865

18661866

@@ -2009,7 +2009,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
20092009
# compiler, if the C++ is set, but the C compiler isn't (only for CXX=cl)
20102010
if test x"$CXX" != x; then
20112011
case "$CXX" in
2012-
clang* ) ;;
2012+
clang* | */clang* ) ;;
20132013
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
20142014
if test x"$CC" = x; then
20152015
CC="$CXX"
@@ -2830,7 +2830,7 @@ echo "$as_me: error: Failed to find a C compiler!" >&2;}
28302830
fi
28312831
# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
28322832
case "$CC" in
2833-
clang* ) ;;
2833+
clang* | */clang* ) ;;
28342834
cl* | */cl* | CL* | */CL* )
28352835
if test "$ac_cv_prog_cc_g" = yes ; then
28362836
ac_cv_prog_cc_g=no
@@ -2848,7 +2848,7 @@ CFLAGS="$save_cflags"
28482848
# add automake conditional so we can recognize cl compiler in makefile
28492849
coin_cc_is_cl=false
28502850
case "$CC" in
2851-
clang* ) ;;
2851+
clang* | */clang* ) ;;
28522852
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
28532853
coin_cc_is_cl=true
28542854
;;
@@ -2894,7 +2894,7 @@ if test x"$CFLAGS" = x; then
28942894
case $build in
28952895
*-cygwin* | *-mingw*)
28962896
case "$CC" in
2897-
clang* ) ;;
2897+
clang* | */clang* ) ;;
28982898
cl* | */cl* | CL* | */CL*)
28992899
if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
29002900
coin_opt_cflags='-MD -O2'
@@ -3209,7 +3209,7 @@ fi
32093209

32103210
# Correct the LD variable if we are using the MS or Intel-windows compiler
32113211
case "$CC" in
3212-
clang* ) ;;
3212+
clang* | */clang* ) ;;
32133213
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
32143214
LD=link
32153215
;;
@@ -3709,7 +3709,7 @@ fi
37093709

37103710
# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
37113711
case "$CXX" in
3712-
clang* ) ;;
3712+
clang* | */clang* ) ;;
37133713
cl* | */cl* | CL* | */CL* )
37143714
if test "$ac_cv_prog_cxx_g" = yes ; then
37153715
ac_cv_prog_cxx_g=no
@@ -3759,7 +3759,7 @@ if test x"$CXXFLAGS" = x; then
37593759
case $build in
37603760
*-cygwin* | *-mingw*)
37613761
case "$CXX" in
3762-
clang* ) ;;
3762+
clang* | */clang* ) ;;
37633763
cl* | */cl* | CL* | */CL*)
37643764
# The MT and MTd options are mutually exclusive
37653765
if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
@@ -4082,7 +4082,7 @@ fi
40824082

40834083
# correct the LD variable in a build with MS or Intel-windows compiler
40844084
case "$CXX" in
4085-
clang* ) ;;
4085+
clang* | */clang* ) ;;
40864086
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
40874087
LD=link
40884088
;;
@@ -4118,7 +4118,7 @@ else
41184118
coin_disable_shared=yes
41194119
if test x"$enable_shared" = xyes; then
41204120
case "$CC" in
4121-
clang* )
4121+
clang* | */clang* )
41224122
{ echo "$as_me:$LINENO: WARNING: Building of DLLs not supported in this configuration." >&5
41234123
echo "$as_me: WARNING: Building of DLLs not supported in this configuration." >&2;}
41244124
;;
@@ -4567,7 +4567,7 @@ fi
45674567

45684568
# Define the identity of the package.
45694569
PACKAGE='clp'
4570-
VERSION='1.17'
4570+
VERSION='1.17.10'
45714571

45724572

45734573
cat >>confdefs.h <<_ACEOF
@@ -20317,7 +20317,7 @@ fi
2031720317
# sys_lib_search_path_spec
2031820318
*-cygwin* | *-mingw*)
2031920319
case "$CXX" in
20320-
clang* )
20320+
clang* | */clang* )
2032120321
# we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
2032220322
{ echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5
2032320323
echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;}
@@ -20516,7 +20516,7 @@ if test "$dependency_linking" = auto; then
2051620516
case $build in
2051720517
*-cygwin* | *-mingw*)
2051820518
case "$CC" in
20519-
clang* )
20519+
clang* | */clang* )
2052020520
dependency_linking=yes
2052120521
;;
2052220522
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
@@ -27673,7 +27673,7 @@ esac
2767327673

2767427674
*-cygwin* | *-mingw*)
2767527675
case "$CC" in
27676-
clang* ) ;;
27676+
clang* | */clang* ) ;;
2767727677
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
2767827678
coin_save_LIBS="$LIBS"
2767927679
LIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $LIBS"
@@ -32282,7 +32282,7 @@ echo "$as_me:$LINENO: checking which command should be used to link input files"
3228232282
echo $ECHO_N "checking which command should be used to link input files... $ECHO_C" >&6
3228332283
coin_link_input_cmd="$LN_S"
3228432284
case "$CC" in
32285-
clang* ) ;;
32285+
clang* | */clang* ) ;;
3228632286
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
3228732287
coin_link_input_cmd=cp ;;
3228832288
esac
@@ -32296,7 +32296,7 @@ if test x$coin_skip_ac_output != xyes; then
3229632296
# library extension
3229732297

3229832298
case "$CC" in
32299-
clang* )
32299+
clang* | */clang* )
3230032300
LIBEXT=a ;;
3230132301
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
3230232302
LIBEXT=lib ;;
@@ -32964,7 +32964,7 @@ _ASBOX
3296432964
} >&5
3296532965
cat >&5 <<_CSEOF
3296632966

32967-
This file was extended by Clp $as_me 1.17, which was
32967+
This file was extended by Clp $as_me 1.17.10, which was
3296832968
generated by GNU Autoconf 2.59. Invocation command line was
3296932969

3297032970
CONFIG_FILES = $CONFIG_FILES
@@ -33027,7 +33027,7 @@ _ACEOF
3302733027

3302833028
cat >>$CONFIG_STATUS <<_ACEOF
3302933029
ac_cs_version="\\
33030-
Clp config.status 1.17
33030+
Clp config.status 1.17.10
3303133031
configured by $0, generated by GNU Autoconf 2.59,
3303233032
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
3303333033

Clp/configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
AC_PREREQ(2.59)
1414

15-
AC_INIT([Clp],[1.17],[clp@list.coin-or.org])
15+
AC_INIT([Clp],[1.17.10],[clp@list.coin-or.org])
1616

1717
AC_COPYRIGHT([
1818
Copyright 2006 International Business Machines and others.
@@ -41,7 +41,7 @@ AC_CANONICAL_BUILD
4141
# the source root directory contains definition of where to find those
4242
# externals. The following macro ensures that those externals are
4343
# retrieved by svn if they are not there yet.
44-
AC_COIN_PROJECTDIR_INIT(Clp)
44+
AC_COIN_PROJECTDIR_INIT(Clp,15:10:14)
4545

4646
# Check if user wants to produce debugging code
4747
AC_COIN_DEBUG_COMPILE(Clp)

Clp/src/config_clp_default.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/***************************************************************************/
66

77
/* Version number of project */
8-
#define CLP_VERSION "1.17"
8+
#define CLP_VERSION "1.17.10"
99

1010
/* Major Version number of project */
1111
#define CLP_VERSION_MAJOR 1
@@ -14,7 +14,7 @@
1414
#define CLP_VERSION_MINOR 17
1515

1616
/* Release Version number of project */
17-
#define CLP_VERSION_RELEASE 9999
17+
#define CLP_VERSION_RELEASE 10
1818

1919
/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
2020
*/

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Clp 1.17
1+
# Clp 1.17.10
22

33
[![A COIN-OR Project](https://coin-or.github.io/coin-or-badge.png)](https://www.coin-or.org)
44

@@ -43,9 +43,9 @@ Code: [![DOI](https://zenodo.org/badge/173496299.svg)](https://zenodo.org/badge/
4343

4444
## CURRENT BUILD STATUS
4545

46-
[![Windows Builds](https://github.com/coin-or/Clp/actions/workflows/windows-ci.yml/badge.svg?branch=stable/1.17)](https://github.com/coin-or/Clp/actions/workflows/windows-ci.yml?query=branch%3Astable/1.17)
46+
[![Windows Builds](https://github.com/coin-or/Clp/actions/workflows/windows-ci.yml/badge.svg?branch=releases/1.17.10)](https://github.com/coin-or/Clp/actions/workflows/windows-ci.yml?query=branch%3Areleases/1.17.10)
4747

48-
[![Linux and MacOS Builds](https://github.com/coin-or/Clp/actions/workflows/linux-ci.yml/badge.svg?branch=stable/1.17)](https://github.com/coin-or/Clp/actions/workflows/linux-ci.yml?query=branch%3Astable/1.17)
48+
[![Linux and MacOS Builds](https://github.com/coin-or/Clp/actions/workflows/linux-ci.yml/badge.svg?branch=releases/1.17.10)](https://github.com/coin-or/Clp/actions/workflows/linux-ci.yml?query=branch%3Areleases/1.17.10)
4949

5050
## DOWNLOAD
5151

@@ -136,7 +136,7 @@ following on the command line.
136136
```
137137
wget https://raw.githubusercontent.com/coin-or/coinbrew/master/coinbrew
138138
chmod u+x coinbrew
139-
./coinbrew fetch Clp@1.17
139+
./coinbrew fetch Clp@1.17.10
140140
./coinbrew build Clp
141141
```
142142
For more detailed instructions on coinbrew, see https://coin-or.github.io/coinbrew.
@@ -199,7 +199,7 @@ works well.
199199
There are examples in [examples](examples). To create an executable, build
200200
with `coinbrew` as above and then do
201201
```
202-
cd build/Cbc/1.17/examples
202+
cd build/Cbc/1.17.10/examples
203203
make DRIVER=minimum #build the driver minimum.cpp
204204
```
205205
or whichever driver you want. A list is in [Makefile](Makefile.in).
@@ -220,10 +220,10 @@ Other ones can get complicated so start simple and work your way up.
220220
221221
If you have `Doxygen` available, you can build a HTML documentation by typing
222222
223-
`make doxygen-docs`
223+
`make doxydoc`
224224
225225
in the build directory. If Clp was built via `coinbrew`, then the build
226-
directory will be `./build/Clp/1.17` by default. The doxygen documentation main file
226+
directory will be `./build/Clp/1.17.10` by default. The doxygen documentation main file
227227
is found at `<build-dir>/doxydoc/html/index.html`.
228228
229229
If you don't have `doxygen` installed locally, you can use also find the

0 commit comments

Comments
 (0)