Changeset 824 for stable/0.4


Ignore:
Timestamp:
Feb 9, 2012 11:57:16 PM (8 years ago)
Author:
pbelotti
Message:

update externals before creating release (fixes compilation errors)

Location:
stable/0.4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4

    • 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/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.0/
        5 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.0/
        6 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.0/
        7 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.1/
        8 ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/releases/1.0.0/
        9 ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/releases/1.0.0/
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.0/CoinUtils
        11 Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.1/Cbc
        12 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.0/Cgl
        13 Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.1/Clp
        14 Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.0/Osi
        15 Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.0/Ipopt
        16 Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.5.0/Bonmin
        17 
        18 
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.2/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.2/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.2.1/
         4ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.2/
         5ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.2/
         6ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.2/
         7ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.2/
         8ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/releases/1.0.2/
         9ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/releases/1.0.3/
         10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.6/CoinUtils
         11Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.5/Cbc
         12Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.3/Cgl
         13Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.6/Clp
         14Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.3/Osi
         15Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.1/Ipopt
         16Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.5.2/Bonmin
  • stable/0.4/Couenne/src/problem/CouenneProblem.hpp

    r795 r824  
    8484                    ((       a.get_ub    () <  b.get_ub    ()  - COUENNE_EPS_SYMM) ||
    8585                     ((fabs (a.get_ub    () -  b.get_ub    ()) < COUENNE_EPS_SYMM) &&
    86                       ((     a.get_index () <  b.get_index ()))))))))))) ? 1 : 0;
     86                      ((     a.get_index () <  b.get_index ())))))))))));
    8787
    8888    //   bool is_less = 0;
     
    102102    //              is_less = 1;
    103103    //            else{
    104     //              if(a.get_ub() == b.get_ub()) {
    105                    
     104    //              if(a.get_ub() == b.get_ub()) {                 
    106105    //                if(a.get_index() < b.get_index())
    107106    //                  is_less = 1;
     
    306305
    307306  // to record best solution found
    308   struct Couenne::CouenneRecordBestSol *recBSol;
     307  CouenneRecordBestSol *recBSol;
    309308
    310309  /// Type of Multilinear separation
     
    781780  ///
    782781  inline int getLastPrioSort() const
    783   {return lastPrioSort_;};
     782  {return lastPrioSort_;}
    784783
    785784  ///
     
    788787  /// returns recorded best solution
    789788  inline CouenneRecordBestSol *getRecordBestSol() const
    790   {return recBSol;};
     789  {return recBSol;}
    791790
    792791  /// returns feasibility tolerance
    793   double getFeasTol() {return feas_tolerance_;};
     792  double getFeasTol() {return feas_tolerance_;}
    794793
    795794  /// Recompute objective value for sol
  • stable/0.4/Externals

    r801 r824  
    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/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.0/
    5 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.0/
    6 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.0/
    7 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.1/
    8 ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/releases/1.0.0/
    9 ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/releases/1.0.0/
    10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.0/CoinUtils
    11 Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.1/Cbc
    12 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.0/Cgl
    13 Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.1/Clp
    14 Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.0/Osi
    15 Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.0/Ipopt
    16 Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.5.0/Bonmin
     1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.2/
     2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.2/
     3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.2.1/
     4ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.2/
     5ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.2/
     6ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.2/
     7ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.2/
     8ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/releases/1.0.2/
     9ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/releases/1.0.3/
     10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.6/CoinUtils
     11Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.5/Cbc
     12Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.3/Cgl
     13Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.6/Clp
     14Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.3/Osi
     15Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.1/Ipopt
     16Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.5.2/Bonmin
  • stable/0.4/configure

    r798 r824  
    18661866if test x"$CXX" != x; then
    18671867  case "$CXX" in
     1868    clang* ) ;;
    18681869    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18691870      if test x"$CC" = x; then
     
    26852686# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    26862687case "$CC" in
     2688  clang* ) ;;
    26872689  cl* | */cl* | CL* | */CL* )
    26882690    if test "$ac_cv_prog_cc_g" = yes ; then
     
    26972699coin_cc_is_cl=false
    26982700case "$CC" in
     2701  clang* ) ;;
    26992702  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    27002703    coin_cc_is_cl=true
     
    28002803      *-cygwin* | *-mingw*)
    28012804        case "$CC" in
     2805          clang* ) ;;
    28022806          cl* | */cl* | CL* | */CL*)
    28032807            coin_opt_cflags='-MT -O2'
     
    31213125# Correct the LD variable if we are using the MS or Intel-windows compiler
    31223126case "$CC" in
     3127  clang* ) ;;
    31233128  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    31243129    case $build in
     
    36143619# It seems that we need to cleanup something here for the Windows
    36153620case "$CXX" in
     3621  clang* ) ;;
    36163622  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    36173623    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     
    36353641# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    36363642case "$CXX" in
     3643  clang* ) ;;
    36373644  cl* | */cl* | CL* | */CL* )
    36383645    if test "$ac_cv_prog_cxx_g" = yes ; then
     
    37383745      *-cygwin* | *-mingw*)
    37393746        case "$CXX" in
     3747          clang* ) ;;
    37403748          cl* | */cl* | CL* | */CL*)
    37413749            # The MT and MTd options are mutually exclusive
     
    40674075# correct the LD variable in a mingw build with MS or intel compiler
    40684076case "$CXX" in
     4077  clang* ) ;;
    40694078  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    40704079    case $build in
     
    43234332
    43244333# Provide some information about the compiler.
    4325 echo "$as_me:4325:" \
     4334echo "$as_me:4334:" \
    43264335     "checking for Fortran 77 compiler version" >&5
    43274336ac_compiler=`set X $ac_compile; echo $2`
     
    65896598*-*-irix6*)
    65906599  # Find out which ABI we are using.
    6591   echo '#line 6591 "configure"' > conftest.$ac_ext
     6600  echo '#line 6600 "configure"' > conftest.$ac_ext
    65926601  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    65936602  (eval $ac_compile) 2>&5
     
    85538562   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85548563   -e 's:$: $lt_compiler_flag:'`
    8555    (eval echo "\"\$as_me:8555: $lt_compile\"" >&5)
     8564   (eval echo "\"\$as_me:8564: $lt_compile\"" >&5)
    85568565   (eval "$lt_compile" 2>conftest.err)
    85578566   ac_status=$?
    85588567   cat conftest.err >&5
    8559    echo "$as_me:8559: \$? = $ac_status" >&5
     8568   echo "$as_me:8568: \$? = $ac_status" >&5
    85608569   if (exit $ac_status) && test -s "$ac_outfile"; then
    85618570     # The compiler can only warn and ignore the option if not recognized
     
    88218830   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    88228831   -e 's:$: $lt_compiler_flag:'`
    8823    (eval echo "\"\$as_me:8823: $lt_compile\"" >&5)
     8832   (eval echo "\"\$as_me:8832: $lt_compile\"" >&5)
    88248833   (eval "$lt_compile" 2>conftest.err)
    88258834   ac_status=$?
    88268835   cat conftest.err >&5
    8827    echo "$as_me:8827: \$? = $ac_status" >&5
     8836   echo "$as_me:8836: \$? = $ac_status" >&5
    88288837   if (exit $ac_status) && test -s "$ac_outfile"; then
    88298838     # The compiler can only warn and ignore the option if not recognized
     
    89258934   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    89268935   -e 's:$: $lt_compiler_flag:'`
    8927    (eval echo "\"\$as_me:8927: $lt_compile\"" >&5)
     8936   (eval echo "\"\$as_me:8936: $lt_compile\"" >&5)
    89288937   (eval "$lt_compile" 2>out/conftest.err)
    89298938   ac_status=$?
    89308939   cat out/conftest.err >&5
    8931    echo "$as_me:8931: \$? = $ac_status" >&5
     8940   echo "$as_me:8940: \$? = $ac_status" >&5
    89328941   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    89338942   then
     
    1127011279  lt_status=$lt_dlunknown
    1127111280  cat > conftest.$ac_ext <<EOF
    11272 #line 11272 "configure"
     11281#line 11281 "configure"
    1127311282#include "confdefs.h"
    1127411283
     
    1137011379  lt_status=$lt_dlunknown
    1137111380  cat > conftest.$ac_ext <<EOF
    11372 #line 11372 "configure"
     11381#line 11381 "configure"
    1137311382#include "confdefs.h"
    1137411383
     
    1371413723   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1371513724   -e 's:$: $lt_compiler_flag:'`
    13716    (eval echo "\"\$as_me:13716: $lt_compile\"" >&5)
     13725   (eval echo "\"\$as_me:13725: $lt_compile\"" >&5)
    1371713726   (eval "$lt_compile" 2>conftest.err)
    1371813727   ac_status=$?
    1371913728   cat conftest.err >&5
    13720    echo "$as_me:13720: \$? = $ac_status" >&5
     13729   echo "$as_me:13729: \$? = $ac_status" >&5
    1372113730   if (exit $ac_status) && test -s "$ac_outfile"; then
    1372213731     # The compiler can only warn and ignore the option if not recognized
     
    1381813827   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1381913828   -e 's:$: $lt_compiler_flag:'`
    13820    (eval echo "\"\$as_me:13820: $lt_compile\"" >&5)
     13829   (eval echo "\"\$as_me:13829: $lt_compile\"" >&5)
    1382113830   (eval "$lt_compile" 2>out/conftest.err)
    1382213831   ac_status=$?
    1382313832   cat out/conftest.err >&5
    13824    echo "$as_me:13824: \$? = $ac_status" >&5
     13833   echo "$as_me:13833: \$? = $ac_status" >&5
    1382513834   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1382613835   then
     
    1538815397   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1538915398   -e 's:$: $lt_compiler_flag:'`
    15390    (eval echo "\"\$as_me:15390: $lt_compile\"" >&5)
     15399   (eval echo "\"\$as_me:15399: $lt_compile\"" >&5)
    1539115400   (eval "$lt_compile" 2>conftest.err)
    1539215401   ac_status=$?
    1539315402   cat conftest.err >&5
    15394    echo "$as_me:15394: \$? = $ac_status" >&5
     15403   echo "$as_me:15403: \$? = $ac_status" >&5
    1539515404   if (exit $ac_status) && test -s "$ac_outfile"; then
    1539615405     # The compiler can only warn and ignore the option if not recognized
     
    1549215501   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1549315502   -e 's:$: $lt_compiler_flag:'`
    15494    (eval echo "\"\$as_me:15494: $lt_compile\"" >&5)
     15503   (eval echo "\"\$as_me:15503: $lt_compile\"" >&5)
    1549515504   (eval "$lt_compile" 2>out/conftest.err)
    1549615505   ac_status=$?
    1549715506   cat out/conftest.err >&5
    15498    echo "$as_me:15498: \$? = $ac_status" >&5
     15507   echo "$as_me:15507: \$? = $ac_status" >&5
    1549915508   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1550015509   then
     
    1769917708   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1770017709   -e 's:$: $lt_compiler_flag:'`
    17701    (eval echo "\"\$as_me:17701: $lt_compile\"" >&5)
     17710   (eval echo "\"\$as_me:17710: $lt_compile\"" >&5)
    1770217711   (eval "$lt_compile" 2>conftest.err)
    1770317712   ac_status=$?
    1770417713   cat conftest.err >&5
    17705    echo "$as_me:17705: \$? = $ac_status" >&5
     17714   echo "$as_me:17714: \$? = $ac_status" >&5
    1770617715   if (exit $ac_status) && test -s "$ac_outfile"; then
    1770717716     # The compiler can only warn and ignore the option if not recognized
     
    1796717976   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1796817977   -e 's:$: $lt_compiler_flag:'`
    17969    (eval echo "\"\$as_me:17969: $lt_compile\"" >&5)
     17978   (eval echo "\"\$as_me:17978: $lt_compile\"" >&5)
    1797017979   (eval "$lt_compile" 2>conftest.err)
    1797117980   ac_status=$?
    1797217981   cat conftest.err >&5
    17973    echo "$as_me:17973: \$? = $ac_status" >&5
     17982   echo "$as_me:17982: \$? = $ac_status" >&5
    1797417983   if (exit $ac_status) && test -s "$ac_outfile"; then
    1797517984     # The compiler can only warn and ignore the option if not recognized
     
    1807118080   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1807218081   -e 's:$: $lt_compiler_flag:'`
    18073    (eval echo "\"\$as_me:18073: $lt_compile\"" >&5)
     18082   (eval echo "\"\$as_me:18082: $lt_compile\"" >&5)
    1807418083   (eval "$lt_compile" 2>out/conftest.err)
    1807518084   ac_status=$?
    1807618085   cat out/conftest.err >&5
    18077    echo "$as_me:18077: \$? = $ac_status" >&5
     18086   echo "$as_me:18086: \$? = $ac_status" >&5
    1807818087   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1807918088   then
     
    2081120820    *-cygwin* | *-mingw*)
    2081220821       case "$CXX" in
     20822    clang* )
     20823      # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
     20824      { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5
     20825echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;}
     20826      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     20827          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     20828          -e 's|libext="lib"|libext="a"|' \
     20829      libtool > conftest.bla
     20830      ;;
    2081320831    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2081420832      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
     
    2082620844          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    2082720845      libtool > conftest.bla
    20828 
    20829       mv conftest.bla libtool
    20830       chmod 755 libtool
    2083120846      ;;
    2083220847    *)
     
    2083720852          -e 's|libext="lib"|libext="a"|' \
    2083820853      libtool > conftest.bla
    20839 
    20840       mv conftest.bla libtool
    20841       chmod 755 libtool
    2084220854      ;;
    2084320855  esac
     20856  mv conftest.bla libtool
     20857  chmod 755 libtool
     20858
    2084420859      ;;
    2084520860    *-darwin*)
     
    2291322928fi
    2291422929case "$CC" in
     22930  clang* ) ;;
    2291522931  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2291622932    coin_link_input_cmd=cp ;;
     
    2292622942
    2292722943  case "$CC" in
     22944    clang* )
     22945         LIBEXT=a ;;
    2292822946    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2292922947         LIBEXT=lib ;;
Note: See TracChangeset for help on using the changeset viewer.