Changeset 1524


Ignore:
Timestamp:
Nov 4, 2010 1:47:24 PM (9 years ago)
Author:
lou
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/releases/0.6.0/
        2 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.1.0/
        3 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.7.0/CoinUtils
        4 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.56.0/Cgl
        5 Clp  https://projects.coin-or.org/svn/Clp/releases/1.13.0/Clp
        6 Osi  https://projects.coin-or.org/svn/Osi/releases/0.104.0/Osi
        7 Vol  https://projects.coin-or.org/svn/Vol/releases/1.2.0/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/Sample/trunk
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/trunk
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
         13
  • trunk/Cbc/configure

    r1522 r1524  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.6.
     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.6'
    433 PACKAGE_STRING='Cbc 2.6'
     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.6 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.6:";;
     1074     short | recursive ) echo "Configuration of Cbc trunk:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    12981298if $ac_init_version; then
    12991299  cat <<\_ACEOF
    1300 Cbc configure 2.6
     1300Cbc configure trunk
    13011301generated by GNU Autoconf 2.59
    13021302
     
    13181318running configure, to aid debugging if configure makes a mistake.
    13191319
    1320 It was created by Cbc $as_me 2.6, which was
     1320It was created by Cbc $as_me trunk, which was
    13211321generated by GNU Autoconf 2.59.  Invocation command line was
    13221322
     
    46164616# Define the identity of the package.
    46174617 PACKAGE='cbc'
    4618  VERSION='2.6'
     4618 VERSION='trunk'
    46194619
    46204620
     
    2682426824cat >&5 <<_CSEOF
    2682526825
    26826 This file was extended by Cbc $as_me 2.6, which was
     26826This file was extended by Cbc $as_me trunk, which was
    2682726827generated by GNU Autoconf 2.59.  Invocation command line was
    2682826828
     
    2688726887cat >>$CONFIG_STATUS <<_ACEOF
    2688826888ac_cs_version="\\
    26889 Cbc config.status 2.6
     26889Cbc config.status trunk
    2689026890configured by $0, generated by GNU Autoconf 2.59,
    2689126891  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/Cbc/configure.ac

    r1522 r1524  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.6],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[trunk],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
  • trunk/Cbc/src/CbcConfig.h

    r1522 r1524  
    9696
    9797/* Cbc version */
    98 #define CBC_VERSION "2.6"
     98#define CBC_VERSION "trunk"
    9999
    100100/*
  • trunk/Dependencies

    r1522 r1524  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.6/
    2 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.1/
    3 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.7/CoinUtils
    4 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.56/Cgl
    5 Clp  https://projects.coin-or.org/svn/Clp/stable/1.13/Clp
    6 Osi  https://projects.coin-or.org/svn/Osi/stable/0.104/Osi
    7 Vol  https://projects.coin-or.org/svn/Vol/stable/1.2/Vol
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
     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.0
     5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
     6Data/Sample       https://projects.coin-or.org/svn/Data/Sample/trunk
     7CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
     8Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
     9Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
     10Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
     11Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
  • trunk/configure

    r1522 r1524  
    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.6.
     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.6'
    434 PACKAGE_STRING='Cbc 2.6'
     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.6 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.6:";;
     1107     short | recursive ) echo "Configuration of Cbc trunk:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13191319if $ac_init_version; then
    13201320  cat <<\_ACEOF
    1321 Cbc configure 2.6
     1321Cbc configure trunk
    13221322generated by GNU Autoconf 2.59
    13231323
     
    13391339running configure, to aid debugging if configure makes a mistake.
    13401340
    1341 It was created by Cbc $as_me 2.6, which was
     1341It was created by Cbc $as_me trunk, which was
    13421342generated by GNU Autoconf 2.59.  Invocation command line was
    13431343
     
    51775177# Define the identity of the package.
    51785178 PACKAGE='cbc'
    5179  VERSION='2.6'
     5179 VERSION='trunk'
    51805180
    51815181
     
    2317923179cat >&5 <<_CSEOF
    2318023180
    23181 This file was extended by Cbc $as_me 2.6, which was
     23181This file was extended by Cbc $as_me trunk, which was
    2318223182generated by GNU Autoconf 2.59.  Invocation command line was
    2318323183
     
    2323723237cat >>$CONFIG_STATUS <<_ACEOF
    2323823238ac_cs_version="\\
    23239 Cbc config.status 2.6
     23239Cbc config.status trunk
    2324023240configured by $0, generated by GNU Autoconf 2.59,
    2324123241  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/configure.ac

    r1522 r1524  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.6],[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.