Changeset 2200 for stable/1.8


Ignore:
Timestamp:
Feb 23, 2019 10:37:09 AM (8 months ago)
Author:
stefan
Message:

merge r2194..r2199 from trunk

Location:
stable/1.8
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable/1.8

    • Property svn:externals
      •  

        old new  
        11BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
        22ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
        44ThirdParty/HSL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.5
        5 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
         5ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
        66ThirdParty/FilterSQP https://projects.coin-or.org/svn/BuildTools/ThirdParty/FilterSQP/stable/1.3
        77ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
        88ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
        99Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        10 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
        11 Cbc               https://projects.coin-or.org/svn/Cbc/stable/2.9/Cbc
        12 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.59/Cgl
        13 Clp               https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
         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
         14Cbc               https://projects.coin-or.org/svn/Cbc/stable/2.10/Cbc
        1415Ipopt             https://projects.coin-or.org/svn/Ipopt/stable/3.12/Ipopt
        15 Osi               https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
        16 
        17 
    • Property svn:mergeinfo changed
      /trunkmerged: 2194-2199
  • stable/1.8/.travis.yml

    r2182 r2200  
    33matrix:
    44  include:
    5     - os: osx
    6       osx_image: osx10.11
    7       env: OSX=10.11
    8       compiler: clang
    9     - os: osx
    10       osx_image: xcode7
    11       env: OSX=10.10
    12       compiler: clang
    13     - os: osx
    14       osx_image: beta-xcode6.2
    15       env: OSX=10.9
    16       compiler: clang
    175    - os: linux
    186      addons:
    197        apt:
    208          packages:
    21           - gfortran
     9            - gfortran
     10    - os: osx
     11      osx_image: xcode10
     12      env: OSX=10.13
     13      compiler: clang
     14    - os: osx
     15      osx_image: xcode9.2
     16      env: OSX=10.12
     17      compiler: clang
     18    - os: osx
     19      osx_image: xcode8
     20      env: OSX=10.11
     21      compiler: clang
    2222  allow_failures:
    2323    - os: osx
    2424
    2525before_script:
    26   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$OSX" != "10.9" ]]; then brew update; fi
    27   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$OSX" != "10.9" ]]; then brew install gcc; fi
    28   - git clone --branch=stable/0.8 https://github.com/coin-or-tools/BuildTools
    29   - bash BuildTools/get.dependencies.sh fetch > /dev/null
     26  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install bash gcc; brew link --overwrite gcc; gfortran --version; fi
     27  - git clone https://github.com/coin-or/COIN-OR-OptimizationSuite COIN
     28  - cd COIN
     29  - export PROJECT=`echo $TRAVIS_REPO_SLUG | cut -d "/" -f 2`
     30  - bash ./coin.install.sh fetch --no-prompt --main-proj=$PROJECT > /dev/null
    3031
    31 script: bash BuildTools/get.dependencies.sh build --quiet --test
     32script:
     33  - bash ./coin.install.sh build --no-prompt --main-proj=$PROJECT --verbosity=2 --test
  • stable/1.8/Bonmin

  • stable/1.8/Bonmin/configure

    r2193 r2200  
    2355723557# Try if FFLAGS works
    2355823558if test "$F77" != "unavailable" ; then
     23559  orig_FFLAGS="FFLAGS"
    2355923560  cat >conftest.$ac_ext <<_ACEOF
    2356023561      program main
     
    2359423595      conftest$ac_exeext conftest.$ac_ext
    2359523596  if test -z "$FFLAGS"; then
    23596     { 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
    23597 echo "$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;}
     23597    { 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
     23598echo "$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;}
    2359823599    FFLAGS='-O'
    2359923600    cat >conftest.$ac_ext <<_ACEOF
     
    2363423635      conftest$ac_exeext conftest.$ac_ext
    2363523636    if test -z "$FFLAGS"; then
    23636       { 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
    23637 echo "$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;}
     23637      { 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
     23638echo "$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;}
    2363823639    fi
    2363923640  fi
     
    2372323724ac_save_FFLAGS=$FFLAGS
    2372423725FFLAGS="$FFLAGS $ac_verb"
    23725 (eval echo $as_me:23725: \"$ac_link\") >&5
     23726(eval echo $as_me:23726: \"$ac_link\") >&5
    2372623727ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2372723728echo "$ac_f77_v_output" >&5
     
    2380123802ac_save_FFLAGS=$FFLAGS
    2380223803FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    23803 (eval echo $as_me:23803: \"$ac_link\") >&5
     23804(eval echo $as_me:23804: \"$ac_link\") >&5
    2380423805ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2380523806echo "$ac_f77_v_output" >&5
  • stable/1.8/Dependencies

    r2183 r2200  
    11BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
    22ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
    3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
     3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
    44ThirdParty/HSL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.5
    5 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
     5ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
    66ThirdParty/FilterSQP https://projects.coin-or.org/svn/BuildTools/ThirdParty/FilterSQP/stable/1.3
    77ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
    88ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
    99Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
    10 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
    11 Cbc               https://projects.coin-or.org/svn/Cbc/stable/2.9/Cbc
    12 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.59/Cgl
    13 Clp               https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
     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
     14Cbc               https://projects.coin-or.org/svn/Cbc/stable/2.10/Cbc
    1415Ipopt             https://projects.coin-or.org/svn/Ipopt/stable/3.12/Ipopt
    15 Osi               https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
  • stable/1.8/appveyor.yml

    r2182 r2200  
    33
    44environment:
    5   global:
    6     MSYS2_BASEVER: 20150512
    7     MSYS2_ARCH: x86_64
    85  matrix:
    9     - HOST_ARCH_ARG: --host=x86_64-w64-mingw32
     6    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     7      ARCH: x86_64-w64-mingw32
     8      HOST_ARCH_ARG: --host=x86_64-w64-mingw32
    109      ADD_PATH: /mingw64/bin
    11     - HOST_ARCH_ARG: --host=i686-w64-mingw32
     10    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     11      ARCH: i686-w64-mingw32
     12      HOST_ARCH_ARG: --host=i686-w64-mingw32
    1213      ADD_PATH: /mingw32/bin
    1314
    1415install:
    15   - C:\"Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
     16  - IF %ARCH%==x86_64-w64-mingw32 (CALL C:\msys64\usr\bin\bash -lc "pacman -S mingw-w64-x86_64-lapack --noconfirm")
     17  - IF %ARCH%==i686-w64-mingw32 (CALL C:\msys64\usr\bin\bash -lc "pacman -S mingw-w64-i686-lapack --noconfirm")
    1618  - C:\msys64\usr\bin\bash -lc ""
    17   - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S make wget tar patch dos2unix diffutils ca-certificates mingw-w64-i686-ca-certificates mingw-w64-x86_64-ca-certificates mingw-w64-i686-gcc mingw-w64-i686-gcc-fortran mingw-w64-x86_64-gcc mingw-w64-x86_64-gcc-fortran"
    1819
    1920build_script:
    20   - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; git clone --branch=stable/0.8 https://github.com/coin-or-tools/BuildTools"
    21   - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; BuildTools/get.dependencies.sh fetch"
    22   - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; export PATH=$PATH:$ADD_PATH; BuildTools/get.dependencies.sh build --monolithic --build=x86_64-w64-mingw32 $HOST_ARCH_ARG --test"
     21  - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; git clone https://github.com/coin-or/COIN-OR-OptimizationSuite COIN"
     22  - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/COIN; ./coin.install.sh fetch --no-prompt --main-proj=%APPVEYOR_PROJECT_NAME%"
     23  - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/COIN; export PATH=$ADD_PATH:$PATH; ./coin.install.sh build --no-prompt --main-proj=%APPVEYOR_PROJECT_NAME% --build=x86_64-w64-mingw32 $HOST_ARCH_ARG --verbosity=2 --test"
    2324
    2425test: off
  • stable/1.8/configure

    r2193 r2200  
    45244524# Try if FFLAGS works
    45254525if test "$F77" != "unavailable" ; then
     4526  orig_FFLAGS="FFLAGS"
    45264527  cat >conftest.$ac_ext <<_ACEOF
    45274528      program main
     
    45614562      conftest$ac_exeext conftest.$ac_ext
    45624563  if test -z "$FFLAGS"; then
    4563     { 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
    4564 echo "$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;}
     4564    { 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
     4565echo "$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;}
    45654566    FFLAGS='-O'
    45664567    cat >conftest.$ac_ext <<_ACEOF
     
    46014602      conftest$ac_exeext conftest.$ac_ext
    46024603    if test -z "$FFLAGS"; then
    4603       { 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
    4604 echo "$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;}
     4604      { 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
     4605echo "$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;}
    46054606    fi
    46064607  fi
     
    64046405*-*-irix6*)
    64056406  # Find out which ABI we are using.
    6406   echo '#line 6406 "configure"' > conftest.$ac_ext
     6407  echo '#line 6407 "configure"' > conftest.$ac_ext
    64076408  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64086409  (eval $ac_compile) 2>&5
     
    83688369   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83698370   -e 's:$: $lt_compiler_flag:'`
    8370    (eval echo "\"\$as_me:8370: $lt_compile\"" >&5)
     8371   (eval echo "\"\$as_me:8371: $lt_compile\"" >&5)
    83718372   (eval "$lt_compile" 2>conftest.err)
    83728373   ac_status=$?
    83738374   cat conftest.err >&5
    8374    echo "$as_me:8374: \$? = $ac_status" >&5
     8375   echo "$as_me:8375: \$? = $ac_status" >&5
    83758376   if (exit $ac_status) && test -s "$ac_outfile"; then
    83768377     # The compiler can only warn and ignore the option if not recognized
     
    86368637   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86378638   -e 's:$: $lt_compiler_flag:'`
    8638    (eval echo "\"\$as_me:8638: $lt_compile\"" >&5)
     8639   (eval echo "\"\$as_me:8639: $lt_compile\"" >&5)
    86398640   (eval "$lt_compile" 2>conftest.err)
    86408641   ac_status=$?
    86418642   cat conftest.err >&5
    8642    echo "$as_me:8642: \$? = $ac_status" >&5
     8643   echo "$as_me:8643: \$? = $ac_status" >&5
    86438644   if (exit $ac_status) && test -s "$ac_outfile"; then
    86448645     # The compiler can only warn and ignore the option if not recognized
     
    87408741   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87418742   -e 's:$: $lt_compiler_flag:'`
    8742    (eval echo "\"\$as_me:8742: $lt_compile\"" >&5)
     8743   (eval echo "\"\$as_me:8743: $lt_compile\"" >&5)
    87438744   (eval "$lt_compile" 2>out/conftest.err)
    87448745   ac_status=$?
    87458746   cat out/conftest.err >&5
    8746    echo "$as_me:8746: \$? = $ac_status" >&5
     8747   echo "$as_me:8747: \$? = $ac_status" >&5
    87478748   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87488749   then
     
    1108511086  lt_status=$lt_dlunknown
    1108611087  cat > conftest.$ac_ext <<EOF
    11087 #line 11087 "configure"
     11088#line 11088 "configure"
    1108811089#include "confdefs.h"
    1108911090
     
    1118511186  lt_status=$lt_dlunknown
    1118611187  cat > conftest.$ac_ext <<EOF
    11187 #line 11187 "configure"
     11188#line 11188 "configure"
    1118811189#include "confdefs.h"
    1118911190
     
    1352913530   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1353013531   -e 's:$: $lt_compiler_flag:'`
    13531    (eval echo "\"\$as_me:13531: $lt_compile\"" >&5)
     13532   (eval echo "\"\$as_me:13532: $lt_compile\"" >&5)
    1353213533   (eval "$lt_compile" 2>conftest.err)
    1353313534   ac_status=$?
    1353413535   cat conftest.err >&5
    13535    echo "$as_me:13535: \$? = $ac_status" >&5
     13536   echo "$as_me:13536: \$? = $ac_status" >&5
    1353613537   if (exit $ac_status) && test -s "$ac_outfile"; then
    1353713538     # The compiler can only warn and ignore the option if not recognized
     
    1363313634   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1363413635   -e 's:$: $lt_compiler_flag:'`
    13635    (eval echo "\"\$as_me:13635: $lt_compile\"" >&5)
     13636   (eval echo "\"\$as_me:13636: $lt_compile\"" >&5)
    1363613637   (eval "$lt_compile" 2>out/conftest.err)
    1363713638   ac_status=$?
    1363813639   cat out/conftest.err >&5
    13639    echo "$as_me:13639: \$? = $ac_status" >&5
     13640   echo "$as_me:13640: \$? = $ac_status" >&5
    1364013641   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1364113642   then
     
    1520315204   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1520415205   -e 's:$: $lt_compiler_flag:'`
    15205    (eval echo "\"\$as_me:15205: $lt_compile\"" >&5)
     15206   (eval echo "\"\$as_me:15206: $lt_compile\"" >&5)
    1520615207   (eval "$lt_compile" 2>conftest.err)
    1520715208   ac_status=$?
    1520815209   cat conftest.err >&5
    15209    echo "$as_me:15209: \$? = $ac_status" >&5
     15210   echo "$as_me:15210: \$? = $ac_status" >&5
    1521015211   if (exit $ac_status) && test -s "$ac_outfile"; then
    1521115212     # The compiler can only warn and ignore the option if not recognized
     
    1530715308   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1530815309   -e 's:$: $lt_compiler_flag:'`
    15309    (eval echo "\"\$as_me:15309: $lt_compile\"" >&5)
     15310   (eval echo "\"\$as_me:15310: $lt_compile\"" >&5)
    1531015311   (eval "$lt_compile" 2>out/conftest.err)
    1531115312   ac_status=$?
    1531215313   cat out/conftest.err >&5
    15313    echo "$as_me:15313: \$? = $ac_status" >&5
     15314   echo "$as_me:15314: \$? = $ac_status" >&5
    1531415315   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1531515316   then
     
    1751417515   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1751517516   -e 's:$: $lt_compiler_flag:'`
    17516    (eval echo "\"\$as_me:17516: $lt_compile\"" >&5)
     17517   (eval echo "\"\$as_me:17517: $lt_compile\"" >&5)
    1751717518   (eval "$lt_compile" 2>conftest.err)
    1751817519   ac_status=$?
    1751917520   cat conftest.err >&5
    17520    echo "$as_me:17520: \$? = $ac_status" >&5
     17521   echo "$as_me:17521: \$? = $ac_status" >&5
    1752117522   if (exit $ac_status) && test -s "$ac_outfile"; then
    1752217523     # The compiler can only warn and ignore the option if not recognized
     
    1778217783   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1778317784   -e 's:$: $lt_compiler_flag:'`
    17784    (eval echo "\"\$as_me:17784: $lt_compile\"" >&5)
     17785   (eval echo "\"\$as_me:17785: $lt_compile\"" >&5)
    1778517786   (eval "$lt_compile" 2>conftest.err)
    1778617787   ac_status=$?
    1778717788   cat conftest.err >&5
    17788    echo "$as_me:17788: \$? = $ac_status" >&5
     17789   echo "$as_me:17789: \$? = $ac_status" >&5
    1778917790   if (exit $ac_status) && test -s "$ac_outfile"; then
    1779017791     # The compiler can only warn and ignore the option if not recognized
     
    1788617887   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1788717888   -e 's:$: $lt_compiler_flag:'`
    17888    (eval echo "\"\$as_me:17888: $lt_compile\"" >&5)
     17889   (eval echo "\"\$as_me:17889: $lt_compile\"" >&5)
    1788917890   (eval "$lt_compile" 2>out/conftest.err)
    1789017891   ac_status=$?
    1789117892   cat out/conftest.err >&5
    17892    echo "$as_me:17892: \$? = $ac_status" >&5
     17893   echo "$as_me:17893: \$? = $ac_status" >&5
    1789317894   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1789417895   then
Note: See TracChangeset for help on using the changeset viewer.