Changeset 2261


Ignore:
Timestamp:
Feb 13, 2016 12:00:00 AM (2 years ago)
Author:
tkr
Message:

Merging r2236 r2239:2244 2247 2248:2257

Location:
stable/2.9
Files:
6 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable/2.9

  • stable/2.9/.travis.yml

    r2236 r2261  
    11language: cpp
    2 os: linux
    32
    43matrix:
     
    1716      compiler: clang
    1817    - os: linux
     18      addons:
     19        apt:
     20          packages:
     21          - gfortran
     22  allow_failures:
     23    - os: osx
    1924
    20 before_install:
    21     - git clone https://gist.github.com/tkralphs/13d4529b4d4e8889f3a6 scripts
    22     - bash scripts/get.dependencies.sh fetch
     25before_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
    2330
    24 install: bash scripts/get.dependencies.sh build
    25 
    26 script: make test
     31script: bash scripts/get.dependencies.sh build --quiet --test
  • stable/2.9/Cbc

  • stable/2.9/Cbc/configure

    r2226 r2261  
    2028720287    *-mingw*)
    2028820288      CYGPATH_W=echo
    20289       mydos2unix=
    2029020289      ;;
    2029120290  esac
  • stable/2.9/Dependencies

    r2111 r2261  
    99Data/miplib3  https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
    1010CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
     11Osi  https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
     12Clp  https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
    1113Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.59/Cgl
    12 Clp  https://projects.coin-or.org/svn/Clp/stable/1.16/Clp
    13 Osi  https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
  • stable/2.9/README.md

    r2223 r2261  
    11# CBC Version 2.9.4 README
     2
     3[![Build Status](https://travis-ci.org/coin-or/Cbc.svg?branch=master)](https://travis-ci.org/coin-or/Cbc)
    24
    35Welcome to the README for the COIN Branch and Cut Solver (CBC). CBC is
  • stable/2.9/appveyor.yml

    r2247 r2261  
    11platform:
    22  - x64
     3
    34environment:
    45  global:
    56    MSYS2_BASEVER: 20150512
     7    MSYS2_ARCH: x86_64
    68  matrix:
    7     - MSYS2_ARCH: x86_64
     9    - HOST_ARCH_ARG: --host=x86_64-w64-mingw32
     10      ADD_PATH: /mingw64/bin
     11    - HOST_ARCH_ARG: --host=i686-w64-mingw32
     12      ADD_PATH: /mingw32/bin
     13    - HOST_ARCH_ARG: --enable-msvc
     14      ADD_PATH: /mingw64/bin
     15
    816install:
    917  - C:\"Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
    10   - appveyor DownloadFile "http://kent.dl.sourceforge.net/project/msys2/Base/%MSYS2_ARCH%/msys2-base-%MSYS2_ARCH%-%MSYS2_BASEVER%.tar.xz" -FileName "msys2.tar.xz"
    11   - 7z x msys2.tar.xz
    12   - 7z x msys2.tar > NUL
    13   - msys64\usr\bin\bash -lc ""
    14   - msys64\usr\bin\bash -lc "for i in {1..3}; do pacman --noconfirm -Suy make wget tar patch pkg-config && break || sleep 15; done"
     18  - C:\msys64\usr\bin\bash -lc ""
     19  - 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"
    1520
    1621build_script:
    17   - msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; git clone https://gist.github.com/tkralphs/13d4529b4d4e8889f3a6 scripts; ./scripts/get.dependencies.sh fetch build --no-third-party --monolithic --build=x86_64-w64-mingw32 --enable-msvc --test"
     22  - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; git clone --branch=stable/0.8 https://github.com/coin-or-tools/BuildTools"
     23  - C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; BuildTools/get.dependencies.sh fetch --no-third-party"
     24  - 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"
    1825
    1926test: off
  • stable/2.9/configure

    r2226 r2261  
    39653965  *-cygwin* | *-mingw*)
    39663966     if test "$enable_msvc" = yes ; then
    3967        coin_f77_comps="ifort fl32 compile_f2c gfortran g95 g77"
     3967       coin_f77_comps="ifort fl32 compile_f2c"
    39683968     else
    39693969       coin_f77_comps="gfortran ifort g95 g77 fl32 compile_f2c"
     
    2059120591    *-mingw*)
    2059220592      CYGPATH_W=echo
    20593       mydos2unix=
    2059420593      ;;
    2059520594  esac
Note: See TracChangeset for help on using the changeset viewer.