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:
2 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/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
Note: See TracChangeset for help on using the changeset viewer.