Kouhei Sutou
null+****@clear*****
Mon Sep 4 22:46:33 JST 2017
Kouhei Sutou 2017-09-04 22:46:33 +0900 (Mon, 04 Sep 2017) New Revision: 231371f843b9e9a87db9315b62af6e6a7b19f19b https://github.com/groonga/groonga/commit/231371f843b9e9a87db9315b62af6e6a7b19f19b Message: appveyor: simplify Modified files: appveyor.yml Modified: appveyor.yml (+18 -13) =================================================================== --- appveyor.yml 2017-09-03 13:30:46 +0900 (ef83843dd) +++ appveyor.yml 2017-09-04 22:46:33 +0900 (79dc74ecc) @@ -3,18 +3,14 @@ clone_depth: 10 environment: matrix: - - CMAKE_GENERATOR_NAME: "Visual Studio 12 2013" - VC_INIT: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat - VC_MACHINE: x86 - - CMAKE_GENERATOR_NAME: "Visual Studio 12 2013 Win64" - VC_INIT: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat - VC_MACHINE: amd64 - - CMAKE_GENERATOR_NAME: "Visual Studio 14 2015" - VC_INIT: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat - VC_MACHINE: x86 - - CMAKE_GENERATOR_NAME: "Visual Studio 14 2015 Win64" - VC_INIT: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat - VC_MACHINE: amd64 + - VS_VERSION: 12 + ARCH: x86 + - VS_VERSION: 12 + ARCH: amd64 + - VS_VERSION: 14 + ARCH: x86 + - VS_VERSION: 14 + ARCH: amd64 notifications: - provider: Email @@ -25,7 +21,9 @@ notifications: init: - set PATH=C:\Ruby22\bin;%PATH% - set PATH=C:\msys64\usr\bin;%PATH% - - call "%VC_INIT%" %VC_MACHINE% + - call + "C:\Program Files (x86)\Microsoft Visual Studio %VC_VERSION%.0\VC\vcvarsall.bat" + "%ARCH%" # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) install: @@ -41,6 +39,13 @@ build_script: - ruby download_message_pack.rb - ruby download_lz4.rb - cd .. + - set CMAKE_GENERATOR_NAME="Visual Studio %VC_VERSION%" + - if "%VS_VERSION%" == "12" + set CMAKE_GENERATOR_NAME="%CMAKE_GENERATOR_NAME% 2013" + - if "%VS_VERSION%" == "14" + set CMAKE_GENERATOR_NAME="%CMAKE_GENERATOR_NAME% 2015" + - if "%ARCH%" == "amd64" + set CMAKE_GENERATOR_NAME="%CMAKE_GENERATOR_NAME% Win64" - cmake . -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_INSTALL_PREFIX=c:\groonga -DGRN_WITH_MRUBY=yes -------------- next part -------------- HTML����������������������������...Descargar
