Merge pull request #3525 from jszakmeister/fix-busted-dependency

Update busted to pick up the CLI fix.
This commit is contained in:
Justin M. Keyes 2015-10-27 14:20:06 -04:00
commit e6525f3ceb

View File

@ -114,12 +114,18 @@ add_custom_target(lpeg
list(APPEND THIRD_PARTY_DEPS lpeg)
if(USE_BUNDLED_BUSTED)
# We can remove the cliargs dependency once the busted version dependency
# 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
COMMAND ${LUAROCKS_BINARY}
ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-0/busted-2.0.rc10-0.rockspec ${LUAROCKS_BUILDARGS}
DEPENDS luarocks)
ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-1/busted-2.0.rc10-1.rockspec ${LUAROCKS_BUILDARGS}
DEPENDS luarocks ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs)
add_custom_target(busted
DEPENDS ${HOSTDEPS_BIN_DIR}/busted)
DEPENDS ${HOSTDEPS_BIN_DIR}/busted ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs)
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client
COMMAND ${LUAROCKS_BINARY}