Changeset 1456 for trunk


Ignore:
Timestamp:
Jun 1, 2010 9:32:19 PM (9 years ago)
Author:
lou
Message:

Change CBCVERSION to CBC_VERSION for compatibility. Update externals for final
stable prior to move to split configuration. Add Dependencies file.

Location:
trunk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.6
        22ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        33ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.1
        55ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        66Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 Data/miplib3       https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
         7Data/miplib3      https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
        88CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        99Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
        1010Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
        11 Osi               https://projects.coin-or.org/svn/Osi/stable/0.101/Osi
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
        1212Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • trunk/Cbc/configure

    r1433 r1456  
    17341734coin_projectdir=yes
    17351735
     1736# Check if a library version is set for libtool
     1737
     1738
    17361739
    17371740# Check if user wants to produce debugging code
     
    58195822*-*-irix6*)
    58205823  # Find out which ABI we are using.
    5821   echo '#line 5821 "configure"' > conftest.$ac_ext
     5824  echo '#line 5824 "configure"' > conftest.$ac_ext
    58225825  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58235826  (eval $ac_compile) 2>&5
     
    69536956
    69546957# Provide some information about the compiler.
    6955 echo "$as_me:6955:" \
     6958echo "$as_me:6958:" \
    69566959     "checking for Fortran 77 compiler version" >&5
    69576960ac_compiler=`set X $ac_compile; echo $2`
     
    80208023   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80218024   -e 's:$: $lt_compiler_flag:'`
    8022    (eval echo "\"\$as_me:8022: $lt_compile\"" >&5)
     8025   (eval echo "\"\$as_me:8025: $lt_compile\"" >&5)
    80238026   (eval "$lt_compile" 2>conftest.err)
    80248027   ac_status=$?
    80258028   cat conftest.err >&5
    8026    echo "$as_me:8026: \$? = $ac_status" >&5
     8029   echo "$as_me:8029: \$? = $ac_status" >&5
    80278030   if (exit $ac_status) && test -s "$ac_outfile"; then
    80288031     # The compiler can only warn and ignore the option if not recognized
     
    82888291   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82898292   -e 's:$: $lt_compiler_flag:'`
    8290    (eval echo "\"\$as_me:8290: $lt_compile\"" >&5)
     8293   (eval echo "\"\$as_me:8293: $lt_compile\"" >&5)
    82918294   (eval "$lt_compile" 2>conftest.err)
    82928295   ac_status=$?
    82938296   cat conftest.err >&5
    8294    echo "$as_me:8294: \$? = $ac_status" >&5
     8297   echo "$as_me:8297: \$? = $ac_status" >&5
    82958298   if (exit $ac_status) && test -s "$ac_outfile"; then
    82968299     # The compiler can only warn and ignore the option if not recognized
     
    83928395   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83938396   -e 's:$: $lt_compiler_flag:'`
    8394    (eval echo "\"\$as_me:8394: $lt_compile\"" >&5)
     8397   (eval echo "\"\$as_me:8397: $lt_compile\"" >&5)
    83958398   (eval "$lt_compile" 2>out/conftest.err)
    83968399   ac_status=$?
    83978400   cat out/conftest.err >&5
    8398    echo "$as_me:8398: \$? = $ac_status" >&5
     8401   echo "$as_me:8401: \$? = $ac_status" >&5
    83998402   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84008403   then
     
    1073710740  lt_status=$lt_dlunknown
    1073810741  cat > conftest.$ac_ext <<EOF
    10739 #line 10739 "configure"
     10742#line 10742 "configure"
    1074010743#include "confdefs.h"
    1074110744
     
    1083710840  lt_status=$lt_dlunknown
    1083810841  cat > conftest.$ac_ext <<EOF
    10839 #line 10839 "configure"
     10842#line 10842 "configure"
    1084010843#include "confdefs.h"
    1084110844
     
    1318113184   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1318213185   -e 's:$: $lt_compiler_flag:'`
    13183    (eval echo "\"\$as_me:13183: $lt_compile\"" >&5)
     13186   (eval echo "\"\$as_me:13186: $lt_compile\"" >&5)
    1318413187   (eval "$lt_compile" 2>conftest.err)
    1318513188   ac_status=$?
    1318613189   cat conftest.err >&5
    13187    echo "$as_me:13187: \$? = $ac_status" >&5
     13190   echo "$as_me:13190: \$? = $ac_status" >&5
    1318813191   if (exit $ac_status) && test -s "$ac_outfile"; then
    1318913192     # The compiler can only warn and ignore the option if not recognized
     
    1328513288   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1328613289   -e 's:$: $lt_compiler_flag:'`
    13287    (eval echo "\"\$as_me:13287: $lt_compile\"" >&5)
     13290   (eval echo "\"\$as_me:13290: $lt_compile\"" >&5)
    1328813291   (eval "$lt_compile" 2>out/conftest.err)
    1328913292   ac_status=$?
    1329013293   cat out/conftest.err >&5
    13291    echo "$as_me:13291: \$? = $ac_status" >&5
     13294   echo "$as_me:13294: \$? = $ac_status" >&5
    1329213295   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1329313296   then
     
    1485514858   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1485614859   -e 's:$: $lt_compiler_flag:'`
    14857    (eval echo "\"\$as_me:14857: $lt_compile\"" >&5)
     14860   (eval echo "\"\$as_me:14860: $lt_compile\"" >&5)
    1485814861   (eval "$lt_compile" 2>conftest.err)
    1485914862   ac_status=$?
    1486014863   cat conftest.err >&5
    14861    echo "$as_me:14861: \$? = $ac_status" >&5
     14864   echo "$as_me:14864: \$? = $ac_status" >&5
    1486214865   if (exit $ac_status) && test -s "$ac_outfile"; then
    1486314866     # The compiler can only warn and ignore the option if not recognized
     
    1495914962   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1496014963   -e 's:$: $lt_compiler_flag:'`
    14961    (eval echo "\"\$as_me:14961: $lt_compile\"" >&5)
     14964   (eval echo "\"\$as_me:14964: $lt_compile\"" >&5)
    1496214965   (eval "$lt_compile" 2>out/conftest.err)
    1496314966   ac_status=$?
    1496414967   cat out/conftest.err >&5
    14965    echo "$as_me:14965: \$? = $ac_status" >&5
     14968   echo "$as_me:14968: \$? = $ac_status" >&5
    1496614969   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1496714970   then
     
    1716617169   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1716717170   -e 's:$: $lt_compiler_flag:'`
    17168    (eval echo "\"\$as_me:17168: $lt_compile\"" >&5)
     17171   (eval echo "\"\$as_me:17171: $lt_compile\"" >&5)
    1716917172   (eval "$lt_compile" 2>conftest.err)
    1717017173   ac_status=$?
    1717117174   cat conftest.err >&5
    17172    echo "$as_me:17172: \$? = $ac_status" >&5
     17175   echo "$as_me:17175: \$? = $ac_status" >&5
    1717317176   if (exit $ac_status) && test -s "$ac_outfile"; then
    1717417177     # The compiler can only warn and ignore the option if not recognized
     
    1743417437   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1743517438   -e 's:$: $lt_compiler_flag:'`
    17436    (eval echo "\"\$as_me:17436: $lt_compile\"" >&5)
     17439   (eval echo "\"\$as_me:17439: $lt_compile\"" >&5)
    1743717440   (eval "$lt_compile" 2>conftest.err)
    1743817441   ac_status=$?
    1743917442   cat conftest.err >&5
    17440    echo "$as_me:17440: \$? = $ac_status" >&5
     17443   echo "$as_me:17443: \$? = $ac_status" >&5
    1744117444   if (exit $ac_status) && test -s "$ac_outfile"; then
    1744217445     # The compiler can only warn and ignore the option if not recognized
     
    1753817541   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1753917542   -e 's:$: $lt_compiler_flag:'`
    17540    (eval echo "\"\$as_me:17540: $lt_compile\"" >&5)
     17543   (eval echo "\"\$as_me:17543: $lt_compile\"" >&5)
    1754117544   (eval "$lt_compile" 2>out/conftest.err)
    1754217545   ac_status=$?
    1754317546   cat out/conftest.err >&5
    17544    echo "$as_me:17544: \$? = $ac_status" >&5
     17547   echo "$as_me:17547: \$? = $ac_status" >&5
    1754517548   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1754617549   then
     
    2042320426LT_LDFLAGS=
    2042420427
     20428# Check if we want to set the library version
     20429echo "$as_me:$LINENO: checking if library version is set" >&5
     20430echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
     20431if test x"$coin_libversion" != x; then
     20432  LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
     20433  echo "$as_me:$LINENO: result: $coin_libversion" >&5
     20434echo "${ECHO_T}$coin_libversion" >&6
     20435else
     20436  echo "$as_me:$LINENO: result: no" >&5
     20437echo "${ECHO_T}no" >&6
     20438fi
     20439
     20440
    2042520441
    2042620442#END
     
    2241322429
    2241422430cat >>confdefs.h <<_ACEOF
    22415 #define CBCVERSION "$PACKAGE_VERSION"
     22431#define CBC_VERSION "$PACKAGE_VERSION"
    2241622432_ACEOF
    2241722433
  • trunk/Cbc/configure.ac

    r1433 r1456  
    133133AC_DEFINE_UNQUOTED([CBC_DEFAULT_SOLVER],"$cbc_default_solver",
    134134  [Define to the name of the default solver to be used in cbc-generic in small letters])
    135 AC_DEFINE_UNQUOTED(CBCVERSION, "$PACKAGE_VERSION", "Version of Cbc")
     135AC_DEFINE_UNQUOTED(CBC_VERSION, "$PACKAGE_VERSION", "Version of Cbc")
    136136
    137137
  • trunk/Cbc/inc/config_cbc.h.in

    r1131 r1456  
    11/* inc/config_cbc.h.in.  Generated from configure.ac by autoheader.  */
    2 
    3 /* "Version of Cbc" */
    4 #undef CBCVERSION
    52
    63/* Define to the name of the default solver to be used in cbc-generic in small
     
    107/* Define to 1 if the SMP version of Cbc should be compiled */
    118#undef CBC_THREAD
     9
     10/* "Version of Cbc" */
     11#undef CBC_VERSION
    1212
    1313/* Define to the debug sanity check level (0 is no test) */
  • trunk/Cbc/src/CbcConfig.h

    r1433 r1456  
    9595/* #undef COIN_HAS_XPR */
    9696
     97#define CBCVERSION "trunk"
     98
    9799#endif /* HAVE_CONFIG_H */
    98 // Always make version 2.4
    99 #undef CBCVERSION
    100 #define CBCVERSION "2.5devel"
    101100
    102 #endif /*__HAVE_COINUTILS_CONFIG_H__*/
     101#endif /* __CBCCONFIG_H__ */
  • trunk/Cbc/src/CbcSolver.cpp

    r1433 r1456  
    4848#include "CbcSolverHeuristics.hpp"
    4949
    50 // Version
    51 #ifndef CBCVERSION
    52 #define CBCVERSION "2.5devel"
    53 #endif
    5450//#define USER_HAS_FAKE_CLP
    5551//#define USER_HAS_FAKE_CBC
     
    16251621        if (!noPrinting_) {
    16261622            sprintf(generalPrint, "Coin Cbc and Clp Solver version %s, build %s",
    1627                     CBCVERSION, __DATE__);
     1623                    CBC_VERSION, __DATE__);
    16281624            generalMessageHandler->message(CLP_GENERAL, generalMessages)
    16291625            << generalPrint
     
    73107306                        break;
    73117307                    case CLP_PARAM_ACTION_HELP:
    7312                         std::cout << "Coin Solver version " << CBCVERSION
     7308                        std::cout << "Coin Solver version " << CBC_VERSION
    73137309                                  << ", build " << __DATE__ << std::endl;
    73147310                        std::cout << "Non default values:-" << std::endl;
  • trunk/Externals

    r1429 r1456  
    1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.6
    22ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
    33ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
     4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.1
    55ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
    66Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
    7 Data/miplib3       https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
     7Data/miplib3      https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
    88CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
    99Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
    1010Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
    11 Osi               https://projects.coin-or.org/svn/Osi/stable/0.101/Osi
     11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
    1212Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • trunk/configure

    r1433 r1456  
    2079820798LT_LDFLAGS=
    2079920799
     20800# Check if we want to set the library version
     20801echo "$as_me:$LINENO: checking if library version is set" >&5
     20802echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
     20803if test x"$coin_libversion" != x; then
     20804  LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
     20805  echo "$as_me:$LINENO: result: $coin_libversion" >&5
     20806echo "${ECHO_T}$coin_libversion" >&6
     20807else
     20808  echo "$as_me:$LINENO: result: no" >&5
     20809echo "${ECHO_T}no" >&6
     20810fi
     20811
     20812
    2080020813
    2080120814#END
Note: See TracChangeset for help on using the changeset viewer.