Changeset 1679 for trunk


Ignore:
Timestamp:
Jun 26, 2011 8:17:16 PM (8 years ago)
Author:
tkr
Message:

restoring Cbc/trunk

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.7
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
        66ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
        77ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
        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/stable/2.8/CoinUtils
        11 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
        12 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
        13 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/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.8/CoinUtils
         11Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         12Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         13Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         14
  • trunk/Cbc/configure

    r1677 r1679  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.8.
     3# Generated by GNU Autoconf 2.59 for Cbc trunk.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.8'
    433 PACKAGE_STRING='Cbc 2.8'
     432PACKAGE_VERSION='trunk'
     433PACKAGE_STRING='Cbc trunk'
    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 to adapt to many kinds of systems.
     1008\`configure' configures Cbc trunk 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:";;
     1074     short | recursive ) echo "Configuration of Cbc trunk:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13031303if $ac_init_version; then
    13041304  cat <<\_ACEOF
    1305 Cbc configure 2.8
     1305Cbc configure trunk
    13061306generated by GNU Autoconf 2.59
    13071307
     
    13231323running configure, to aid debugging if configure makes a mistake.
    13241324
    1325 It was created by Cbc $as_me 2.8, which was
     1325It was created by Cbc $as_me trunk, which was
    13261326generated by GNU Autoconf 2.59.  Invocation command line was
    13271327
     
    46864686# Define the identity of the package.
    46874687 PACKAGE='cbc'
    4688  VERSION='2.8'
     4688 VERSION='trunk'
    46894689
    46904690
     
    3083630836cat >&5 <<_CSEOF
    3083730837
    30838 This file was extended by Cbc $as_me 2.8, which was
     30838This file was extended by Cbc $as_me trunk, which was
    3083930839generated by GNU Autoconf 2.59.  Invocation command line was
    3084030840
     
    3089930899cat >>$CONFIG_STATUS <<_ACEOF
    3090030900ac_cs_version="\\
    30901 Cbc config.status 2.8
     30901Cbc config.status trunk
    3090230902configured by $0, generated by GNU Autoconf 2.59,
    3090330903  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/Cbc/configure.ac

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

    r1677 r1679  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.8"
     8#define CBC_VERSION      "trunk"
    99
    1010/* Major Version number of project */
    11 #define CBC_VERSION "2.8"
     11#define CBC_VERSION_MAJOR   9999
    1212
    1313/* Minor Version number of project */
    14 #define CBC_VERSION "2.8"
     14#define CBC_VERSION_MINOR   9999
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION "2.8"
     17#define CBC_VERSION_RELEASE 9999
  • trunk/Dependencies

    r1677 r1679  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
    2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
    3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
    4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
    5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
     2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
     3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
     4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
     5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
    66ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
    77ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
    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/stable/2.8/CoinUtils
    11 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
    12 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
    13 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/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.8/CoinUtils
     11Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
     12Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
     13Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
  • trunk/configure

    r1677 r1679  
    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.
     4# Generated by GNU Autoconf 2.59 for Cbc trunk.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.8'
    434 PACKAGE_STRING='Cbc 2.8'
     433PACKAGE_VERSION='trunk'
     434PACKAGE_STRING='Cbc trunk'
    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 to adapt to many kinds of systems.
     1041\`configure' configures Cbc trunk 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:";;
     1107     short | recursive ) echo "Configuration of Cbc trunk:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.8
     1333Cbc configure trunk
    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, which was
     1353It was created by Cbc $as_me trunk, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    52955295# Define the identity of the package.
    52965296 PACKAGE='cbc'
    5297  VERSION='2.8'
     5297 VERSION='trunk'
    52985298
    52995299
     
    2357723577cat >&5 <<_CSEOF
    2357823578
    23579 This file was extended by Cbc $as_me 2.8, which was
     23579This file was extended by Cbc $as_me trunk, which was
    2358023580generated by GNU Autoconf 2.59.  Invocation command line was
    2358123581
     
    2363523635cat >>$CONFIG_STATUS <<_ACEOF
    2363623636ac_cs_version="\\
    23637 Cbc config.status 2.8
     23637Cbc config.status trunk
    2363823638configured by $0, generated by GNU Autoconf 2.59,
    2363923639  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/configure.ac

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