Changeset 2114 for stable


Ignore:
Timestamp:
Jan 18, 2015 6:12:44 AM (4 years ago)
Author:
stefan
Message:

temporarily committing release candidate

Location:
stable/2.8
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • stable/2.8

    • 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.3
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.4
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.9
        6 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
        7 ThirdParty/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 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.9/CoinUtils
        10 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.58/Cgl
        11 Clp  https://projects.coin-or.org/svn/Clp/stable/1.15/Clp
        12 Osi  https://projects.coin-or.org/svn/Osi/stable/0.106/Osi
        13 
        14 
        15 
        16 
        17 
        18 
        19 
        20 
        21 
        22 
        23 
        24 
        25 
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.18/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.17/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.3.12/
         4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.4.12/
         5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.9.6/
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.11/
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.14/
         8Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.10/
         9CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.9.19/CoinUtils
         10Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.58.11/Cgl
         11Clp  https://projects.coin-or.org/svn/Clp/releases/1.15.12/Clp
         12Osi  https://projects.coin-or.org/svn/Osi/releases/0.106.10/Osi

  • stable/2.8/Cbc/configure

    r2067 r2114  
    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 2.8.13.
    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='2.8.13'
     433PACKAGE_STRING='Cbc 2.8.13'
    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 2.8.13 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 2.8.13:";;
    10751075   esac
    10761076  cat <<\_ACEOF
    … …  
    13061306if $ac_init_version; then
    13071307  cat <<\_ACEOF
    1308 Cbc configure 2.8
     1308Cbc configure 2.8.13
    13091309generated by GNU Autoconf 2.59
    13101310
    … …  
    13261326running configure, to aid debugging if configure makes a mistake.
    13271327
    1328 It was created by Cbc $as_me 2.8, which was
     1328It was created by Cbc $as_me 2.8.13, which was
    13291329generated by GNU Autoconf 2.59.  Invocation command line was
    13301330
    … …  
    18521852
    18531853# Capture libtool library version, if given.
     1854 coin_libversion=11:13:8
    18541855
    18551856
    … …  
    20922093             fi
    20932094             ;;
    2094   *-*-darwin*) comps="clang gcc" ;;
     2095  *-*-darwin*) comps="clang gcc cc" ;;
    20952096  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    20962097  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    … …  
    32493250  *-*-solaris*)
    32503251             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3251   *-darwin*) comps="g++ c++ CC" ;;
     3252  *-darwin*) comps="clang++ g++ c++ CC" ;;
    32523253  *-linux-gnu*)
    32533254             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
    … …  
    36863687# It seems that we need to cleanup something here for the Windows
    36873688case "$CXX" in
    3688   clang* ) ;;
     3689  clang* | */clang*) ;;
    36893690  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    36903691    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    … …  
    45744575# Define the identity of the package.
    45754576 PACKAGE='cbc'
    4576  VERSION='2.8'
     4577 VERSION='2.8.13'
    45774578
    45784579
    … …  
    58705871*-*-irix6*)
    58715872  # Find out which ABI we are using.
    5872   echo '#line 5872 "configure"' > conftest.$ac_ext
     5873  echo '#line 5873 "configure"' > conftest.$ac_ext
    58735874  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58745875  (eval $ac_compile) 2>&5
    … …  
    70047005
    70057006# Provide some information about the compiler.
    7006 echo "$as_me:7006:" \
     7007echo "$as_me:7007:" \
    70077008     "checking for Fortran 77 compiler version" >&5
    70087009ac_compiler=`set X $ac_compile; echo $2`
    … …  
    80718072   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80728073   -e 's:$: $lt_compiler_flag:'`
    8073    (eval echo "\"\$as_me:8073: $lt_compile\"" >&5)
     8074   (eval echo "\"\$as_me:8074: $lt_compile\"" >&5)
    80748075   (eval "$lt_compile" 2>conftest.err)
    80758076   ac_status=$?
    80768077   cat conftest.err >&5
    8077    echo "$as_me:8077: \$? = $ac_status" >&5
     8078   echo "$as_me:8078: \$? = $ac_status" >&5
    80788079   if (exit $ac_status) && test -s "$ac_outfile"; then
    80798080     # The compiler can only warn and ignore the option if not recognized
    … …  
    83398340   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83408341   -e 's:$: $lt_compiler_flag:'`
    8341    (eval echo "\"\$as_me:8341: $lt_compile\"" >&5)
     8342   (eval echo "\"\$as_me:8342: $lt_compile\"" >&5)
    83428343   (eval "$lt_compile" 2>conftest.err)
    83438344   ac_status=$?
    83448345   cat conftest.err >&5
    8345    echo "$as_me:8345: \$? = $ac_status" >&5
     8346   echo "$as_me:8346: \$? = $ac_status" >&5
    83468347   if (exit $ac_status) && test -s "$ac_outfile"; then
    83478348     # The compiler can only warn and ignore the option if not recognized
    … …  
    84438444   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84448445   -e 's:$: $lt_compiler_flag:'`
    8445    (eval echo "\"\$as_me:8445: $lt_compile\"" >&5)
     8446   (eval echo "\"\$as_me:8446: $lt_compile\"" >&5)
    84468447   (eval "$lt_compile" 2>out/conftest.err)
    84478448   ac_status=$?
    84488449   cat out/conftest.err >&5
    8449    echo "$as_me:8449: \$? = $ac_status" >&5
     8450   echo "$as_me:8450: \$? = $ac_status" >&5
    84508451   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84518452   then
    … …  
    1078810789  lt_status=$lt_dlunknown
    1078910790  cat > conftest.$ac_ext <<EOF
    10790 #line 10790 "configure"
     10791#line 10791 "configure"
    1079110792#include "confdefs.h"
    1079210793
    … …  
    1088810889  lt_status=$lt_dlunknown
    1088910890  cat > conftest.$ac_ext <<EOF
    10890 #line 10890 "configure"
     10891#line 10891 "configure"
    1089110892#include "confdefs.h"
    1089210893
    … …  
    1323213233   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1323313234   -e 's:$: $lt_compiler_flag:'`
    13234    (eval echo "\"\$as_me:13234: $lt_compile\"" >&5)
     13235   (eval echo "\"\$as_me:13235: $lt_compile\"" >&5)
    1323513236   (eval "$lt_compile" 2>conftest.err)
    1323613237   ac_status=$?
    1323713238   cat conftest.err >&5
    13238    echo "$as_me:13238: \$? = $ac_status" >&5
     13239   echo "$as_me:13239: \$? = $ac_status" >&5
    1323913240   if (exit $ac_status) && test -s "$ac_outfile"; then
    1324013241     # The compiler can only warn and ignore the option if not recognized
    … …  
    1333613337   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1333713338   -e 's:$: $lt_compiler_flag:'`
    13338    (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
     13339   (eval echo "\"\$as_me:13339: $lt_compile\"" >&5)
    1333913340   (eval "$lt_compile" 2>out/conftest.err)
    1334013341   ac_status=$?
    1334113342   cat out/conftest.err >&5
    13342    echo "$as_me:13342: \$? = $ac_status" >&5
     13343   echo "$as_me:13343: \$? = $ac_status" >&5
    1334313344   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1334413345   then
    … …  
    1490614907   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1490714908   -e 's:$: $lt_compiler_flag:'`
    14908    (eval echo "\"\$as_me:14908: $lt_compile\"" >&5)
     14909   (eval echo "\"\$as_me:14909: $lt_compile\"" >&5)
    1490914910   (eval "$lt_compile" 2>conftest.err)
    1491014911   ac_status=$?
    1491114912   cat conftest.err >&5
    14912    echo "$as_me:14912: \$? = $ac_status" >&5
     14913   echo "$as_me:14913: \$? = $ac_status" >&5
    1491314914   if (exit $ac_status) && test -s "$ac_outfile"; then
    1491414915     # The compiler can only warn and ignore the option if not recognized
    … …  
    1501015011   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1501115012   -e 's:$: $lt_compiler_flag:'`
    15012    (eval echo "\"\$as_me:15012: $lt_compile\"" >&5)
     15013   (eval echo "\"\$as_me:15013: $lt_compile\"" >&5)
    1501315014   (eval "$lt_compile" 2>out/conftest.err)
    1501415015   ac_status=$?
    1501515016   cat out/conftest.err >&5
    15016    echo "$as_me:15016: \$? = $ac_status" >&5
     15017   echo "$as_me:15017: \$? = $ac_status" >&5
    1501715018   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1501815019   then
    … …  
    1721717218   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1721817219   -e 's:$: $lt_compiler_flag:'`
    17219    (eval echo "\"\$as_me:17219: $lt_compile\"" >&5)
     17220   (eval echo "\"\$as_me:17220: $lt_compile\"" >&5)
    1722017221   (eval "$lt_compile" 2>conftest.err)
    1722117222   ac_status=$?
    1722217223   cat conftest.err >&5
    17223    echo "$as_me:17223: \$? = $ac_status" >&5
     17224   echo "$as_me:17224: \$? = $ac_status" >&5
    1722417225   if (exit $ac_status) && test -s "$ac_outfile"; then
    1722517226     # The compiler can only warn and ignore the option if not recognized
    … …  
    1748517486   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1748617487   -e 's:$: $lt_compiler_flag:'`
    17487    (eval echo "\"\$as_me:17487: $lt_compile\"" >&5)
     17488   (eval echo "\"\$as_me:17488: $lt_compile\"" >&5)
    1748817489   (eval "$lt_compile" 2>conftest.err)
    1748917490   ac_status=$?
    1749017491   cat conftest.err >&5
    17491    echo "$as_me:17491: \$? = $ac_status" >&5
     17492   echo "$as_me:17492: \$? = $ac_status" >&5
    1749217493   if (exit $ac_status) && test -s "$ac_outfile"; then
    1749317494     # The compiler can only warn and ignore the option if not recognized
    … …  
    1758917590   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759017591   -e 's:$: $lt_compiler_flag:'`
    17591    (eval echo "\"\$as_me:17591: $lt_compile\"" >&5)
     17592   (eval echo "\"\$as_me:17592: $lt_compile\"" >&5)
    1759217593   (eval "$lt_compile" 2>out/conftest.err)
    1759317594   ac_status=$?
    1759417595   cat out/conftest.err >&5
    17595    echo "$as_me:17595: \$? = $ac_status" >&5
     17596   echo "$as_me:17596: \$? = $ac_status" >&5
    1759617597   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1759717598   then
    … …  
    3114431145cat >&5 <<_CSEOF
    3114531146
    31146 This file was extended by Cbc $as_me 2.8, which was
     31147This file was extended by Cbc $as_me 2.8.13, which was
    3114731148generated by GNU Autoconf 2.59.  Invocation command line was
    3114831149
    … …  
    3120731208cat >>$CONFIG_STATUS <<_ACEOF
    3120831209ac_cs_version="\\
    31209 Cbc config.status 2.8
     31210Cbc config.status 2.8.13
    3121031211configured by $0, generated by GNU Autoconf 2.59,
    3121131212  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • stable/2.8/Cbc/configure.ac

    r2067 r2114  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.8],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.8.13],[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)
     44AC_COIN_PROJECTDIR_INIT(Cbc,11:13:8)
    4545
    4646# Check if user wants to produce debugging code

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

    r2067 r2114  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.8"
     8#define CBC_VERSION "2.8.13"
    99
    1010/* Major Version number of project */
    … …  
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 9999
     17#define CBC_VERSION_RELEASE 13

  • stable/2.8/configure

    r2067 r2114  
    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 2.8.13.
    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='2.8.13'
     434PACKAGE_STRING='Cbc 2.8.13'
    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 2.8.13 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 2.8.13:";;
    11081108   esac
    11091109  cat <<\_ACEOF
    … …  
    13281328if $ac_init_version; then
    13291329  cat <<\_ACEOF
    1330 Cbc configure 2.8
     1330Cbc configure 2.8.13
    13311331generated by GNU Autoconf 2.59
    13321332
    … …  
    13481348running configure, to aid debugging if configure makes a mistake.
    13491349
    1350 It was created by Cbc $as_me 2.8, which was
     1350It was created by Cbc $as_me 2.8.13, which was
    13511351generated by GNU Autoconf 2.59.  Invocation command line was
    13521352
    … …  
    19461946             fi
    19471947             ;;
    1948   *-*-darwin*) comps="clang gcc" ;;
     1948  *-*-darwin*) comps="clang gcc cc" ;;
    19491949  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    19501950  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    … …  
    31053105  *-*-solaris*)
    31063106             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3107   *-darwin*) comps="g++ c++ CC" ;;
     3107  *-darwin*) comps="clang++ g++ c++ CC" ;;
    31083108  *-linux-gnu*)
    31093109             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
    … …  
    35423542# It seems that we need to cleanup something here for the Windows
    35433543case "$CXX" in
    3544   clang* ) ;;
     3544  clang* | */clang*) ;;
    35453545  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    35463546    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    … …  
    51155115# Define the identity of the package.
    51165116 PACKAGE='cbc'
    5117  VERSION='2.8'
     5117 VERSION='2.8.13'
    51185118
    51195119
    … …  
    2343423434cat >&5 <<_CSEOF
    2343523435
    23436 This file was extended by Cbc $as_me 2.8, which was
     23436This file was extended by Cbc $as_me 2.8.13, which was
    2343723437generated by GNU Autoconf 2.59.  Invocation command line was
    2343823438
    … …  
    2349223492cat >>$CONFIG_STATUS <<_ACEOF
    2349323493ac_cs_version="\\
    23494 Cbc config.status 2.8
     23494Cbc config.status 2.8.13
    2349523495configured by $0, generated by GNU Autoconf 2.59,
    2349623496  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • stable/2.8/configure.ac

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