Changeset 1581 for stable


Ignore:
Timestamp:
Jan 6, 2011 4:55:42 PM (8 years ago)
Author:
stefan
Message:

restoring Cbc/stable/2.6

Location:
stable/2.6
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • stable/2.6

    • Property svn:externals

      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.6.3/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.1.3/
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.1.3/
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.2.3/
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.7.3/
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.6.2/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.1.2/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.1.2/
         4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.2.2/
         5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.7.2/
        66Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.1.0/
        77CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.7.1/CoinUtils
        8 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.56.2/Cgl
        9 Clp  https://projects.coin-or.org/svn/Clp/releases/1.13.2/Clp
        10 Osi  https://projects.coin-or.org/svn/Osi/releases/0.104.2/Osi
        11 Vol  https://projects.coin-or.org/svn/Vol/releases/1.2.2/Vol
         8Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.56.1/Cgl
         9Clp  https://projects.coin-or.org/svn/Clp/releases/1.13.1/Clp
         10Osi  https://projects.coin-or.org/svn/Osi/releases/0.104.1/Osi
         11Vol  https://projects.coin-or.org/svn/Vol/releases/1.2.1/Vol
         12
         13

  • stable/2.6/Cbc/configure

    r1579 r1581  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.6.2.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.6.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
    … …  
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.6.2'
    433 PACKAGE_STRING='Cbc 2.6.2'
     432PACKAGE_VERSION='2.6'
     433PACKAGE_STRING='Cbc 2.6'
    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.2 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.6 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.2:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.6:";;
    10751075   esac
    10761076  cat <<\_ACEOF
    … …  
    12981298if $ac_init_version; then
    12991299  cat <<\_ACEOF
    1300 Cbc configure 2.6.2
     1300Cbc configure 2.6
    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.2, which was
     1320It was created by Cbc $as_me 2.6, which was
    13211321generated by GNU Autoconf 2.59.  Invocation command line was
    13221322
    … …  
    18311831
    18321832# Capture libtool library version, if given.
    1833 coin_libversion=10:2:7
    18341833
    18351834
    … …  
    46514650# Define the identity of the package.
    46524651 PACKAGE='cbc'
    4653  VERSION='2.6.2'
     4652 VERSION='2.6'
    46544653
    46554654
    … …  
    59535952*-*-irix6*)
    59545953  # Find out which ABI we are using.
    5955   echo '#line 5955 "configure"' > conftest.$ac_ext
     5954  echo '#line 5954 "configure"' > conftest.$ac_ext
    59565955  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59575956  (eval $ac_compile) 2>&5
    … …  
    70877086
    70887087# Provide some information about the compiler.
    7089 echo "$as_me:7089:" \
     7088echo "$as_me:7088:" \
    70907089     "checking for Fortran 77 compiler version" >&5
    70917090ac_compiler=`set X $ac_compile; echo $2`
    … …  
    81548153   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81558154   -e 's:$: $lt_compiler_flag:'`
    8156    (eval echo "\"\$as_me:8156: $lt_compile\"" >&5)
     8155   (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
    81578156   (eval "$lt_compile" 2>conftest.err)
    81588157   ac_status=$?
    81598158   cat conftest.err >&5
    8160    echo "$as_me:8160: \$? = $ac_status" >&5
     8159   echo "$as_me:8159: \$? = $ac_status" >&5
    81618160   if (exit $ac_status) && test -s "$ac_outfile"; then
    81628161     # The compiler can only warn and ignore the option if not recognized
    … …  
    84228421   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84238422   -e 's:$: $lt_compiler_flag:'`
    8424    (eval echo "\"\$as_me:8424: $lt_compile\"" >&5)
     8423   (eval echo "\"\$as_me:8423: $lt_compile\"" >&5)
    84258424   (eval "$lt_compile" 2>conftest.err)
    84268425   ac_status=$?
    84278426   cat conftest.err >&5
    8428    echo "$as_me:8428: \$? = $ac_status" >&5
     8427   echo "$as_me:8427: \$? = $ac_status" >&5
    84298428   if (exit $ac_status) && test -s "$ac_outfile"; then
    84308429     # The compiler can only warn and ignore the option if not recognized
    … …  
    85268525   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85278526   -e 's:$: $lt_compiler_flag:'`
    8528    (eval echo "\"\$as_me:8528: $lt_compile\"" >&5)
     8527   (eval echo "\"\$as_me:8527: $lt_compile\"" >&5)
    85298528   (eval "$lt_compile" 2>out/conftest.err)
    85308529   ac_status=$?
    85318530   cat out/conftest.err >&5
    8532    echo "$as_me:8532: \$? = $ac_status" >&5
     8531   echo "$as_me:8531: \$? = $ac_status" >&5
    85338532   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    85348533   then
    … …  
    1087110870  lt_status=$lt_dlunknown
    1087210871  cat > conftest.$ac_ext <<EOF
    10873 #line 10873 "configure"
     10872#line 10872 "configure"
    1087410873#include "confdefs.h"
    1087510874
    … …  
    1097110970  lt_status=$lt_dlunknown
    1097210971  cat > conftest.$ac_ext <<EOF
    10973 #line 10973 "configure"
     10972#line 10972 "configure"
    1097410973#include "confdefs.h"
    1097510974
    … …  
    1331513314   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1331613315   -e 's:$: $lt_compiler_flag:'`
    13317    (eval echo "\"\$as_me:13317: $lt_compile\"" >&5)
     13316   (eval echo "\"\$as_me:13316: $lt_compile\"" >&5)
    1331813317   (eval "$lt_compile" 2>conftest.err)
    1331913318   ac_status=$?
    1332013319   cat conftest.err >&5
    13321    echo "$as_me:13321: \$? = $ac_status" >&5
     13320   echo "$as_me:13320: \$? = $ac_status" >&5
    1332213321   if (exit $ac_status) && test -s "$ac_outfile"; then
    1332313322     # The compiler can only warn and ignore the option if not recognized
    … …  
    1341913418   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1342013419   -e 's:$: $lt_compiler_flag:'`
    13421    (eval echo "\"\$as_me:13421: $lt_compile\"" >&5)
     13420   (eval echo "\"\$as_me:13420: $lt_compile\"" >&5)
    1342213421   (eval "$lt_compile" 2>out/conftest.err)
    1342313422   ac_status=$?
    1342413423   cat out/conftest.err >&5
    13425    echo "$as_me:13425: \$? = $ac_status" >&5
     13424   echo "$as_me:13424: \$? = $ac_status" >&5
    1342613425   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1342713426   then
    … …  
    1498914988   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1499014989   -e 's:$: $lt_compiler_flag:'`
    14991    (eval echo "\"\$as_me:14991: $lt_compile\"" >&5)
     14990   (eval echo "\"\$as_me:14990: $lt_compile\"" >&5)
    1499214991   (eval "$lt_compile" 2>conftest.err)
    1499314992   ac_status=$?
    1499414993   cat conftest.err >&5
    14995    echo "$as_me:14995: \$? = $ac_status" >&5
     14994   echo "$as_me:14994: \$? = $ac_status" >&5
    1499614995   if (exit $ac_status) && test -s "$ac_outfile"; then
    1499714996     # The compiler can only warn and ignore the option if not recognized
    … …  
    1509315092   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1509415093   -e 's:$: $lt_compiler_flag:'`
    15095    (eval echo "\"\$as_me:15095: $lt_compile\"" >&5)
     15094   (eval echo "\"\$as_me:15094: $lt_compile\"" >&5)
    1509615095   (eval "$lt_compile" 2>out/conftest.err)
    1509715096   ac_status=$?
    1509815097   cat out/conftest.err >&5
    15099    echo "$as_me:15099: \$? = $ac_status" >&5
     15098   echo "$as_me:15098: \$? = $ac_status" >&5
    1510015099   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1510115100   then
    … …  
    1730017299   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1730117300   -e 's:$: $lt_compiler_flag:'`
    17302    (eval echo "\"\$as_me:17302: $lt_compile\"" >&5)
     17301   (eval echo "\"\$as_me:17301: $lt_compile\"" >&5)
    1730317302   (eval "$lt_compile" 2>conftest.err)
    1730417303   ac_status=$?
    1730517304   cat conftest.err >&5
    17306    echo "$as_me:17306: \$? = $ac_status" >&5
     17305   echo "$as_me:17305: \$? = $ac_status" >&5
    1730717306   if (exit $ac_status) && test -s "$ac_outfile"; then
    1730817307     # The compiler can only warn and ignore the option if not recognized
    … …  
    1756817567   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1756917568   -e 's:$: $lt_compiler_flag:'`
    17570    (eval echo "\"\$as_me:17570: $lt_compile\"" >&5)
     17569   (eval echo "\"\$as_me:17569: $lt_compile\"" >&5)
    1757117570   (eval "$lt_compile" 2>conftest.err)
    1757217571   ac_status=$?
    1757317572   cat conftest.err >&5
    17574    echo "$as_me:17574: \$? = $ac_status" >&5
     17573   echo "$as_me:17573: \$? = $ac_status" >&5
    1757517574   if (exit $ac_status) && test -s "$ac_outfile"; then
    1757617575     # The compiler can only warn and ignore the option if not recognized
    … …  
    1767217671   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1767317672   -e 's:$: $lt_compiler_flag:'`
    17674    (eval echo "\"\$as_me:17674: $lt_compile\"" >&5)
     17673   (eval echo "\"\$as_me:17673: $lt_compile\"" >&5)
    1767517674   (eval "$lt_compile" 2>out/conftest.err)
    1767617675   ac_status=$?
    1767717676   cat out/conftest.err >&5
    17678    echo "$as_me:17678: \$? = $ac_status" >&5
     17677   echo "$as_me:17677: \$? = $ac_status" >&5
    1767917678   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1768017679   then
    … …  
    2872528724cat >&5 <<_CSEOF
    2872628725
    28727 This file was extended by Cbc $as_me 2.6.2, which was
     28726This file was extended by Cbc $as_me 2.6, which was
    2872828727generated by GNU Autoconf 2.59.  Invocation command line was
    2872928728
    … …  
    2878828787cat >>$CONFIG_STATUS <<_ACEOF
    2878928788ac_cs_version="\\
    28790 Cbc config.status 2.6.2
     28789Cbc config.status 2.6
    2879128790configured by $0, generated by GNU Autoconf 2.59,
    2879228791  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • stable/2.6/Cbc/configure.ac

    r1579 r1581  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.6.2],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.6],[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:2:7)
     44AC_COIN_PROJECTDIR_INIT(Cbc)
    4545
    4646# Check if user wants to produce debugging code

  • stable/2.6/Cbc/src/CbcConfig.h

    r1579 r1581  
    9696
    9797/* Cbc version */
    98 #define CBC_VERSION "2.6.2"
     98#define CBC_VERSION "2.6"
    9999
    100100/*

  • stable/2.6/Dependencies

    r1579 r1581  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.6.3/
    2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.1.3/
    3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.1.3/
    4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.2.3/
    5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.7.3/
    6 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.1.0/
    7 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.7.1/CoinUtils
    8 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.56.2/Cgl
    9 Clp  https://projects.coin-or.org/svn/Clp/releases/1.13.2/Clp
    10 Osi  https://projects.coin-or.org/svn/Osi/releases/0.104.2/Osi
    11 Vol  https://projects.coin-or.org/svn/Vol/releases/1.2.2/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.1
     3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.1
     4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.2
     5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.7
     6Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.1/
     7CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.7/CoinUtils
     8Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.56/Cgl
     9Clp  https://projects.coin-or.org/svn/Clp/stable/1.13/Clp
     10Osi  https://projects.coin-or.org/svn/Osi/stable/0.104/Osi
     11Vol  https://projects.coin-or.org/svn/Vol/stable/1.2/Vol

  • stable/2.6/configure

    r1579 r1581  
    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.2.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.6.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
    … …  
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.6.2'
    434 PACKAGE_STRING='Cbc 2.6.2'
     433PACKAGE_VERSION='2.6'
     434PACKAGE_STRING='Cbc 2.6'
    435435PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    436436
    … …  
    10411041  # This message is too long to be a string in the A/UX 3.1 sh.
    10421042  cat <<_ACEOF
    1043 \`configure' configures Cbc 2.6.2 to adapt to many kinds of systems.
     1043\`configure' configures Cbc 2.6 to adapt to many kinds of systems.
    10441044
    10451045Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    11071107if test -n "$ac_init_help"; then
    11081108  case $ac_init_help in
    1109      short | recursive ) echo "Configuration of Cbc 2.6.2:";;
     1109     short | recursive ) echo "Configuration of Cbc 2.6:";;
    11101110   esac
    11111111  cat <<\_ACEOF
    … …  
    13271327if $ac_init_version; then
    13281328  cat <<\_ACEOF
    1329 Cbc configure 2.6.2
     1329Cbc configure 2.6
    13301330generated by GNU Autoconf 2.59
    13311331
    … …  
    13471347running configure, to aid debugging if configure makes a mistake.
    13481348
    1349 It was created by Cbc $as_me 2.6.2, which was
     1349It was created by Cbc $as_me 2.6, which was
    13501350generated by GNU Autoconf 2.59.  Invocation command line was
    13511351
    … …  
    52195219# Define the identity of the package.
    52205220 PACKAGE='cbc'
    5221  VERSION='2.6.2'
     5221 VERSION='2.6'
    52225222
    52235223
    … …  
    2347723477cat >&5 <<_CSEOF
    2347823478
    23479 This file was extended by Cbc $as_me 2.6.2, which was
     23479This file was extended by Cbc $as_me 2.6, which was
    2348023480generated by GNU Autoconf 2.59.  Invocation command line was
    2348123481
    … …  
    2353523535cat >>$CONFIG_STATUS <<_ACEOF
    2353623536ac_cs_version="\\
    23537 Cbc config.status 2.6.2
     23537Cbc config.status 2.6
    2353823538configured by $0, generated by GNU Autoconf 2.59,
    2353923539  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • stable/2.6/configure.ac

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