diff options
| -rw-r--r-- | appveyor.yml | 3 | ||||
| -rw-r--r-- | ci/build.bat | 50 | ||||
| -rw-r--r-- | third-party/cmake/BuildLibuv.cmake | 12 |
3 files changed, 40 insertions, 25 deletions
diff --git a/appveyor.yml b/appveyor.yml index 30b7947da0..608998faf1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,10 @@ version: '{build}' environment: APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9" +image: Visual Studio 2017 configuration: +- MSVC_64 +- MSVC_32 - MINGW_64 - MINGW_32 - MINGW_64-gcov diff --git a/ci/build.bat b/ci/build.bat index 5c7f14ad0a..60bd152192 100644 --- a/ci/build.bat +++ b/ci/build.bat @@ -1,27 +1,33 @@ -:: These are native MinGW builds, but they use the toolchain inside -:: MSYS2, this allows using all the dependencies and tools available -:: in MSYS2, but we cannot build inside the MSYS2 shell. echo on if "%CONFIGURATION%" == "MINGW_32" ( set ARCH=i686 set BITS=32 -) else ( +) else if "%CONFIGURATION%" == "MINGW_64" ( set ARCH=x86_64 set BITS=64 -) -if "%CONFIGURATION%" == "MINGW_64-gcov" ( +) else if "%CONFIGURATION%" == "MINGW_64-gcov" ( set USE_GCOV="-DUSE_GCOV=ON" +) else if "%CONFIGURATION%" == "MSVC_32" ( + set CMAKE_GENERATOR="Visual Studio 15 2017" +) else if "%CONFIGURATION%" == "MSVC_64" ( + set CMAKE_GENERATOR="Visual Studio 15 2017 Win64" ) -:: We cannot have sh.exe in the PATH (MinGW) -set PATH=%PATH:C:\Program Files\Git\usr\bin;=% -set PATH=C:\msys64\mingw%BITS%\bin;C:\Windows\System32;C:\Windows;%PATH% -:: The default cpack in the PATH is not CMake -set PATH=C:\Program Files (x86)\CMake\bin\cpack.exe;%PATH% - -:: Build third-party dependencies -C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" || goto :error -C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-perl mingw-w64-%ARCH%-diffutils mingw-w64-%ARCH%-unibilium gperf" || goto :error +if "%CONFIGURATION:~0,5%" == "MINGW" ( + :: These are native MinGW builds, but they use the toolchain inside + :: MSYS2, this allows using all the dependencies and tools available + :: in MSYS2, but we cannot build inside the MSYS2 shell. + set CMAKE_GENERATOR="MinGW Makefiles" + set CMAKE_GENERATOR_ARGS=VERBOSE=1 + :: Add MinGW to the PATH and remove the Git directory because it + :: has a conflicting sh.exe + set "PATH=C:\msys64\mingw%BITS%\bin;C:\Windows\System32;C:\Windows;%PATH:C:\Program Files\Git\usr\bin;=%" + :: Build third-party dependencies + C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" || goto :error + C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-perl mingw-w64-%ARCH%-diffutils mingw-w64-%ARCH%-unibilium gperf" || goto :error +) else if "%CONFIGURATION:~0,4%" == "MSVC" ( + set CMAKE_GENERATOR_ARGS=/verbosity:detailed +) :: Setup python (use AppVeyor system python) C:\Python27\python.exe -m pip install neovim || goto :error @@ -42,19 +48,19 @@ where.exe neovim-node-host.cmd || goto :error mkdir .deps cd .deps -cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\third-party\ || goto :error -mingw32-make VERBOSE=1 || goto :error +cmake -G %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\third-party\ || goto :error +cmake --build . -- %CMAKE_GENERATOR_ARGS% || goto :error cd .. :: Build Neovim mkdir build cd build -cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim %USE_GCOV% -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error -mingw32-make VERBOSE=1 || goto :error +cmake -G %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim %USE_GCOV% -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error +cmake --build . --config RelWithDebInfo -- %CMAKE_GENERATOR_ARGS% || goto :error bin\nvim --version || goto :error :: Functional tests -mingw32-make functionaltest VERBOSE=1 || goto :error +cmake --build . --config RelWithDebInfo --target functionaltest -- %CMAKE_GENERATOR_ARGS% || goto :error if defined USE_GCOV ( C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) -c -F functionaltest || echo 'codecov upload failed.'" @@ -63,13 +69,15 @@ if defined USE_GCOV ( :: Old tests setlocal set PATH=%PATH%;C:\msys64\usr\bin -mingw32-make -C "%~dp0\..\src\nvim\testdir" VERBOSE=1 +cmake --build "%~dp0\..\src\nvim\testdir" -- %CMAKE_GENERATOR_ARGS% endlocal if defined USE_GCOV ( C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) -c -F oldtest || echo 'codecov upload failed.'" ) +:: The default cpack in the PATH is not CMake +set PATH=C:\Program Files (x86)\CMake\bin\cpack.exe;%PATH% :: Build artifacts cpack -G ZIP -C RelWithDebInfo if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C RelWithDebInfo diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake index 06b527e5a2..a1c7e7f986 100644 --- a/third-party/cmake/BuildLibuv.cmake +++ b/third-party/cmake/BuildLibuv.cmake @@ -76,15 +76,19 @@ elseif(WIN32 AND MSVC) endif() include(TargetArch) - if("${TARGET_ARCH}" STREQUAL "X86_64") + if(TARGET_ARCH STREQUAL "X86_64") set(TARGET_ARCH x64) elseif(TARGET_ARCH STREQUAL "X86") set(TARGET_ARCH x86) endif() - string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_BUILD_TYPE) - set(UV_OUTPUT_DIR ${DEPS_BUILD_DIR}/src/libuv/${CMAKE_BUILD_TYPE}) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(TARGET_CONFIG debug) + else() + set(TARGET_CONFIG release) + endif() + set(UV_OUTPUT_DIR ${DEPS_BUILD_DIR}/src/libuv/${TARGET_CONFIG}) BuildLibUv( - BUILD_COMMAND set PYTHON=${PYTHON_EXECUTABLE} COMMAND ${DEPS_BUILD_DIR}/src/libuv/vcbuild.bat shared ${LOWERCASE_BUILD_TYPE} ${TARGET_ARCH} + BUILD_COMMAND set PYTHON=${PYTHON_EXECUTABLE} COMMAND ${DEPS_BUILD_DIR}/src/libuv/vcbuild.bat shared ${TARGET_CONFIG} ${TARGET_ARCH} INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/lib COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.lib ${DEPS_INSTALL_DIR}/lib |