kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: remove USE_BUNDLED_BUSTED option

Browse Source 
The previous logic made it possible to install bundled luarocks, but
also use external rocks, making the luarocks installation unnecessary.
Instead, let's assume that if the user wants to use the bundled
luarocks, then they also want to use it to install necessary rocks.
This commit is contained in:
dundargoc 2023-05-08 17:24:19 +02:00 committed by GitHub
parent 71424a8a0e
commit 88366641ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmake.deps/cmake/BuildLuarocks.cmake
View File

@ -3,8 +3,6 @@
# running luarocks in parallel will break, e.g. when some rocks have # running luarocks in parallel will break, e.g. when some rocks have
# the same dependency. # the same dependency.
option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON)
# The luarocks binary location # The luarocks binary location
set(LUAROCKS_BINARY ${DEPS_BIN_DIR}/luarocks) set(LUAROCKS_BINARY ${DEPS_BIN_DIR}/luarocks)
@ -119,19 +117,17 @@ function(Download ROCK VER)
set(CURRENT_DEP ${ROCK} PARENT_SCOPE) set(CURRENT_DEP ${ROCK} PARENT_SCOPE)
endfunction() endfunction()
if(USE_BUNDLED_BUSTED) if(WIN32)
if(WIN32) set(BUSTED_EXE "${DEPS_BIN_DIR}/busted.bat")
set(BUSTED_EXE "${DEPS_BIN_DIR}/busted.bat") set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck.bat")
set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck.bat") else()
else() set(BUSTED_EXE "${DEPS_BIN_DIR}/busted")
set(BUSTED_EXE "${DEPS_BIN_DIR}/busted") set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck")
set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck") endif()
endif()
Download(busted 2.1.1 ${BUSTED_EXE})
Download(busted 2.1.1 ${BUSTED_EXE}) Download(luacheck 1.1.0-1 ${LUACHECK_EXE})
Download(luacheck 1.1.0-1 ${LUACHECK_EXE})
if (USE_BUNDLED_LUA OR NOT USE_BUNDLED_LUAJIT)
if (USE_BUNDLED_LUA OR NOT USE_BUNDLED_LUAJIT) Download(coxpcall 1.17.0-1)
Download(coxpcall 1.17.0-1)
endif()
endif() endif()