Changeset 1459 for trunk


Ignore:
Timestamp:
Jun 2, 2010 6:14:32 PM (9 years ago)
Author:
lou
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.6
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.1
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 Data/miplib3      https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
        8 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        9 Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
        10 Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
        11 Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
        12 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.6
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.0.17/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.0.14/
         4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.1.0/
         5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.5.1/
         6Data/Sample  https://projects.coin-or.org/svn/Data/releases/1.0.7/Sample
         7CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.6.4/CoinUtils
         8Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.55.0/Cgl
         9Clp  https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
         10Osi  https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
         11Vol  https://projects.coin-or.org/svn/Vol/releases/1.1.7/Vol
  • trunk/Cbc/configure

    r1458 r1459  
    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.5.
    44#
    55# Report bugs to <coin-cbc@list.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='trunk'
    433 PACKAGE_STRING='Cbc trunk'
     432PACKAGE_VERSION='2.5'
     433PACKAGE_STRING='Cbc 2.5'
    434434PACKAGE_BUGREPORT='coin-cbc@list.coin-or.org'
    435435
     
    10021002  # This message is too long to be a string in the A/UX 3.1 sh.
    10031003  cat <<_ACEOF
    1004 \`configure' configures Cbc trunk to adapt to many kinds of systems.
     1004\`configure' configures Cbc 2.5 to adapt to many kinds of systems.
    10051005
    10061006Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10681068if test -n "$ac_init_help"; then
    10691069  case $ac_init_help in
    1070      short | recursive ) echo "Configuration of Cbc trunk:";;
     1070     short | recursive ) echo "Configuration of Cbc 2.5:";;
    10711071   esac
    10721072  cat <<\_ACEOF
     
    12691269if $ac_init_version; then
    12701270  cat <<\_ACEOF
    1271 Cbc configure trunk
     1271Cbc configure 2.5
    12721272generated by GNU Autoconf 2.59
    12731273
     
    12891289running configure, to aid debugging if configure makes a mistake.
    12901290
    1291 It was created by Cbc $as_me trunk, which was
     1291It was created by Cbc $as_me 2.5, which was
    12921292generated by GNU Autoconf 2.59.  Invocation command line was
    12931293
     
    45204520# Define the identity of the package.
    45214521 PACKAGE='cbc'
    4522  VERSION='trunk'
     4522 VERSION='2.5'
    45234523
    45244524
     
    2325123251cat >&5 <<_CSEOF
    2325223252
    23253 This file was extended by Cbc $as_me trunk, which was
     23253This file was extended by Cbc $as_me 2.5, which was
    2325423254generated by GNU Autoconf 2.59.  Invocation command line was
    2325523255
     
    2331423314cat >>$CONFIG_STATUS <<_ACEOF
    2331523315ac_cs_version="\\
    23316 Cbc config.status trunk
     23316Cbc config.status 2.5
    2331723317configured by $0, generated by GNU Autoconf 2.59,
    2331823318  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/Cbc/configure.ac

    r1458 r1459  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[trunk],[coin-cbc@list.coin-or.org])
     15AC_INIT([Cbc],[2.5],[coin-cbc@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
  • trunk/Cbc/src/CbcConfig.h

    r1457 r1459  
    9595/* #undef COIN_HAS_XPR */
    9696
    97 #define CBC_VERSION "trunk"
     97#define CBC_VERSION "2.5"
    9898
    9999#endif /* HAVE_CONFIG_H */
  • trunk/Dependencies

    r1456 r1459  
    1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.6
    2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
    3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.1
    5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
    6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
    7 Data/miplib3      https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
    8 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
    9 Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
    10 Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
    11 Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
    12 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
     1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.6
     2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
     3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
     4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.1
     5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
     6Data/Sample  https://projects.coin-or.org/svn/Data/stable/1.0/Sample
     7CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
     8Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
     9Clp  https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
     10Osi  https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
     11Vol  https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • trunk/configure

    r1458 r1459  
    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.5.
    55#
    66# Report bugs to <coin-cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='trunk'
    434 PACKAGE_STRING='Cbc trunk'
     433PACKAGE_VERSION='2.5'
     434PACKAGE_STRING='Cbc 2.5'
    435435PACKAGE_BUGREPORT='coin-cbc@lists.coin-or.org'
    436436
     
    10381038  # This message is too long to be a string in the A/UX 3.1 sh.
    10391039  cat <<_ACEOF
    1040 \`configure' configures Cbc trunk to adapt to many kinds of systems.
     1040\`configure' configures Cbc 2.5 to adapt to many kinds of systems.
    10411041
    10421042Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11041104if test -n "$ac_init_help"; then
    11051105  case $ac_init_help in
    1106      short | recursive ) echo "Configuration of Cbc trunk:";;
     1106     short | recursive ) echo "Configuration of Cbc 2.5:";;
    11071107   esac
    11081108  cat <<\_ACEOF
     
    12711271if $ac_init_version; then
    12721272  cat <<\_ACEOF
    1273 Cbc configure trunk
     1273Cbc configure 2.5
    12741274generated by GNU Autoconf 2.59
    12751275
     
    12911291running configure, to aid debugging if configure makes a mistake.
    12921292
    1293 It was created by Cbc $as_me trunk, which was
     1293It was created by Cbc $as_me 2.5, which was
    12941294generated by GNU Autoconf 2.59.  Invocation command line was
    12951295
     
    51295129# Define the identity of the package.
    51305130 PACKAGE='cbc'
    5131  VERSION='trunk'
     5131 VERSION='2.5'
    51325132
    51335133
     
    2187621876cat >&5 <<_CSEOF
    2187721877
    21878 This file was extended by Cbc $as_me trunk, which was
     21878This file was extended by Cbc $as_me 2.5, which was
    2187921879generated by GNU Autoconf 2.59.  Invocation command line was
    2188021880
     
    2193421934cat >>$CONFIG_STATUS <<_ACEOF
    2193521935ac_cs_version="\\
    21936 Cbc config.status trunk
     21936Cbc config.status 2.5
    2193721937configured by $0, generated by GNU Autoconf 2.59,
    2193821938  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/configure.ac

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