Changeset 2502


Ignore:
Timestamp:
Feb 22, 2019 5:52:22 PM (4 months ago)
Author:
stefan
Message:

restoring Cbc/trunk

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.8/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.4.1/
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.7/
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.6.0/
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.6/
        6 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.7/
        7 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.6.1/
        8 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.11/
        9 Data/miplib3  https://projects.coin-or.org/svn/Data/miplib3/releases/1.2.7/
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.11.0/CoinUtils
        11 Osi  https://projects.coin-or.org/svn/Osi/releases/0.108.0/Osi
        12 Clp  https://projects.coin-or.org/svn/Clp/releases/1.17.0/Clp
        13 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.60.0/Cgl
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
         8Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
         10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         13Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         14
  • trunk/Cbc/configure

    r2500 r2502  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.10.
     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.10'
    433 PACKAGE_STRING='Cbc 2.10'
     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.10 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.10:";;
     1074     short | recursive ) echo "Configuration of Cbc trunk:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13191319if $ac_init_version; then
    13201320  cat <<\_ACEOF
    1321 Cbc configure 2.10
     1321Cbc configure trunk
    13221322generated by GNU Autoconf 2.59
    13231323
     
    13391339running configure, to aid debugging if configure makes a mistake.
    13401340
    1341 It was created by Cbc $as_me 2.10, which was
     1341It was created by Cbc $as_me trunk, which was
    13421342generated by GNU Autoconf 2.59.  Invocation command line was
    13431343
     
    45724572# Define the identity of the package.
    45734573 PACKAGE='cbc'
    4574  VERSION='2.10'
     4574 VERSION='trunk'
    45754575
    45764576
     
    3248832488cat >&5 <<_CSEOF
    3248932489
    32490 This file was extended by Cbc $as_me 2.10, which was
     32490This file was extended by Cbc $as_me trunk, which was
    3249132491generated by GNU Autoconf 2.59.  Invocation command line was
    3249232492
     
    3255132551cat >>$CONFIG_STATUS <<_ACEOF
    3255232552ac_cs_version="\\
    32553 Cbc config.status 2.10
     32553Cbc config.status trunk
    3255432554configured by $0, generated by GNU Autoconf 2.59,
    3255532555  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/Cbc/configure.ac

    r2500 r2502  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.10],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[trunk],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
  • trunk/Cbc/src/config_cbc_default.h

    r2500 r2502  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.10"
     8#define CBC_VERSION "trunk"
    99
    1010/* Major Version number of project */
    11 #define CBC_VERSION_MAJOR 2
     11#define CBC_VERSION_MAJOR 9999
    1212
    1313/* Minor Version number of project */
    14 #define CBC_VERSION_MINOR 10
     14#define CBC_VERSION_MINOR 9999
    1515
    1616/* Release Version number of project */
  • trunk/Dependencies

    r2500 r2502  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.8
    2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
    3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
    4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
    5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
     2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
     3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
     4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
     5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
    66ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
    77ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
    8 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
    9 Data/miplib3  https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
    10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
    11 Osi  https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
    12 Clp  https://projects.coin-or.org/svn/Clp/stable/1.17/Clp
    13 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.60/Cgl
     8Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
     9Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
     10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
     11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
     12Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
     13Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
  • trunk/configure

    r2500 r2502  
    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.10.
     4# Generated by GNU Autoconf 2.59 for Cbc trunk.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.10'
    434 PACKAGE_STRING='Cbc 2.10'
     433PACKAGE_VERSION='trunk'
     434PACKAGE_STRING='Cbc trunk'
    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.10 to adapt to many kinds of systems.
     1041\`configure' configures Cbc trunk 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.10:";;
     1107     short | recursive ) echo "Configuration of Cbc trunk:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.10
     1333Cbc configure trunk
    13341334generated by GNU Autoconf 2.59
    13351335
     
    13511351running configure, to aid debugging if configure makes a mistake.
    13521352
    1353 It was created by Cbc $as_me 2.10, which was
     1353It was created by Cbc $as_me trunk, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    51075107# Define the identity of the package.
    51085108 PACKAGE='cbc'
    5109  VERSION='2.10'
     5109 VERSION='trunk'
    51105110
    51115111
     
    2351523515cat >&5 <<_CSEOF
    2351623516
    23517 This file was extended by Cbc $as_me 2.10, which was
     23517This file was extended by Cbc $as_me trunk, which was
    2351823518generated by GNU Autoconf 2.59.  Invocation command line was
    2351923519
     
    2357323573cat >>$CONFIG_STATUS <<_ACEOF
    2357423574ac_cs_version="\\
    23575 Cbc config.status 2.10
     23575Cbc config.status trunk
    2357623576configured by $0, generated by GNU Autoconf 2.59,
    2357723577  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/configure.ac

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