diff --git a/Clp/configure b/Clp/configure index dd19a732..079d451c 100755 --- a/Clp/configure +++ b/Clp/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Clp 1.17. +# Generated by GNU Autoconf 2.59 for Clp 1.17.10. # # Report bugs to . # @@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Clp' PACKAGE_TARNAME='clp' -PACKAGE_VERSION='1.17' -PACKAGE_STRING='Clp 1.17' +PACKAGE_VERSION='1.17.10' +PACKAGE_STRING='Clp 1.17.10' PACKAGE_BUGREPORT='clp@list.coin-or.org' ac_unique_file="src/ClpSimplex.cpp" @@ -1025,7 +1025,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 Clp 1.17 to adapt to many kinds of systems. +\`configure' configures Clp 1.17.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1091,7 +1091,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Clp 1.17:";; + short | recursive ) echo "Configuration of Clp 1.17.10:";; esac cat <<\_ACEOF @@ -1314,7 +1314,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Clp configure 1.17 +Clp configure 1.17.10 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1334,7 +1334,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 Clp $as_me 1.17, which was +It was created by Clp $as_me 1.17.10, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1860,7 +1860,7 @@ _ACEOF # Capture libtool library version, if given. - + coin_libversion=15:10:14 @@ -2009,7 +2009,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # compiler, if the C++ is set, but the C compiler isn't (only for CXX=cl) if test x"$CXX" != x; then case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) if test x"$CC" = x; then CC="$CXX" @@ -2830,7 +2830,7 @@ echo "$as_me: error: Failed to find a C compiler!" >&2;} fi # Autoconf incorrectly concludes that cl recognises -g. It doesn't. case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* ) if test "$ac_cv_prog_cc_g" = yes ; then ac_cv_prog_cc_g=no @@ -2848,7 +2848,7 @@ CFLAGS="$save_cflags" # add automake conditional so we can recognize cl compiler in makefile coin_cc_is_cl=false case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) coin_cc_is_cl=true ;; @@ -2894,7 +2894,7 @@ if test x"$CFLAGS" = x; then case $build in *-cygwin* | *-mingw*) case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL*) if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then coin_opt_cflags='-MD -O2' @@ -3209,7 +3209,7 @@ fi # Correct the LD variable if we are using the MS or Intel-windows compiler case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) LD=link ;; @@ -3709,7 +3709,7 @@ fi # Autoconf incorrectly concludes that cl recognises -g. It doesn't. case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* ) if test "$ac_cv_prog_cxx_g" = yes ; then ac_cv_prog_cxx_g=no @@ -3759,7 +3759,7 @@ if test x"$CXXFLAGS" = x; then case $build in *-cygwin* | *-mingw*) case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL*) # The MT and MTd options are mutually exclusive if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then @@ -4082,7 +4082,7 @@ fi # correct the LD variable in a build with MS or Intel-windows compiler case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) LD=link ;; @@ -4118,7 +4118,7 @@ else coin_disable_shared=yes if test x"$enable_shared" = xyes; then case "$CC" in - clang* ) + clang* | */clang* ) { echo "$as_me:$LINENO: WARNING: Building of DLLs not supported in this configuration." >&5 echo "$as_me: WARNING: Building of DLLs not supported in this configuration." >&2;} ;; @@ -4567,7 +4567,7 @@ fi # Define the identity of the package. PACKAGE='clp' - VERSION='1.17' + VERSION='1.17.10' cat >>confdefs.h <<_ACEOF @@ -20317,7 +20317,7 @@ fi # sys_lib_search_path_spec *-cygwin* | *-mingw*) case "$CXX" in - clang* ) + clang* | */clang* ) # we assume that libtool patches for CLANG are the same as for GNU compiler - correct??? { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5 echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;} @@ -20516,7 +20516,7 @@ if test "$dependency_linking" = auto; then case $build in *-cygwin* | *-mingw*) case "$CC" in - clang* ) + clang* | */clang* ) dependency_linking=yes ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) @@ -27673,7 +27673,7 @@ esac *-cygwin* | *-mingw*) case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) coin_save_LIBS="$LIBS" 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" echo $ECHO_N "checking which command should be used to link input files... $ECHO_C" >&6 coin_link_input_cmd="$LN_S" case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) coin_link_input_cmd=cp ;; esac @@ -32296,7 +32296,7 @@ if test x$coin_skip_ac_output != xyes; then # library extension case "$CC" in - clang* ) + clang* | */clang* ) LIBEXT=a ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) LIBEXT=lib ;; @@ -32964,7 +32964,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Clp $as_me 1.17, which was +This file was extended by Clp $as_me 1.17.10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33027,7 +33027,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Clp config.status 1.17 +Clp config.status 1.17.10 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Clp/configure.ac b/Clp/configure.ac index b67206fd..dca9dd7d 100644 --- a/Clp/configure.ac +++ b/Clp/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Clp],[1.17],[clp@list.coin-or.org]) +AC_INIT([Clp],[1.17.10],[clp@list.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(Clp) +AC_COIN_PROJECTDIR_INIT(Clp,15:10:14) # Check if user wants to produce debugging code AC_COIN_DEBUG_COMPILE(Clp) diff --git a/Clp/src/config_clp_default.h b/Clp/src/config_clp_default.h index 784cfe4f..fb1a44cd 100644 --- a/Clp/src/config_clp_default.h +++ b/Clp/src/config_clp_default.h @@ -5,7 +5,7 @@ /***************************************************************************/ /* Version number of project */ -#define CLP_VERSION "1.17" +#define CLP_VERSION "1.17.10" /* Major Version number of project */ #define CLP_VERSION_MAJOR 1 @@ -14,7 +14,7 @@ #define CLP_VERSION_MINOR 17 /* Release Version number of project */ -#define CLP_VERSION_RELEASE 9999 +#define CLP_VERSION_RELEASE 10 /* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2 */ diff --git a/README.md b/README.md index 8077a1bd..2c19fb83 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Clp 1.17 +# Clp 1.17.10 [![A COIN-OR Project](https://coin-or.github.io/coin-or-badge.png)](https://www.coin-or.org) @@ -43,9 +43,9 @@ Code: [![DOI](https://zenodo.org/badge/173496299.svg)](https://zenodo.org/badge/ ## CURRENT BUILD STATUS -[![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) +[![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) -[![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) +[![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) ## DOWNLOAD @@ -136,7 +136,7 @@ following on the command line. ``` wget https://raw.githubusercontent.com/coin-or/coinbrew/master/coinbrew chmod u+x coinbrew -./coinbrew fetch Clp@1.17 +./coinbrew fetch Clp@1.17.10 ./coinbrew build Clp ``` For more detailed instructions on coinbrew, see https://coin-or.github.io/coinbrew. @@ -199,7 +199,7 @@ works well. There are examples in [examples](examples). To create an executable, build with `coinbrew` as above and then do ``` -cd build/Cbc/1.17/examples +cd build/Cbc/1.17.10/examples make DRIVER=minimum #build the driver minimum.cpp ``` 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. If you have `Doxygen` available, you can build a HTML documentation by typing -`make doxygen-docs` +`make doxydoc` in the build directory. If Clp was built via `coinbrew`, then the build -directory will be `./build/Clp/1.17` by default. The doxygen documentation main file +directory will be `./build/Clp/1.17.10` 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 diff --git a/configure b/configure index 179b262f..b3df45fa 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 Clp 1.17. +# Generated by GNU Autoconf 2.59 for Clp 1.17.10. # # Report bugs to . # @@ -430,8 +430,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Clp' PACKAGE_TARNAME='clp' -PACKAGE_VERSION='1.17' -PACKAGE_STRING='Clp 1.17' +PACKAGE_VERSION='1.17.10' +PACKAGE_STRING='Clp 1.17.10' PACKAGE_BUGREPORT='coin-clp@lists.coin-or.org' ac_unique_file="configure.ac" @@ -1037,7 +1037,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 Clp 1.17 to adapt to many kinds of systems. +\`configure' configures Clp 1.17.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1103,7 +1103,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Clp 1.17:";; + short | recursive ) echo "Configuration of Clp 1.17.10:";; esac cat <<\_ACEOF @@ -1316,7 +1316,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Clp configure 1.17 +Clp configure 1.17.10 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1336,7 +1336,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 Clp $as_me 1.17, which was +It was created by Clp $as_me 1.17.10, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1843,7 +1843,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # compiler, if the C++ is set, but the C compiler isn't (only for CXX=cl) if test x"$CXX" != x; then case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) if test x"$CC" = x; then CC="$CXX" @@ -2664,7 +2664,7 @@ echo "$as_me: error: Failed to find a C compiler!" >&2;} fi # Autoconf incorrectly concludes that cl recognises -g. It doesn't. case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* ) if test "$ac_cv_prog_cc_g" = yes ; then ac_cv_prog_cc_g=no @@ -2682,7 +2682,7 @@ CFLAGS="$save_cflags" # add automake conditional so we can recognize cl compiler in makefile coin_cc_is_cl=false case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) coin_cc_is_cl=true ;; @@ -2728,7 +2728,7 @@ if test x"$CFLAGS" = x; then case $build in *-cygwin* | *-mingw*) case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL*) if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then coin_opt_cflags='-MD -O2' @@ -3043,7 +3043,7 @@ fi # Correct the LD variable if we are using the MS or Intel-windows compiler case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) LD=link ;; @@ -3545,7 +3545,7 @@ fi # Autoconf incorrectly concludes that cl recognises -g. It doesn't. case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* ) if test "$ac_cv_prog_cxx_g" = yes ; then ac_cv_prog_cxx_g=no @@ -3595,7 +3595,7 @@ if test x"$CXXFLAGS" = x; then case $build in *-cygwin* | *-mingw*) case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL*) # The MT and MTd options are mutually exclusive if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then @@ -3918,7 +3918,7 @@ fi # correct the LD variable in a build with MS or Intel-windows compiler case "$CXX" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) LD=link ;; @@ -4644,7 +4644,7 @@ else coin_disable_shared=yes if test x"$enable_shared" = xyes; then case "$CC" in - clang* ) + clang* | */clang* ) { echo "$as_me:$LINENO: WARNING: Building of DLLs not supported in this configuration." >&5 echo "$as_me: WARNING: Building of DLLs not supported in this configuration." >&2;} ;; @@ -5093,7 +5093,7 @@ fi # Define the identity of the package. PACKAGE='clp' - VERSION='1.17' + VERSION='1.17.10' cat >>confdefs.h <<_ACEOF @@ -20606,7 +20606,7 @@ fi # sys_lib_search_path_spec *-cygwin* | *-mingw*) case "$CXX" in - clang* ) + clang* | */clang* ) # we assume that libtool patches for CLANG are the same as for GNU compiler - correct??? { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5 echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;} @@ -20805,7 +20805,7 @@ if test "$dependency_linking" = auto; then case $build in *-cygwin* | *-mingw*) case "$CC" in - clang* ) + clang* | */clang* ) dependency_linking=yes ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) @@ -22458,7 +22458,7 @@ echo "$as_me:$LINENO: checking which command should be used to link input files" echo $ECHO_N "checking which command should be used to link input files... $ECHO_C" >&6 coin_link_input_cmd="$LN_S" case "$CC" in - clang* ) ;; + clang* | */clang* ) ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) coin_link_input_cmd=cp ;; esac @@ -22472,7 +22472,7 @@ if test x$coin_skip_ac_output != xyes; then # library extension case "$CC" in - clang* ) + clang* | */clang* ) LIBEXT=a ;; cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) LIBEXT=lib ;; @@ -22975,7 +22975,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Clp $as_me 1.17, which was +This file was extended by Clp $as_me 1.17.10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23033,7 +23033,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Clp config.status 1.17 +Clp config.status 1.17.10 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 509c2617..d0f9e15f 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Clp],[1.17],[coin-clp@lists.coin-or.org]) +AC_INIT([Clp],[1.17.10],[coin-clp@lists.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others.