IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

BuildLuarocks.cmake: use ROCKS_DIR

Browse Source 
With LuaRocks 3 it will include the version, and this will make the
upgrade easier then.
It also makes sense to factor this out in general for clarity already.

Pulled out of https://github.com/neovim/neovim/pull/10292.
This commit is contained in:
Daniel Hahler 2019-07-05 03:55:08 +02:00
parent 84c1d3aede
commit 8eac3f63a2
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
third-party/cmake/BuildLuarocks.cmake vendored
View File

@ -107,44 +107,41 @@ if(USE_BUNDLED_LUAJIT)
elseif(USE_BUNDLED_LUA) elseif(USE_BUNDLED_LUA)
add_dependencies(luarocks lua) add_dependencies(luarocks lua)
endif() endif()
set(ROCKS_DIR ${HOSTDEPS_LIB_DIR}/luarocks/rocks)
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/mpack add_custom_command(OUTPUT ${ROCKS_DIR}/mpack
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build mpack 1.0.8-0 ${LUAROCKS_BUILDARGS} ARGS build mpack 1.0.8-0 ${LUAROCKS_BUILDARGS}
DEPENDS luarocks) DEPENDS luarocks)
add_custom_target(mpack add_custom_target(mpack DEPENDS ${ROCKS_DIR}/mpack)
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/mpack)
list(APPEND THIRD_PARTY_DEPS mpack) list(APPEND THIRD_PARTY_DEPS mpack)
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lpeg add_custom_command(OUTPUT ${ROCKS_DIR}/lpeg
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build lpeg 1.0.2-1 ${LUAROCKS_BUILDARGS} ARGS build lpeg 1.0.2-1 ${LUAROCKS_BUILDARGS}
DEPENDS mpack) DEPENDS mpack)
add_custom_target(lpeg add_custom_target(lpeg DEPENDS ${ROCKS_DIR}/lpeg)
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lpeg)
list(APPEND THIRD_PARTY_DEPS lpeg) list(APPEND THIRD_PARTY_DEPS lpeg)
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/inspect add_custom_command(OUTPUT ${ROCKS_DIR}/inspect
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build inspect 3.1.1-0 ${LUAROCKS_BUILDARGS} ARGS build inspect 3.1.1-0 ${LUAROCKS_BUILDARGS}
DEPENDS lpeg) DEPENDS lpeg)
add_custom_target(inspect add_custom_target(inspect DEPENDS ${ROCKS_DIR}/inspect)
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/inspect)
list(APPEND THIRD_PARTY_DEPS inspect) list(APPEND THIRD_PARTY_DEPS inspect)
if((NOT USE_BUNDLED_LUAJIT) AND USE_BUNDLED_LUA) if((NOT USE_BUNDLED_LUAJIT) AND USE_BUNDLED_LUA)
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luabitop add_custom_command(OUTPUT ${ROCKS_DIR}/luabitop
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build luabitop 1.0.2-3 ${LUAROCKS_BUILDARGS} ARGS build luabitop 1.0.2-3 ${LUAROCKS_BUILDARGS}
DEPENDS inspect) DEPENDS inspect)
add_custom_target(luabitop add_custom_target(luabitop DEPENDS ${ROCKS_DIR}/luabitop)
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luabitop)
list(APPEND THIRD_PARTY_DEPS luabitop) list(APPEND THIRD_PARTY_DEPS luabitop)
endif() endif()
@ -157,12 +154,11 @@ if(USE_BUNDLED_BUSTED)
endif() endif()
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight add_custom_command(OUTPUT ${ROCKS_DIR}/penlight
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build penlight 1.5.4-1 ${LUAROCKS_BUILDARGS} ARGS build penlight 1.5.4-1 ${LUAROCKS_BUILDARGS}
DEPENDS ${PENLIGHT_DEPENDS}) DEPENDS ${PENLIGHT_DEPENDS})
add_custom_target(penlight add_custom_target(penlight DEPENDS ${ROCKS_DIR}/penlight)
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight)
if(WIN32) if(WIN32)
set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted.bat") set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted.bat")
@ -176,16 +172,14 @@ if(USE_BUNDLED_BUSTED)
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build busted 2.0.rc13-0 ${LUAROCKS_BUILDARGS} ARGS build busted 2.0.rc13-0 ${LUAROCKS_BUILDARGS}
DEPENDS penlight) DEPENDS penlight)
add_custom_target(busted add_custom_target(busted DEPENDS ${BUSTED_EXE})
DEPENDS ${BUSTED_EXE})
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${LUACHECK_EXE} add_custom_command(OUTPUT ${LUACHECK_EXE}
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build luacheck 0.23.0-1 ${LUAROCKS_BUILDARGS} ARGS build luacheck 0.23.0-1 ${LUAROCKS_BUILDARGS}
DEPENDS busted) DEPENDS busted)
add_custom_target(luacheck add_custom_target(luacheck DEPENDS ${LUACHECK_EXE})
DEPENDS ${LUACHECK_EXE})
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
set(LUV_DEPS luacheck) set(LUV_DEPS luacheck)
@ -199,27 +193,25 @@ if(USE_BUNDLED_BUSTED)
list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR})
endif() endif()
SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3) SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3)
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv add_custom_command(OUTPUT ${ROCKS_DIR}/luv
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS} ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS}
WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv
DEPENDS ${LUV_DEPS}) DEPENDS ${LUV_DEPS})
else() else()
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv add_custom_command(OUTPUT ${ROCKS_DIR}/luv
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build luv ${LUV_VERSION} ${LUAROCKS_BUILDARGS} ARGS build luv ${LUV_VERSION} ${LUAROCKS_BUILDARGS}
DEPENDS ${LUV_DEPS}) DEPENDS ${LUV_DEPS})
endif() endif()
add_custom_target(luv add_custom_target(luv DEPENDS ${ROCKS_DIR}/luv)
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv)
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client add_custom_command(OUTPUT ${ROCKS_DIR}/nvim-client
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build nvim-client 0.2.0-1 ${LUAROCKS_BUILDARGS} ARGS build nvim-client 0.2.0-1 ${LUAROCKS_BUILDARGS}
DEPENDS luv) DEPENDS luv)
add_custom_target(nvim-client add_custom_target(nvim-client DEPENDS ${ROCKS_DIR}/nvim-client)
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client)
list(APPEND THIRD_PARTY_DEPS busted luacheck nvim-client) list(APPEND THIRD_PARTY_DEPS busted luacheck nvim-client)
endif() endif()