diff options
| author | George Zhao <zhaozg@gmail.com> | 2019-06-10 20:13:18 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-06-10 14:13:18 +0200 |
| commit | c83926cd0aa5720e88e84fa3fae3c0e689cca3ef (patch) | |
| tree | b0511481bce7d76b4dfe91b1bdc6d626eeeb5f40 /third-party | |
| parent | 3e58e60568c2acc765f3ee72295e2f15baa3cf52 (diff) | |
| download | rneovim-c83926cd0aa5720e88e84fa3fae3c0e689cca3ef.tar.gz rneovim-c83926cd0aa5720e88e84fa3fae3c0e689cca3ef.tar.bz2 rneovim-c83926cd0aa5720e88e84fa3fae3c0e689cca3ef.zip | |
lua: introduce vim.loop (expose libuv event-loop) #10123
Co-authored-by: Andrey Popp <8mayday@gmail.com>
closes #9546
closes #10084
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 5 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuv.cmake | 25 |
3 files changed, 31 insertions, 6 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index db4dae4b39..21a1752054 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -154,8 +154,11 @@ set(LIBTERMKEY_SHA256 cecbf737f35d18f433c8d7864f63c0f878af41f8bd0255a3ebb16010dc set(LIBVTERM_URL https://github.com/neovim/libvterm/archive/b45b648cab73f9667bde7c0c6045b285e22b3ecd.tar.gz) set(LIBVTERM_SHA256 37cc123deff29327efa654358c2ebaaf8589da03754ca5adb8ec47be386a0433) -set(LUV_URL https://github.com/luvit/luv/archive/1.9.1-1.tar.gz) -set(LUV_SHA256 562b9efaad30aa051a40eac9ade0c3df48bb8186763769abe47ec3fb3edb1268) +set(LUV_URL https://github.com/luvit/luv/archive/1.29.1-2.tar.gz) +set(LUV_SHA256 e75d8fd2a14433bb798900a71e45318b3c0b8c2ef2c1c43593482ce95b4999e2) + +set(LUA_COMPAT53_URL https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz) +set(LUA_COMPAT53_SHA256 bec3a23114a3d9b3218038309657f0f506ad10dfbc03bb54e91da7e5ffdba0a2) set(GPERF_URL https://github.com/neovim/deps/raw/ff5b4b18a87397a8564016071ae64f64bcd8c635/opt/gperf-3.1.tar.gz) set(GPERF_SHA256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index de4db35bfd..3ef7c6300e 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -182,7 +182,7 @@ if(USE_BUNDLED_BUSTED) add_custom_target(luacheck DEPENDS ${LUACHECK_EXE}) - set(LUV_DEPS luacheck luv-static) + set(LUV_DEPS luacheck luv-static lua-compat-5.3) if(MINGW AND CMAKE_CROSSCOMPILING) set(LUV_DEPS ${LUV_DEPS} libuv_host) endif() @@ -191,9 +191,10 @@ if(USE_BUNDLED_BUSTED) list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) endif() # DEPENDS on the previous module, because Luarocks breaks if parallel. + 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 COMMAND ${LUAROCKS_BINARY} - ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} + ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS} WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv DEPENDS ${LUV_DEPS}) add_custom_target(luv diff --git a/third-party/cmake/BuildLuv.cmake b/third-party/cmake/BuildLuv.cmake index a62ee72f91..5de5ddbf9c 100644 --- a/third-party/cmake/BuildLuv.cmake +++ b/third-party/cmake/BuildLuv.cmake @@ -15,8 +15,26 @@ function(BuildLuv) message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND, BUILD_COMMAND, INSTALL_COMMAND") endif() + ExternalProject_Add(lua-compat-5.3 + PREFIX ${DEPS_BUILD_DIR} + URL ${LUA_COMPAT53_URL} + DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua-compat-5.3 + DOWNLOAD_COMMAND ${CMAKE_COMMAND} + -DPREFIX=${DEPS_BUILD_DIR} + -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/lua-compat-5.3 + -DURL=${LUA_COMPAT53_URL} + -DEXPECTED_SHA256=${LUA_COMPAT53_SHA256} + -DTARGET=lua-compat-5.3 + -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR} + -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake + PATCH_COMMAND "" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "") + ExternalProject_Add(luv-static PREFIX ${DEPS_BUILD_DIR} + DEPENDS lua-compat-5.3 URL ${LUV_URL} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luv DOWNLOAD_COMMAND ${CMAKE_COMMAND} @@ -94,9 +112,12 @@ endif() if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly")) - set(LUV_BUILD_COMMAND ${CMAKE_COMMAND} "-DCMAKE_MAKE_PROGRAM=gmake" --build .) + set(LUV_BUILD_COMMAND ${CMAKE_COMMAND} + "-DLUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3" + "-DCMAKE_MAKE_PROGRAM=gmake" --build .) else() - set(LUV_BUILD_COMMAND ${CMAKE_COMMAND} --build .) + set(LUV_BUILD_COMMAND ${CMAKE_COMMAND} + "-DLUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3" --build .) endif() set(LUV_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install) |