Changes from releases/2.8.2 at r2332 to releases/2.8.3 at r2332


Ignore:
Location:
releases/2.8.3
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • releases/2.8.3/Cbc

  • releases/2.8.3/Cbc/README

    r2332 r2332  
    2525WHAT'S NEW
    2626==========
     27
     28Release 2.8.3:
     29
     301. Fix for handling SOS.
    2731
    2832Release 2.8.2:
  • releases/2.8.3/Cbc/configure

    r2332 r2332  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.8.2.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.8.3.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.8.2'
    433 PACKAGE_STRING='Cbc 2.8.2'
     432PACKAGE_VERSION='2.8.3'
     433PACKAGE_STRING='Cbc 2.8.3'
    434434PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    435435
     
    10061006  # This message is too long to be a string in the A/UX 3.1 sh.
    10071007  cat <<_ACEOF
    1008 \`configure' configures Cbc 2.8.2 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.8.3 to adapt to many kinds of systems.
    10091009
    10101010Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10721072if test -n "$ac_init_help"; then
    10731073  case $ac_init_help in
    1074      short | recursive ) echo "Configuration of Cbc 2.8.2:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.8.3:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13091309if $ac_init_version; then
    13101310  cat <<\_ACEOF
    1311 Cbc configure 2.8.2
     1311Cbc configure 2.8.3
    13121312generated by GNU Autoconf 2.59
    13131313
     
    13291329running configure, to aid debugging if configure makes a mistake.
    13301330
    1331 It was created by Cbc $as_me 2.8.2, which was
     1331It was created by Cbc $as_me 2.8.3, which was
    13321332generated by GNU Autoconf 2.59.  Invocation command line was
    13331333
     
    18551855
    18561856# Capture libtool library version, if given.
    1857 coin_libversion=11:2:8
     1857 coin_libversion=11:3:8
    18581858
    18591859
     
    47264726# Define the identity of the package.
    47274727 PACKAGE='cbc'
    4728  VERSION='2.8.2'
     4728 VERSION='2.8.3'
    47294729
    47304730
     
    3128331283cat >&5 <<_CSEOF
    3128431284
    31285 This file was extended by Cbc $as_me 2.8.2, which was
     31285This file was extended by Cbc $as_me 2.8.3, which was
    3128631286generated by GNU Autoconf 2.59.  Invocation command line was
    3128731287
     
    3134631346cat >>$CONFIG_STATUS <<_ACEOF
    3134731347ac_cs_version="\\
    31348 Cbc config.status 2.8.2
     31348Cbc config.status 2.8.3
    3134931349configured by $0, generated by GNU Autoconf 2.59,
    3135031350  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.3/Cbc/configure.ac

    r2332 r2332  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.8.2],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.8.3],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    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(Cbc,11:2:8)
     44AC_COIN_PROJECTDIR_INIT(Cbc,11:3:8)
    4545
    4646# Check if user wants to produce debugging code
  • releases/2.8.3/Cbc/src/Makefile.am

    r2332 r2332  
    260260        ClpAmplObjective.hpp
    261261
     262########################################################################
     263#                     Installing manifest (MSVC++)                     #
     264########################################################################
     265
     266if COIN_CXX_IS_CL
     267install-exec-hook:
     268        test -s cbc.exe.manifest && \
     269        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     270        cp cbc.exe $(bindir)/clp.exe
     271endif
     272
    262273#######################################################################
    263274# Create the Config.h file that has all public defines and install it #
  • releases/2.8.3/Cbc/src/Makefile.in

    r2332 r2332  
    11971197        @echo "This command is intended for maintainers to use"
    11981198        @echo "it deletes files that may require special tools to rebuild."
     1199@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    11991200clean: clean-recursive
    12001201
     
    12221223install-exec-am: install-binPROGRAMS install-exec-local \
    12231224        install-libLTLIBRARIES
     1225        @$(NORMAL_INSTALL)
     1226        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    12241227
    12251228install-info: install-info-recursive
     
    12591262        dvi dvi-am html html-am info info-am install install-am \
    12601263        install-binPROGRAMS install-data install-data-am install-exec \
    1261         install-exec-am install-exec-local install-includecoinHEADERS \
    1262         install-info install-info-am install-libLTLIBRARIES \
    1263         install-man install-strip installcheck installcheck-am \
    1264         installdirs installdirs-am maintainer-clean \
     1264        install-exec-am install-exec-hook install-exec-local \
     1265        install-includecoinHEADERS install-info install-info-am \
     1266        install-libLTLIBRARIES install-man install-strip installcheck \
     1267        installcheck-am installdirs installdirs-am maintainer-clean \
    12651268        maintainer-clean-generic maintainer-clean-recursive \
    12661269        mostlyclean mostlyclean-compile mostlyclean-generic \
     
    12711274
    12721275
     1276########################################################################
     1277#                     Installing manifest (MSVC++)                     #
     1278########################################################################
     1279
     1280@COIN_CXX_IS_CL_TRUE@install-exec-hook:
     1281@COIN_CXX_IS_CL_TRUE@   test -s cbc.exe.manifest && \
     1282@COIN_CXX_IS_CL_TRUE@   mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     1283@COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/clp.exe
     1284
    12731285#######################################################################
    12741286# Create the Config.h file that has all public defines and install it #
  • releases/2.8.3/Cbc/src/config_cbc_default.h

    r2332 r2332  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.8.2"
     8#define CBC_VERSION "2.8.3"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 2
     17#define CBC_VERSION_RELEASE 3
  • releases/2.8.3/configure

    r2332 r2332  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Cbc 2.8.2.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.8.3.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.8.2'
    434 PACKAGE_STRING='Cbc 2.8.2'
     433PACKAGE_VERSION='2.8.3'
     434PACKAGE_STRING='Cbc 2.8.3'
    435435PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    436436
     
    10391039  # This message is too long to be a string in the A/UX 3.1 sh.
    10401040  cat <<_ACEOF
    1041 \`configure' configures Cbc 2.8.2 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.8.3 to adapt to many kinds of systems.
    10421042
    10431043Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11051105if test -n "$ac_init_help"; then
    11061106  case $ac_init_help in
    1107      short | recursive ) echo "Configuration of Cbc 2.8.2:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.8.3:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.8.2
     1333Cbc configure 2.8.3
    13341334generated by GNU Autoconf 2.59
    13351335
     
    13511351running configure, to aid debugging if configure makes a mistake.
    13521352
    1353 It was created by Cbc $as_me 2.8.2, which was
     1353It was created by Cbc $as_me 2.8.3, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    53385338# Define the identity of the package.
    53395339 PACKAGE='cbc'
    5340  VERSION='2.8.2'
     5340 VERSION='2.8.3'
    53415341
    53425342
     
    2362923629cat >&5 <<_CSEOF
    2363023630
    23631 This file was extended by Cbc $as_me 2.8.2, which was
     23631This file was extended by Cbc $as_me 2.8.3, which was
    2363223632generated by GNU Autoconf 2.59.  Invocation command line was
    2363323633
     
    2368723687cat >>$CONFIG_STATUS <<_ACEOF
    2368823688ac_cs_version="\\
    23689 Cbc config.status 2.8.2
     23689Cbc config.status 2.8.3
    2369023690configured by $0, generated by GNU Autoconf 2.59,
    2369123691  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.3/configure.ac

    r2332 r2332  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.8.2],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.8.3],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.