Changeset 2500


Ignore:
Timestamp:
Feb 22, 2019 5:51:49 PM (2 months ago)
Author:
stefan
Message:

temporarily committing stable candidate

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

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

    r2499 r2500  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc trunk.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.10.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='trunk'
    433 PACKAGE_STRING='Cbc trunk'
     432PACKAGE_VERSION='2.10'
     433PACKAGE_STRING='Cbc 2.10'
    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 trunk to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.10 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 trunk:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.10:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13191319if $ac_init_version; then
    13201320  cat <<\_ACEOF
    1321 Cbc configure trunk
     1321Cbc configure 2.10
    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 trunk, which was
     1341It was created by Cbc $as_me 2.10, 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='trunk'
     4574 VERSION='2.10'
    45754575
    45764576
     
    3248832488cat >&5 <<_CSEOF
    3248932489
    32490 This file was extended by Cbc $as_me trunk, which was
     32490This file was extended by Cbc $as_me 2.10, which was
    3249132491generated by GNU Autoconf 2.59.  Invocation command line was
    3249232492
     
    3255132551cat >>$CONFIG_STATUS <<_ACEOF
    3255232552ac_cs_version="\\
    32553 Cbc config.status trunk
     32553Cbc config.status 2.10
    3255432554configured by $0, generated by GNU Autoconf 2.59,
    3255532555  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/Cbc/configure.ac

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

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

    r2426 r2500  
    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/trunk/CoinUtils
    11 Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
    12 Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
    13 Cgl               https://projects.coin-or.org/svn/Cgl/trunk/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/stable/2.11/CoinUtils
     11Osi  https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
     12Clp  https://projects.coin-or.org/svn/Clp/stable/1.17/Clp
     13Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.60/Cgl
  • trunk/configure

    r2392 r2500  
    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 trunk.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.10.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='trunk'
    434 PACKAGE_STRING='Cbc trunk'
     433PACKAGE_VERSION='2.10'
     434PACKAGE_STRING='Cbc 2.10'
    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 trunk to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.10 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 trunk:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.10:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure trunk
     1333Cbc configure 2.10
    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 trunk, which was
     1353It was created by Cbc $as_me 2.10, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    45234523# Try if FFLAGS works
    45244524if test "$F77" != "unavailable" ; then
    4525   orig_FFLAGS="FFLAGS"
    45264525  cat >conftest.$ac_ext <<_ACEOF
    45274526      program main
     
    45614560      conftest$ac_exeext conftest.$ac_ext
    45624561  if test -z "$FFLAGS"; then
    4563     { echo "$as_me:$LINENO: WARNING: The flags FFLAGS=\"$orig_FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&5
    4564 echo "$as_me: WARNING: The flags FFLAGS=\"$orig_FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&2;}
     4562    { echo "$as_me:$LINENO: WARNING: The flags FFLAGS=\"$FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&5
     4563echo "$as_me: WARNING: The flags FFLAGS=\"$FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&2;}
    45654564    FFLAGS='-O'
    45664565    cat >conftest.$ac_ext <<_ACEOF
     
    46014600      conftest$ac_exeext conftest.$ac_ext
    46024601    if test -z "$FFLAGS"; then
    4603       { echo "$as_me:$LINENO: WARNING: The flags FFLAGS=-O do not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&5
    4604 echo "$as_me: WARNING: The flags FFLAGS=-O do not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&2;}
     4602      { echo "$as_me:$LINENO: WARNING: This value for FFLAGS does not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&5
     4603echo "$as_me: WARNING: This value for FFLAGS does not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&2;}
    46054604    fi
    46064605  fi
     
    51085107# Define the identity of the package.
    51095108 PACKAGE='cbc'
    5110  VERSION='trunk'
     5109 VERSION='2.10'
    51115110
    51125111
     
    64046403*-*-irix6*)
    64056404  # Find out which ABI we are using.
    6406   echo '#line 6406 "configure"' > conftest.$ac_ext
     6405  echo '#line 6405 "configure"' > conftest.$ac_ext
    64076406  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64086407  (eval $ac_compile) 2>&5
     
    83688367   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83698368   -e 's:$: $lt_compiler_flag:'`
    8370    (eval echo "\"\$as_me:8370: $lt_compile\"" >&5)
     8369   (eval echo "\"\$as_me:8369: $lt_compile\"" >&5)
    83718370   (eval "$lt_compile" 2>conftest.err)
    83728371   ac_status=$?
    83738372   cat conftest.err >&5
    8374    echo "$as_me:8374: \$? = $ac_status" >&5
     8373   echo "$as_me:8373: \$? = $ac_status" >&5
    83758374   if (exit $ac_status) && test -s "$ac_outfile"; then
    83768375     # The compiler can only warn and ignore the option if not recognized
     
    86368635   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86378636   -e 's:$: $lt_compiler_flag:'`
    8638    (eval echo "\"\$as_me:8638: $lt_compile\"" >&5)
     8637   (eval echo "\"\$as_me:8637: $lt_compile\"" >&5)
    86398638   (eval "$lt_compile" 2>conftest.err)
    86408639   ac_status=$?
    86418640   cat conftest.err >&5
    8642    echo "$as_me:8642: \$? = $ac_status" >&5
     8641   echo "$as_me:8641: \$? = $ac_status" >&5
    86438642   if (exit $ac_status) && test -s "$ac_outfile"; then
    86448643     # The compiler can only warn and ignore the option if not recognized
     
    87408739   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87418740   -e 's:$: $lt_compiler_flag:'`
    8742    (eval echo "\"\$as_me:8742: $lt_compile\"" >&5)
     8741   (eval echo "\"\$as_me:8741: $lt_compile\"" >&5)
    87438742   (eval "$lt_compile" 2>out/conftest.err)
    87448743   ac_status=$?
    87458744   cat out/conftest.err >&5
    8746    echo "$as_me:8746: \$? = $ac_status" >&5
     8745   echo "$as_me:8745: \$? = $ac_status" >&5
    87478746   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87488747   then
     
    1108511084  lt_status=$lt_dlunknown
    1108611085  cat > conftest.$ac_ext <<EOF
    11087 #line 11087 "configure"
     11086#line 11086 "configure"
    1108811087#include "confdefs.h"
    1108911088
     
    1118511184  lt_status=$lt_dlunknown
    1118611185  cat > conftest.$ac_ext <<EOF
    11187 #line 11187 "configure"
     11186#line 11186 "configure"
    1118811187#include "confdefs.h"
    1118911188
     
    1352913528   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1353013529   -e 's:$: $lt_compiler_flag:'`
    13531    (eval echo "\"\$as_me:13531: $lt_compile\"" >&5)
     13530   (eval echo "\"\$as_me:13530: $lt_compile\"" >&5)
    1353213531   (eval "$lt_compile" 2>conftest.err)
    1353313532   ac_status=$?
    1353413533   cat conftest.err >&5
    13535    echo "$as_me:13535: \$? = $ac_status" >&5
     13534   echo "$as_me:13534: \$? = $ac_status" >&5
    1353613535   if (exit $ac_status) && test -s "$ac_outfile"; then
    1353713536     # The compiler can only warn and ignore the option if not recognized
     
    1363313632   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1363413633   -e 's:$: $lt_compiler_flag:'`
    13635    (eval echo "\"\$as_me:13635: $lt_compile\"" >&5)
     13634   (eval echo "\"\$as_me:13634: $lt_compile\"" >&5)
    1363613635   (eval "$lt_compile" 2>out/conftest.err)
    1363713636   ac_status=$?
    1363813637   cat out/conftest.err >&5
    13639    echo "$as_me:13639: \$? = $ac_status" >&5
     13638   echo "$as_me:13638: \$? = $ac_status" >&5
    1364013639   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1364113640   then
     
    1520315202   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1520415203   -e 's:$: $lt_compiler_flag:'`
    15205    (eval echo "\"\$as_me:15205: $lt_compile\"" >&5)
     15204   (eval echo "\"\$as_me:15204: $lt_compile\"" >&5)
    1520615205   (eval "$lt_compile" 2>conftest.err)
    1520715206   ac_status=$?
    1520815207   cat conftest.err >&5
    15209    echo "$as_me:15209: \$? = $ac_status" >&5
     15208   echo "$as_me:15208: \$? = $ac_status" >&5
    1521015209   if (exit $ac_status) && test -s "$ac_outfile"; then
    1521115210     # The compiler can only warn and ignore the option if not recognized
     
    1530715306   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1530815307   -e 's:$: $lt_compiler_flag:'`
    15309    (eval echo "\"\$as_me:15309: $lt_compile\"" >&5)
     15308   (eval echo "\"\$as_me:15308: $lt_compile\"" >&5)
    1531015309   (eval "$lt_compile" 2>out/conftest.err)
    1531115310   ac_status=$?
    1531215311   cat out/conftest.err >&5
    15313    echo "$as_me:15313: \$? = $ac_status" >&5
     15312   echo "$as_me:15312: \$? = $ac_status" >&5
    1531415313   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1531515314   then
     
    1751417513   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1751517514   -e 's:$: $lt_compiler_flag:'`
    17516    (eval echo "\"\$as_me:17516: $lt_compile\"" >&5)
     17515   (eval echo "\"\$as_me:17515: $lt_compile\"" >&5)
    1751717516   (eval "$lt_compile" 2>conftest.err)
    1751817517   ac_status=$?
    1751917518   cat conftest.err >&5
    17520    echo "$as_me:17520: \$? = $ac_status" >&5
     17519   echo "$as_me:17519: \$? = $ac_status" >&5
    1752117520   if (exit $ac_status) && test -s "$ac_outfile"; then
    1752217521     # The compiler can only warn and ignore the option if not recognized
     
    1778217781   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1778317782   -e 's:$: $lt_compiler_flag:'`
    17784    (eval echo "\"\$as_me:17784: $lt_compile\"" >&5)
     17783   (eval echo "\"\$as_me:17783: $lt_compile\"" >&5)
    1778517784   (eval "$lt_compile" 2>conftest.err)
    1778617785   ac_status=$?
    1778717786   cat conftest.err >&5
    17788    echo "$as_me:17788: \$? = $ac_status" >&5
     17787   echo "$as_me:17787: \$? = $ac_status" >&5
    1778917788   if (exit $ac_status) && test -s "$ac_outfile"; then
    1779017789     # The compiler can only warn and ignore the option if not recognized
     
    1788617885   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1788717886   -e 's:$: $lt_compiler_flag:'`
    17888    (eval echo "\"\$as_me:17888: $lt_compile\"" >&5)
     17887   (eval echo "\"\$as_me:17887: $lt_compile\"" >&5)
    1788917888   (eval "$lt_compile" 2>out/conftest.err)
    1789017889   ac_status=$?
    1789117890   cat out/conftest.err >&5
    17892    echo "$as_me:17892: \$? = $ac_status" >&5
     17891   echo "$as_me:17891: \$? = $ac_status" >&5
    1789317892   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1789417893   then
     
    2351623515cat >&5 <<_CSEOF
    2351723516
    23518 This file was extended by Cbc $as_me trunk, which was
     23517This file was extended by Cbc $as_me 2.10, which was
    2351923518generated by GNU Autoconf 2.59.  Invocation command line was
    2352023519
     
    2357423573cat >>$CONFIG_STATUS <<_ACEOF
    2357523574ac_cs_version="\\
    23576 Cbc config.status trunk
     23575Cbc config.status 2.10
    2357723576configured by $0, generated by GNU Autoconf 2.59,
    2357823577  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/configure.ac

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