From 804edb0489c6c4c861928c3a52ac6aa8580d4f17 Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Tue, 27 Oct 2015 05:14:18 -0400 Subject: [PATCH] Update busted to pick up the CLI fix. Unfortunately, it's not enough to avoid the rc file. For now, let's install a good version of lua_cliargs until the dependency is fixed upstream. --- third-party/cmake/BuildLuarocks.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 79d7e83ce7..5910e430b0 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -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}