aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-20 01:02:42 -0400
committerGitHub <noreply@github.com>2021-04-20 01:02:42 -0400
commit7bf62ab0226d41208a608e92cb292b4c3c2b7646 (patch)
tree20fd71941dbfca36b78c94ef566710c6c28df5f0
parent26bd5a58dff1b920757f3bc010c2e8f9dbfc9d40 (diff)
downloadrneovim-7bf62ab0226d41208a608e92cb292b4c3c2b7646.tar.gz
rneovim-7bf62ab0226d41208a608e92cb292b4c3c2b7646.tar.bz2
rneovim-7bf62ab0226d41208a608e92cb292b4c3c2b7646.zip
win/package: remove cat,tidy (#14402)
Neovim should not bundle external tools that are not needed in the runtime environment. cat.exe is meant for tests only. Install a mingw/msys2/busybox environment which bundle cat.exe. tidy.exe was never used in tests and is not required in Neovim runtime. busybox and tidy.exe can be installed via scoop. Ref: https://github.com/neovim/neovim/issues/14078
-rw-r--r--src/nvim/CMakeLists.txt2
-rw-r--r--third-party/CMakeLists.txt2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 2c9d655a15..8b422b3abe 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -506,11 +506,9 @@ if(WIN32)
"file(MAKE_DIRECTORY \"${PROJECT_BINARY_DIR}/windows_runtime_deps/platforms\")")
foreach(DEP_FILE IN ITEMS
ca-bundle.crt
- cat.exe
curl.exe
diff.exe
tee.exe
- tidy.exe
win32yank.exe
winpty-agent.exe
winpty.dll
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index d0e7cdc9e3..dbd590cbae 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -175,7 +175,7 @@ set(LUA_COMPAT53_SHA256 bec3a23114a3d9b3218038309657f0f506ad10dfbc03bb54e91da7e5
set(GPERF_URL https://github.com/neovim/deps/raw/ff5b4b18a87397a8564016071ae64f64bcd8c635/opt/gperf-3.1.tar.gz)
set(GPERF_SHA256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2)
-# 7za.exe cat.exe curl.exe ca-bundle.crt diff.exe tee.exe tidy.exe xxd.exe
+# cat.exe curl.exe ca-bundle.crt diff.exe tee.exe xxd.exe
set(WINTOOLS_URL https://github.com/neovim/deps/raw/2f9acbecf06365c10baa3c0087f34a54c9c6f949/opt/win32tools.zip)
set(WINTOOLS_SHA256 8bfce7e3a365721a027ce842f2ec1cf878f1726233c215c05964aac07300798c)