From b8bfc0c736799352d1bab50117d851aedb93631e Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 29 Jun 2015 19:02:48 -0400 Subject: [PATCH 1/2] deps: Update busted: 2.0 rc8 -> 2.0 rc10 This removes the dependency on ansicolors, see [1]: See [2] for a changelog between the two versions. [1]: https://github.com/Olivine-Labs/busted/pull/373 [2]: https://github.com/Olivine-Labs/busted/compare/v2.0.rc8-0...a6233a277da4e118f663606d54da8df88a27c076 --- third-party/cmake/BuildLuarocks.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index ff1f57442d..da0ebc1644 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -136,8 +136,6 @@ if(USE_BUNDLED_BUSTED) ARGS build luasocket 3.0rc1-2 ${LUAROCKS_BUILDARGS} COMMAND ${LUAROCKS_BINARY} ARGS build xml 1.1.2-1 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build ansicolors 1.0.2-3 ${LUAROCKS_BUILDARGS} COMMAND ${CMAKE_COMMAND} -E touch ${HOSTDEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps DEPENDS lpeg) add_custom_target(stable-busted-deps @@ -145,7 +143,7 @@ if(USE_BUNDLED_BUSTED) add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted COMMAND ${LUAROCKS_BINARY} - ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc8-0/busted-2.0.rc8-0.rockspec ${LUAROCKS_BUILDARGS} + ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-0/busted-2.0.rc10-0.rockspec ${LUAROCKS_BUILDARGS} DEPENDS stable-busted-deps) add_custom_target(busted DEPENDS ${HOSTDEPS_BIN_DIR}/busted) From ff3175c4cdc5a04c75e5d564cbb4c92f19fe4335 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Wed, 8 Jul 2015 13:25:50 -0400 Subject: [PATCH 2/2] deps: Don't pin dependencies This effectively reverts 585e5d32a3402bffa971ae8124fc64004ab92e61 The pinning was done at a time when `lua_cliargs` caused test failures, so an older version which didn't was pinned. We're now using the latest version (2.5-1), so the cause of those failures were presumably fixed. --- third-party/cmake/BuildLuarocks.cmake | 32 ++------------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index da0ebc1644..14454fa5a0 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -113,38 +113,10 @@ add_custom_target(lpeg list(APPEND THIRD_PARTY_DEPS lpeg) if(USE_BUNDLED_BUSTED) - # The following are only required if we want to run tests - # with busted - add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps - COMMAND ${LUAROCKS_BINARY} - ARGS build lua_cliargs 2.5-1 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build luafilesystem 1.6.3-1 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build dkjson 2.5-2 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build say 1.3-0 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build luassert 1.7.6-0 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build lua-term 0.3-1 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build penlight 1.3.2-2 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build mediator_lua 1.1.1-0 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build luasocket 3.0rc1-2 ${LUAROCKS_BUILDARGS} - COMMAND ${LUAROCKS_BINARY} - ARGS build xml 1.1.2-1 ${LUAROCKS_BUILDARGS} - COMMAND ${CMAKE_COMMAND} -E touch ${HOSTDEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps - DEPENDS lpeg) - add_custom_target(stable-busted-deps - DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps) - 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 stable-busted-deps) + DEPENDS luarocks) add_custom_target(busted DEPENDS ${HOSTDEPS_BIN_DIR}/busted) @@ -155,5 +127,5 @@ if(USE_BUNDLED_BUSTED) add_custom_target(nvim-client DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client) - list(APPEND THIRD_PARTY_DEPS stable-busted-deps busted nvim-client) + list(APPEND THIRD_PARTY_DEPS busted nvim-client) endif()