Changeset 2065 for stable


Ignore:
Timestamp:
Oct 31, 2014 12:41:42 AM (5 years ago)
Author:
tkr
Message:

temporarily committing release candidate

Location:
stable/1.15
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • stable/1.15

    • Property svn:externals

      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.3
        3 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.4
        4 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
        5 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
        6 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.9
        7 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        8 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.9/CoinUtils
        9 Osi  https://projects.coin-or.org/svn/Osi/stable/0.106/Osi
        10 
        11 
        12 
        13 
        14 
        15 
        16 
        17 
        18 
        19 
        20 
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.17/
         2ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.3.11/
         3ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.4.11/
         4ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.10/
         5ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.13/
         6ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.9.5/
         7Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.9/
         8CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.9.17/CoinUtils
         9Osi  https://projects.coin-or.org/svn/Osi/releases/0.106.10/Osi

  • stable/1.15/Clp/configure

    r2060 r2065  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Clp 1.15.
     3# Generated by GNU Autoconf 2.59 for Clp 1.15.11.
    44#
    55# Report bugs to <clp@list.coin-or.org>.
    … …  
    430430PACKAGE_NAME='Clp'
    431431PACKAGE_TARNAME='clp'
    432 PACKAGE_VERSION='1.15'
    433 PACKAGE_STRING='Clp 1.15'
     432PACKAGE_VERSION='1.15.11'
     433PACKAGE_STRING='Clp 1.15.11'
    434434PACKAGE_BUGREPORT='clp@list.coin-or.org'
    435435
    … …  
    10221022  # This message is too long to be a string in the A/UX 3.1 sh.
    10231023  cat <<_ACEOF
    1024 \`configure' configures Clp 1.15 to adapt to many kinds of systems.
     1024\`configure' configures Clp 1.15.11 to adapt to many kinds of systems.
    10251025
    10261026Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    10881088if test -n "$ac_init_help"; then
    10891089  case $ac_init_help in
    1090      short | recursive ) echo "Configuration of Clp 1.15:";;
     1090     short | recursive ) echo "Configuration of Clp 1.15.11:";;
    10911091   esac
    10921092  cat <<\_ACEOF
    … …  
    13031303if $ac_init_version; then
    13041304  cat <<\_ACEOF
    1305 Clp configure 1.15
     1305Clp configure 1.15.11
    13061306generated by GNU Autoconf 2.59
    13071307
    … …  
    13231323running configure, to aid debugging if configure makes a mistake.
    13241324
    1325 It was created by Clp $as_me 1.15, which was
     1325It was created by Clp $as_me 1.15.11, which was
    13261326generated by GNU Autoconf 2.59.  Invocation command line was
    13271327
    … …  
    18491849
    18501850# Capture libtool library version, if given.
     1851 coin_libversion=13:11:12
    18511852
    18521853
    … …  
    20892090             fi
    20902091             ;;
    2091   *-*-darwin*) comps="clang gcc" ;;
     2092  *-*-darwin*) comps="clang gcc cc" ;;
    20922093  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    20932094  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    … …  
    32463247  *-*-solaris*)
    32473248             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3248   *-darwin*) comps="g++ c++ CC" ;;
     3249  *-darwin*) comps="clang++ g++ c++ CC" ;;
    32493250  *-linux-gnu*)
    32503251             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
    … …  
    36833684# It seems that we need to cleanup something here for the Windows
    36843685case "$CXX" in
    3685   clang* ) ;;
     3686  clang* | */clang*) ;;
    36863687  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    36873688    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    … …  
    45714572# Define the identity of the package.
    45724573 PACKAGE='clp'
    4573  VERSION='1.15'
     4574 VERSION='1.15.11'
    45744575
    45754576
    … …  
    58675868*-*-irix6*)
    58685869  # Find out which ABI we are using.
    5869   echo '#line 5869 "configure"' > conftest.$ac_ext
     5870  echo '#line 5870 "configure"' > conftest.$ac_ext
    58705871  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58715872  (eval $ac_compile) 2>&5
    … …  
    70017002
    70027003# Provide some information about the compiler.
    7003 echo "$as_me:7003:" \
     7004echo "$as_me:7004:" \
    70047005     "checking for Fortran 77 compiler version" >&5
    70057006ac_compiler=`set X $ac_compile; echo $2`
    … …  
    80688069   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80698070   -e 's:$: $lt_compiler_flag:'`
    8070    (eval echo "\"\$as_me:8070: $lt_compile\"" >&5)
     8071   (eval echo "\"\$as_me:8071: $lt_compile\"" >&5)
    80718072   (eval "$lt_compile" 2>conftest.err)
    80728073   ac_status=$?
    80738074   cat conftest.err >&5
    8074    echo "$as_me:8074: \$? = $ac_status" >&5
     8075   echo "$as_me:8075: \$? = $ac_status" >&5
    80758076   if (exit $ac_status) && test -s "$ac_outfile"; then
    80768077     # The compiler can only warn and ignore the option if not recognized
    … …  
    83368337   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83378338   -e 's:$: $lt_compiler_flag:'`
    8338    (eval echo "\"\$as_me:8338: $lt_compile\"" >&5)
     8339   (eval echo "\"\$as_me:8339: $lt_compile\"" >&5)
    83398340   (eval "$lt_compile" 2>conftest.err)
    83408341   ac_status=$?
    83418342   cat conftest.err >&5
    8342    echo "$as_me:8342: \$? = $ac_status" >&5
     8343   echo "$as_me:8343: \$? = $ac_status" >&5
    83438344   if (exit $ac_status) && test -s "$ac_outfile"; then
    83448345     # The compiler can only warn and ignore the option if not recognized
    … …  
    84408441   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84418442   -e 's:$: $lt_compiler_flag:'`
    8442    (eval echo "\"\$as_me:8442: $lt_compile\"" >&5)
     8443   (eval echo "\"\$as_me:8443: $lt_compile\"" >&5)
    84438444   (eval "$lt_compile" 2>out/conftest.err)
    84448445   ac_status=$?
    84458446   cat out/conftest.err >&5
    8446    echo "$as_me:8446: \$? = $ac_status" >&5
     8447   echo "$as_me:8447: \$? = $ac_status" >&5
    84478448   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84488449   then
    … …  
    1078510786  lt_status=$lt_dlunknown
    1078610787  cat > conftest.$ac_ext <<EOF
    10787 #line 10787 "configure"
     10788#line 10788 "configure"
    1078810789#include "confdefs.h"
    1078910790
    … …  
    1088510886  lt_status=$lt_dlunknown
    1088610887  cat > conftest.$ac_ext <<EOF
    10887 #line 10887 "configure"
     10888#line 10888 "configure"
    1088810889#include "confdefs.h"
    1088910890
    … …  
    1322913230   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1323013231   -e 's:$: $lt_compiler_flag:'`
    13231    (eval echo "\"\$as_me:13231: $lt_compile\"" >&5)
     13232   (eval echo "\"\$as_me:13232: $lt_compile\"" >&5)
    1323213233   (eval "$lt_compile" 2>conftest.err)
    1323313234   ac_status=$?
    1323413235   cat conftest.err >&5
    13235    echo "$as_me:13235: \$? = $ac_status" >&5
     13236   echo "$as_me:13236: \$? = $ac_status" >&5
    1323613237   if (exit $ac_status) && test -s "$ac_outfile"; then
    1323713238     # The compiler can only warn and ignore the option if not recognized
    … …  
    1333313334   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1333413335   -e 's:$: $lt_compiler_flag:'`
    13335    (eval echo "\"\$as_me:13335: $lt_compile\"" >&5)
     13336   (eval echo "\"\$as_me:13336: $lt_compile\"" >&5)
    1333613337   (eval "$lt_compile" 2>out/conftest.err)
    1333713338   ac_status=$?
    1333813339   cat out/conftest.err >&5
    13339    echo "$as_me:13339: \$? = $ac_status" >&5
     13340   echo "$as_me:13340: \$? = $ac_status" >&5
    1334013341   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1334113342   then
    … …  
    1490314904   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1490414905   -e 's:$: $lt_compiler_flag:'`
    14905    (eval echo "\"\$as_me:14905: $lt_compile\"" >&5)
     14906   (eval echo "\"\$as_me:14906: $lt_compile\"" >&5)
    1490614907   (eval "$lt_compile" 2>conftest.err)
    1490714908   ac_status=$?
    1490814909   cat conftest.err >&5
    14909    echo "$as_me:14909: \$? = $ac_status" >&5
     14910   echo "$as_me:14910: \$? = $ac_status" >&5
    1491014911   if (exit $ac_status) && test -s "$ac_outfile"; then
    1491114912     # The compiler can only warn and ignore the option if not recognized
    … …  
    1500715008   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1500815009   -e 's:$: $lt_compiler_flag:'`
    15009    (eval echo "\"\$as_me:15009: $lt_compile\"" >&5)
     15010   (eval echo "\"\$as_me:15010: $lt_compile\"" >&5)
    1501015011   (eval "$lt_compile" 2>out/conftest.err)
    1501115012   ac_status=$?
    1501215013   cat out/conftest.err >&5
    15013    echo "$as_me:15013: \$? = $ac_status" >&5
     15014   echo "$as_me:15014: \$? = $ac_status" >&5
    1501415015   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1501515016   then
    … …  
    1721417215   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1721517216   -e 's:$: $lt_compiler_flag:'`
    17216    (eval echo "\"\$as_me:17216: $lt_compile\"" >&5)
     17217   (eval echo "\"\$as_me:17217: $lt_compile\"" >&5)
    1721717218   (eval "$lt_compile" 2>conftest.err)
    1721817219   ac_status=$?
    1721917220   cat conftest.err >&5
    17220    echo "$as_me:17220: \$? = $ac_status" >&5
     17221   echo "$as_me:17221: \$? = $ac_status" >&5
    1722117222   if (exit $ac_status) && test -s "$ac_outfile"; then
    1722217223     # The compiler can only warn and ignore the option if not recognized
    … …  
    1748217483   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1748317484   -e 's:$: $lt_compiler_flag:'`
    17484    (eval echo "\"\$as_me:17484: $lt_compile\"" >&5)
     17485   (eval echo "\"\$as_me:17485: $lt_compile\"" >&5)
    1748517486   (eval "$lt_compile" 2>conftest.err)
    1748617487   ac_status=$?
    1748717488   cat conftest.err >&5
    17488    echo "$as_me:17488: \$? = $ac_status" >&5
     17489   echo "$as_me:17489: \$? = $ac_status" >&5
    1748917490   if (exit $ac_status) && test -s "$ac_outfile"; then
    1749017491     # The compiler can only warn and ignore the option if not recognized
    … …  
    1758617587   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1758717588   -e 's:$: $lt_compiler_flag:'`
    17588    (eval echo "\"\$as_me:17588: $lt_compile\"" >&5)
     17589   (eval echo "\"\$as_me:17589: $lt_compile\"" >&5)
    1758917590   (eval "$lt_compile" 2>out/conftest.err)
    1759017591   ac_status=$?
    1759117592   cat out/conftest.err >&5
    17592    echo "$as_me:17592: \$? = $ac_status" >&5
     17593   echo "$as_me:17593: \$? = $ac_status" >&5
    1759317594   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1759417595   then
    … …  
    2490024901
    2490124902# Provide some information about the compiler.
    24902 echo "$as_me:24902:" \
     24903echo "$as_me:24903:" \
    2490324904     "checking for Fortran 77 compiler version" >&5
    2490424905ac_compiler=`set X $ac_compile; echo $2`
    … …  
    2540825409ac_save_FFLAGS=$FFLAGS
    2540925410FFLAGS="$FFLAGS $ac_verb"
    25410 (eval echo $as_me:25410: \"$ac_link\") >&5
     25411(eval echo $as_me:25411: \"$ac_link\") >&5
    2541125412ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2541225413echo "$ac_f77_v_output" >&5
    … …  
    2548625487ac_save_FFLAGS=$FFLAGS
    2548725488FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    25488 (eval echo $as_me:25488: \"$ac_link\") >&5
     25489(eval echo $as_me:25489: \"$ac_link\") >&5
    2548925490ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2549025491echo "$ac_f77_v_output" >&5
    … …  
    3193631937cat >&5 <<_CSEOF
    3193731938
    31938 This file was extended by Clp $as_me 1.15, which was
     31939This file was extended by Clp $as_me 1.15.11, which was
    3193931940generated by GNU Autoconf 2.59.  Invocation command line was
    3194031941
    … …  
    3199932000cat >>$CONFIG_STATUS <<_ACEOF
    3200032001ac_cs_version="\\
    32001 Clp config.status 1.15
     32002Clp config.status 1.15.11
    3200232003configured by $0, generated by GNU Autoconf 2.59,
    3200332004  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • stable/1.15/Clp/configure.ac

    r2060 r2065  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Clp],[1.15],[clp@list.coin-or.org])
     15AC_INIT([Clp],[1.15.11],[clp@list.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(Clp)
     44AC_COIN_PROJECTDIR_INIT(Clp,13:11:12)
    4545
    4646# Check if user wants to produce debugging code

  • stable/1.15/Clp/src/config_clp_default.h

    r2060 r2065  
    66
    77/* Version number of project */
    8 #define CLP_VERSION "1.15"
     8#define CLP_VERSION "1.15.11"
    99
    1010/* Major Version number of project */
    … …  
    1515
    1616/* Release Version number of project */
    17 #define CLP_VERSION_RELEASE 9999
     17#define CLP_VERSION_RELEASE 11

  • stable/1.15/configure

    r2060 r2065  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Clp 1.15.
     4# Generated by GNU Autoconf 2.59 for Clp 1.15.11.
    55#
    66# Report bugs to <coin-clp@lists.coin-or.org>.
    … …  
    431431PACKAGE_NAME='Clp'
    432432PACKAGE_TARNAME='clp'
    433 PACKAGE_VERSION='1.15'
    434 PACKAGE_STRING='Clp 1.15'
     433PACKAGE_VERSION='1.15.11'
     434PACKAGE_STRING='Clp 1.15.11'
    435435PACKAGE_BUGREPORT='coin-clp@lists.coin-or.org'
    436436
    … …  
    10331033  # This message is too long to be a string in the A/UX 3.1 sh.
    10341034  cat <<_ACEOF
    1035 \`configure' configures Clp 1.15 to adapt to many kinds of systems.
     1035\`configure' configures Clp 1.15.11 to adapt to many kinds of systems.
    10361036
    10371037Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    10991099if test -n "$ac_init_help"; then
    11001100  case $ac_init_help in
    1101      short | recursive ) echo "Configuration of Clp 1.15:";;
     1101     short | recursive ) echo "Configuration of Clp 1.15.11:";;
    11021102   esac
    11031103  cat <<\_ACEOF
    … …  
    13041304if $ac_init_version; then
    13051305  cat <<\_ACEOF
    1306 Clp configure 1.15
     1306Clp configure 1.15.11
    13071307generated by GNU Autoconf 2.59
    13081308
    … …  
    13241324running configure, to aid debugging if configure makes a mistake.
    13251325
    1326 It was created by Clp $as_me 1.15, which was
     1326It was created by Clp $as_me 1.15.11, which was
    13271327generated by GNU Autoconf 2.59.  Invocation command line was
    13281328
    … …  
    19221922             fi
    19231923             ;;
    1924   *-*-darwin*) comps="clang gcc" ;;
     1924  *-*-darwin*) comps="clang gcc cc" ;;
    19251925  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    19261926  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    … …  
    30813081  *-*-solaris*)
    30823082             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3083   *-darwin*) comps="g++ c++ CC" ;;
     3083  *-darwin*) comps="clang++ g++ c++ CC" ;;
    30843084  *-linux-gnu*)
    30853085             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
    … …  
    35183518# It seems that we need to cleanup something here for the Windows
    35193519case "$CXX" in
    3520   clang* ) ;;
     3520  clang* | */clang*) ;;
    35213521  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    35223522    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    … …  
    50915091# Define the identity of the package.
    50925092 PACKAGE='clp'
    5093  VERSION='1.15'
     5093 VERSION='1.15.11'
    50945094
    50955095
    … …  
    2272222722cat >&5 <<_CSEOF
    2272322723
    22724 This file was extended by Clp $as_me 1.15, which was
     22724This file was extended by Clp $as_me 1.15.11, which was
    2272522725generated by GNU Autoconf 2.59.  Invocation command line was
    2272622726
    … …  
    2278022780cat >>$CONFIG_STATUS <<_ACEOF
    2278122781ac_cs_version="\\
    22782 Clp config.status 1.15
     22782Clp config.status 1.15.11
    2278322783configured by $0, generated by GNU Autoconf 2.59,
    2278422784  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • stable/1.15/configure.ac

    r2060 r2065  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Clp],[1.15],[coin-clp@lists.coin-or.org])
     15AC_INIT([Clp],[1.15.11],[coin-clp@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.