Changeset 1701 for stable/2.7/Cbc


Ignore:
Timestamp:
Jul 22, 2011 12:04:28 PM (9 years ago)
Author:
tkr
Message:

restoring Cbc/stable/2.7

Location:
stable/2.7
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • stable/2.7

    • Property svn:externals

      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.0/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.0/
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.2.0/
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.0/
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.8.0/
        6 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.0/
        7 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.0/
        8 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.0/
        9 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.0/CoinUtils
        10 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.0/Cgl
        11 Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.0/Clp
        12 Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.0/Osi
         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
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         8Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
         10Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         11Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         12Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         13
         14

  • stable/2.7/Cbc/configure

    r1699 r1701  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.7.1.
     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.7.1'
    433 PACKAGE_STRING='Cbc 2.7.1'
     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.7.1 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.7.1:";;
     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.7.1
     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.7.1, which was
     1325It was created by Cbc $as_me trunk, which was
    13261326generated by GNU Autoconf 2.59.  Invocation command line was
    13271327
    … …  
    18491849
    18501850# Capture libtool library version, if given.
    1851 coin_libversion=10:1:7
    18521851
    18531852
    … …  
    46874686# Define the identity of the package.
    46884687 PACKAGE='cbc'
    4689  VERSION='2.7.1'
     4688 VERSION='trunk'
    46904689
    46914690
    … …  
    59835982*-*-irix6*)
    59845983  # Find out which ABI we are using.
    5985   echo '#line 5985 "configure"' > conftest.$ac_ext
     5984  echo '#line 5984 "configure"' > conftest.$ac_ext
    59865985  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59875986  (eval $ac_compile) 2>&5
    … …  
    71177116
    71187117# Provide some information about the compiler.
    7119 echo "$as_me:7119:" \
     7118echo "$as_me:7118:" \
    71207119     "checking for Fortran 77 compiler version" >&5
    71217120ac_compiler=`set X $ac_compile; echo $2`
    … …  
    81848183   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81858184   -e 's:$: $lt_compiler_flag:'`
    8186    (eval echo "\"\$as_me:8186: $lt_compile\"" >&5)
     8185   (eval echo "\"\$as_me:8185: $lt_compile\"" >&5)
    81878186   (eval "$lt_compile" 2>conftest.err)
    81888187   ac_status=$?
    81898188   cat conftest.err >&5
    8190    echo "$as_me:8190: \$? = $ac_status" >&5
     8189   echo "$as_me:8189: \$? = $ac_status" >&5
    81918190   if (exit $ac_status) && test -s "$ac_outfile"; then
    81928191     # The compiler can only warn and ignore the option if not recognized
    … …  
    84528451   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84538452   -e 's:$: $lt_compiler_flag:'`
    8454    (eval echo "\"\$as_me:8454: $lt_compile\"" >&5)
     8453   (eval echo "\"\$as_me:8453: $lt_compile\"" >&5)
    84558454   (eval "$lt_compile" 2>conftest.err)
    84568455   ac_status=$?
    84578456   cat conftest.err >&5
    8458    echo "$as_me:8458: \$? = $ac_status" >&5
     8457   echo "$as_me:8457: \$? = $ac_status" >&5
    84598458   if (exit $ac_status) && test -s "$ac_outfile"; then
    84608459     # The compiler can only warn and ignore the option if not recognized
    … …  
    85568555   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85578556   -e 's:$: $lt_compiler_flag:'`
    8558    (eval echo "\"\$as_me:8558: $lt_compile\"" >&5)
     8557   (eval echo "\"\$as_me:8557: $lt_compile\"" >&5)
    85598558   (eval "$lt_compile" 2>out/conftest.err)
    85608559   ac_status=$?
    85618560   cat out/conftest.err >&5
    8562    echo "$as_me:8562: \$? = $ac_status" >&5
     8561   echo "$as_me:8561: \$? = $ac_status" >&5
    85638562   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    85648563   then
    … …  
    1090110900  lt_status=$lt_dlunknown
    1090210901  cat > conftest.$ac_ext <<EOF
    10903 #line 10903 "configure"
     10902#line 10902 "configure"
    1090410903#include "confdefs.h"
    1090510904
    … …  
    1100111000  lt_status=$lt_dlunknown
    1100211001  cat > conftest.$ac_ext <<EOF
    11003 #line 11003 "configure"
     11002#line 11002 "configure"
    1100411003#include "confdefs.h"
    1100511004
    … …  
    1334513344   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1334613345   -e 's:$: $lt_compiler_flag:'`
    13347    (eval echo "\"\$as_me:13347: $lt_compile\"" >&5)
     13346   (eval echo "\"\$as_me:13346: $lt_compile\"" >&5)
    1334813347   (eval "$lt_compile" 2>conftest.err)
    1334913348   ac_status=$?
    1335013349   cat conftest.err >&5
    13351    echo "$as_me:13351: \$? = $ac_status" >&5
     13350   echo "$as_me:13350: \$? = $ac_status" >&5
    1335213351   if (exit $ac_status) && test -s "$ac_outfile"; then
    1335313352     # The compiler can only warn and ignore the option if not recognized
    … …  
    1344913448   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1345013449   -e 's:$: $lt_compiler_flag:'`
    13451    (eval echo "\"\$as_me:13451: $lt_compile\"" >&5)
     13450   (eval echo "\"\$as_me:13450: $lt_compile\"" >&5)
    1345213451   (eval "$lt_compile" 2>out/conftest.err)
    1345313452   ac_status=$?
    1345413453   cat out/conftest.err >&5
    13455    echo "$as_me:13455: \$? = $ac_status" >&5
     13454   echo "$as_me:13454: \$? = $ac_status" >&5
    1345613455   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1345713456   then
    … …  
    1501915018   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1502015019   -e 's:$: $lt_compiler_flag:'`
    15021    (eval echo "\"\$as_me:15021: $lt_compile\"" >&5)
     15020   (eval echo "\"\$as_me:15020: $lt_compile\"" >&5)
    1502215021   (eval "$lt_compile" 2>conftest.err)
    1502315022   ac_status=$?
    1502415023   cat conftest.err >&5
    15025    echo "$as_me:15025: \$? = $ac_status" >&5
     15024   echo "$as_me:15024: \$? = $ac_status" >&5
    1502615025   if (exit $ac_status) && test -s "$ac_outfile"; then
    1502715026     # The compiler can only warn and ignore the option if not recognized
    … …  
    1512315122   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1512415123   -e 's:$: $lt_compiler_flag:'`
    15125    (eval echo "\"\$as_me:15125: $lt_compile\"" >&5)
     15124   (eval echo "\"\$as_me:15124: $lt_compile\"" >&5)
    1512615125   (eval "$lt_compile" 2>out/conftest.err)
    1512715126   ac_status=$?
    1512815127   cat out/conftest.err >&5
    15129    echo "$as_me:15129: \$? = $ac_status" >&5
     15128   echo "$as_me:15128: \$? = $ac_status" >&5
    1513015129   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1513115130   then
    … …  
    1733017329   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1733117330   -e 's:$: $lt_compiler_flag:'`
    17332    (eval echo "\"\$as_me:17332: $lt_compile\"" >&5)
     17331   (eval echo "\"\$as_me:17331: $lt_compile\"" >&5)
    1733317332   (eval "$lt_compile" 2>conftest.err)
    1733417333   ac_status=$?
    1733517334   cat conftest.err >&5
    17336    echo "$as_me:17336: \$? = $ac_status" >&5
     17335   echo "$as_me:17335: \$? = $ac_status" >&5
    1733717336   if (exit $ac_status) && test -s "$ac_outfile"; then
    1733817337     # The compiler can only warn and ignore the option if not recognized
    … …  
    1759817597   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759917598   -e 's:$: $lt_compiler_flag:'`
    17600    (eval echo "\"\$as_me:17600: $lt_compile\"" >&5)
     17599   (eval echo "\"\$as_me:17599: $lt_compile\"" >&5)
    1760117600   (eval "$lt_compile" 2>conftest.err)
    1760217601   ac_status=$?
    1760317602   cat conftest.err >&5
    17604    echo "$as_me:17604: \$? = $ac_status" >&5
     17603   echo "$as_me:17603: \$? = $ac_status" >&5
    1760517604   if (exit $ac_status) && test -s "$ac_outfile"; then
    1760617605     # The compiler can only warn and ignore the option if not recognized
    … …  
    1770217701   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1770317702   -e 's:$: $lt_compiler_flag:'`
    17704    (eval echo "\"\$as_me:17704: $lt_compile\"" >&5)
     17703   (eval echo "\"\$as_me:17703: $lt_compile\"" >&5)
    1770517704   (eval "$lt_compile" 2>out/conftest.err)
    1770617705   ac_status=$?
    1770717706   cat out/conftest.err >&5
    17708    echo "$as_me:17708: \$? = $ac_status" >&5
     17707   echo "$as_me:17707: \$? = $ac_status" >&5
    1770917708   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1771017709   then
    … …  
    3083730836cat >&5 <<_CSEOF
    3083830837
    30839 This file was extended by Cbc $as_me 2.7.1, which was
     30838This file was extended by Cbc $as_me trunk, which was
    3084030839generated by GNU Autoconf 2.59.  Invocation command line was
    3084130840
    … …  
    3090030899cat >>$CONFIG_STATUS <<_ACEOF
    3090130900ac_cs_version="\\
    30902 Cbc config.status 2.7.1
     30901Cbc config.status trunk
    3090330902configured by $0, generated by GNU Autoconf 2.59,
    3090430903  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • stable/2.7/Cbc/configure.ac

    r1699 r1701  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.7.1],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[trunk],[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,10:1:7)
     44AC_COIN_PROJECTDIR_INIT(Cbc)
    4545
    4646# Check if user wants to produce debugging code

  • stable/2.7/Cbc/src/config_cbc_default.h

    r1699 r1701  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.7.1"
     8#define CBC_VERSION        "2.7"
    99
    1010/* Major Version number of project */
    11 #define CBC_VERSION_MAJOR 2
     11#define CBC_VERSION_MAJOR      2
    1212
    1313/* Minor Version number of project */
    14 #define CBC_VERSION_MINOR 7
     14#define CBC_VERSION_MINOR      7
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 1
     17#define CBC_VERSION_RELEASE 9999
Note: See TracChangeset for help on using the changeset viewer.