mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 05:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3539 from jszakmeister/js/use-updated-busted

Browse Source 
Remove our cliargs workaround use 2.0.rc11 of Busted.
This commit is contained in:
Justin M. Keyes
2015-10-28 08:26:14 -04:00
parent 2394a1aeee e34ae35d10
commit 454b087dda
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,16 +116,12 @@ list(APPEND THIRD_PARTY_DEPS lpeg)
if(USE_BUNDLED_BUSTED) if(USE_BUNDLED_BUSTED)
# We can remove the cliargs dependency once the busted version dependency # We can remove the cliargs dependency once the busted version dependency
# is fixed. # is fixed.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs
COMMAND ${LUAROCKS_BINARY}
ARGS install lua_cliargs 2.5-4
DEPENDS luarocks)
add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-1/busted-2.0.rc10-1.rockspec ${LUAROCKS_BUILDARGS} ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc11-0/busted-2.0.rc11-0.rockspec ${LUAROCKS_BUILDARGS}
DEPENDS luarocks ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs) DEPENDS luarocks)
add_custom_target(busted add_custom_target(busted
DEPENDS ${HOSTDEPS_BIN_DIR}/busted ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs) DEPENDS ${HOSTDEPS_BIN_DIR}/busted)
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}