mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-28 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Remove moonscript as a third-party build dependency

Browse Source
This commit is contained in:
Thiago de Arruda
2014-08-31 00:02:26 -03:00
committed by Nicolas Hillegeer
parent 7b41fb383a
commit 80e421fe8d
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
third-party/CMakeLists.txt vendored
View File

@@ -150,31 +150,21 @@ if(USE_BUNDLED_LUAROCKS)
add_dependencies(luarocks luajit) add_dependencies(luarocks luajit)
endif() endif()
add_custom_command(OUTPUT ${DEPS_BIN_DIR}/moon ${DEPS_BIN_DIR}/moonc
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install moonscript
DEPENDS luarocks)
add_custom_target(moonscript
DEPENDS ${DEPS_BIN_DIR}/moon ${DEPS_BIN_DIR}/moonc)
# Busted doesn't depend on luarocks, but luarocks is unhappy to have two
# instances running in parallel. So we depend on moonscript to force it
# to be serialized.
add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install busted 1.10.0 COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install busted 1.10.0
DEPENDS moonscript) DEPENDS luarocks)
add_custom_target(busted add_custom_target(busted
DEPENDS ${DEPS_BIN_DIR}/busted) DEPENDS ${DEPS_BIN_DIR}/busted)
# Like busted dependency on moonscript, we add a dependency on busted # lua-cmsgpack doesn't depend on busted, but luarocks is unhappy to have two
# to serialize the install # instances running in parallel. So we depend on busted to force it
# to be serialized.
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lua-cmsgpack COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lua-cmsgpack
DEPENDS busted) DEPENDS busted)
add_custom_target(lua-cmsgpack add_custom_target(lua-cmsgpack
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack)
# lpeg is a moonscript dependency, but since it is also required for
# normal compilation(even without unit testing) we better add it explicitly.
# Like before, depend on cmsgpack to ensure serialization of install commands # Like before, depend on cmsgpack to ensure serialization of install commands
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lpeg add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lpeg
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lpeg COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lpeg
@@ -182,7 +172,7 @@ if(USE_BUNDLED_LUAROCKS)
add_custom_target(lpeg add_custom_target(lpeg
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lpeg) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lpeg)
list(APPEND THIRD_PARTY_DEPS moonscript busted lua-cmsgpack lpeg) list(APPEND THIRD_PARTY_DEPS busted lua-cmsgpack lpeg)
endif() endif()
add_custom_target(third-party ALL add_custom_target(third-party ALL