Changeset 2111


Ignore:
Timestamp:
Jan 17, 2015 11:27:41 PM (4 years ago)
Author:
tkr
Message:

temporarily committing stable candidate

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.0/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
         4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
         5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
        66ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
        77ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.5
        8 Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        9 Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
        10 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        11 Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
        12 Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
        13 Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         8Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.10/
         9Data/miplib3  https://projects.coin-or.org/svn/Data/miplib3/releases/1.2.6/
         10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
         11Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.59/Cgl
         12Clp  https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
         13Osi  https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
  • trunk/Cbc/configure

    r2109 r2111  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc trunk.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.9.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='trunk'
    433 PACKAGE_STRING='Cbc trunk'
     432PACKAGE_VERSION='2.9'
     433PACKAGE_STRING='Cbc 2.9'
    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 trunk to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.9 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 trunk:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.9:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13061306if $ac_init_version; then
    13071307  cat <<\_ACEOF
    1308 Cbc configure trunk
     1308Cbc configure 2.9
    13091309generated by GNU Autoconf 2.59
    13101310
     
    13261326running configure, to aid debugging if configure makes a mistake.
    13271327
    1328 It was created by Cbc $as_me trunk, which was
     1328It was created by Cbc $as_me 2.9, which was
    13291329generated by GNU Autoconf 2.59.  Invocation command line was
    13301330
     
    45734573# Define the identity of the package.
    45744574 PACKAGE='cbc'
    4575  VERSION='trunk'
     4575 VERSION='2.9'
    45764576
    45774577
     
    3116731167cat >&5 <<_CSEOF
    3116831168
    31169 This file was extended by Cbc $as_me trunk, which was
     31169This file was extended by Cbc $as_me 2.9, which was
    3117031170generated by GNU Autoconf 2.59.  Invocation command line was
    3117131171
     
    3123031230cat >>$CONFIG_STATUS <<_ACEOF
    3123131231ac_cs_version="\\
    31232 Cbc config.status trunk
     31232Cbc config.status 2.9
    3123331233configured by $0, generated by GNU Autoconf 2.59,
    3123431234  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/Cbc/configure.ac

    r1899 r2111  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[trunk],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.9],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
  • trunk/Cbc/src/config_cbc_default.h

    r1899 r2111  
    66
    77/* Version number of project */
    8 #define CBC_VERSION      "trunk"
     8#define CBC_VERSION "2.9"
    99
    1010/* Major Version number of project */
    11 #define CBC_VERSION_MAJOR   9999
     11#define CBC_VERSION_MAJOR 2
    1212
    1313/* Minor Version number of project */
    14 #define CBC_VERSION_MINOR   9999
     14#define CBC_VERSION_MINOR 9
    1515
    1616/* Release Version number of project */
  • trunk/Dependencies

    r2109 r2111  
    1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
    2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
    3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
    4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
    5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
     1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.8
     2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
     3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
     4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
     5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
    66ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
    77ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.5
    8 Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
    9 Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
    10 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    11 Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
    12 Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
    13 Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
     8Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
     9Data/miplib3  https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
     10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
     11Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.59/Cgl
     12Clp  https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
     13Osi  https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
  • trunk/configure

    r2109 r2111  
    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 trunk.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.9.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='trunk'
    434 PACKAGE_STRING='Cbc trunk'
     433PACKAGE_VERSION='2.9'
     434PACKAGE_STRING='Cbc 2.9'
    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 trunk to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.9 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 trunk:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.9:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13281328if $ac_init_version; then
    13291329  cat <<\_ACEOF
    1330 Cbc configure trunk
     1330Cbc configure 2.9
    13311331generated by GNU Autoconf 2.59
    13321332
     
    13481348running configure, to aid debugging if configure makes a mistake.
    13491349
    1350 It was created by Cbc $as_me trunk, which was
     1350It was created by Cbc $as_me 2.9, which was
    13511351generated by GNU Autoconf 2.59.  Invocation command line was
    13521352
     
    51145114# Define the identity of the package.
    51155115 PACKAGE='cbc'
    5116  VERSION='trunk'
     5116 VERSION='2.9'
    51175117
    51185118
     
    2345723457cat >&5 <<_CSEOF
    2345823458
    23459 This file was extended by Cbc $as_me trunk, which was
     23459This file was extended by Cbc $as_me 2.9, which was
    2346023460generated by GNU Autoconf 2.59.  Invocation command line was
    2346123461
     
    2351523515cat >>$CONFIG_STATUS <<_ACEOF
    2351623516ac_cs_version="\\
    23517 Cbc config.status trunk
     23517Cbc config.status 2.9
    2351823518configured by $0, generated by GNU Autoconf 2.59,
    2351923519  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/configure.ac

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