From f30844008bdd313b03a19486159f571a067e68b9 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sun, 3 Sep 2023 00:38:10 +0200 Subject: build: download busted from own neovim/deps repository Downloading the necessary files all at once instead of doing dependency handling with luarocks speeds up installation immensely. We speed up the process even more by using luv as a replacement for the C modules in the busted dependencies, which allows us to skip costly compilation times. Co-authored-by: bfredl --- cmake/BuildLuarocks.cmake | 5 ----- cmake/Deps.cmake | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'cmake') diff --git a/cmake/BuildLuarocks.cmake b/cmake/BuildLuarocks.cmake index c5e08d2d74..2dc493a59b 100644 --- a/cmake/BuildLuarocks.cmake +++ b/cmake/BuildLuarocks.cmake @@ -89,10 +89,8 @@ function(Download ROCK VER) endfunction() if(WIN32) - set(BUSTED_EXE "${DEPS_BIN_DIR}/busted.bat") set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck.bat") else() - set(BUSTED_EXE "${DEPS_BIN_DIR}/busted") set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck") endif() @@ -100,9 +98,6 @@ add_custom_target(test_deps) Download(luacheck 1.1.0-1 ${LUACHECK_EXE}) -Download(busted 2.1.1 ${BUSTED_EXE}) -add_dependencies(test_deps busted) - if(PREFER_LUA) Download(coxpcall 1.17.0-1) add_dependencies(test_deps coxpcall) diff --git a/cmake/Deps.cmake b/cmake/Deps.cmake index 69a950eb0d..e8dcbaa79d 100644 --- a/cmake/Deps.cmake +++ b/cmake/Deps.cmake @@ -1,6 +1,7 @@ set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr") set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin") set(DEPS_LIB_DIR "${DEPS_INSTALL_DIR}/lib") +set(DEPS_SHARE_DIR "${DEPS_INSTALL_DIR}/share/lua/5.1") set(DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build") set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads") -- cgit