From 9909668111f521c7fc829ec8d8aa89beafff8777 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Wed, 3 May 2023 00:31:07 +0200
Subject: build: create a text file for specifying dependency information

The cmake.deps build will read this file and set the left part of the
text as the variable name and the right part as the variable value. The
benefit of doing this is that it becomes much easier to parse which
dependencies are required, as well as to bump dependencies with
scripts/bump_deps.lua.

Adjust bump_deps.lua script to work with this new format.
---
 scripts/bump_deps.lua | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'scripts/bump_deps.lua')

diff --git a/scripts/bump_deps.lua b/scripts/bump_deps.lua
index f980e800cf..6a049d136a 100755
--- a/scripts/bump_deps.lua
+++ b/scripts/bump_deps.lua
@@ -63,6 +63,7 @@ local function rm_file_if_present(path_to_file)
 end
 
 local nvim_src_dir = vim.fn.getcwd()
+local deps_file = nvim_src_dir .. '/' .. 'cmake.deps/deps.txt'
 local temp_dir = nvim_src_dir .. '/tmp'
 run({ 'mkdir', '-p', temp_dir })
 
@@ -127,26 +128,24 @@ end
 local function write_cmakelists_line(symbol, kind, value)
   require_executable('sed')
 
-  local cmakelists_path = nvim_src_dir .. '/' .. 'cmake.deps/CMakeLists.txt'
   run_die({
     'sed',
     '-i',
     '-e',
-    's/set('
+    's/'
       .. symbol
       .. '_'
       .. kind
       .. '.*$'
-      .. '/set('
+      .. '/'
       .. symbol
       .. '_'
       .. kind
       .. ' '
       .. value
-      .. ')'
       .. '/',
-    cmakelists_path,
-  }, 'Failed to write ' .. cmakelists_path)
+    deps_file,
+  }, 'Failed to write ' .. deps_file)
 end
 
 local function explicit_create_branch(dep)
@@ -181,8 +180,6 @@ local function update_cmakelists(dependency, archive, comment)
 
   verify_branch(dependency.name)
 
-  local changed_file = nvim_src_dir .. '/' .. 'cmake.deps/CMakeLists.txt'
-
   p('Updating ' .. dependency.name .. ' to ' .. archive.url .. '\n')
   write_cmakelists_line(dependency.symbol, 'URL', archive.url:gsub('/', '\\/'))
   write_cmakelists_line(dependency.symbol, 'SHA256', archive.sha)
@@ -190,7 +187,7 @@ local function update_cmakelists(dependency, archive, comment)
     {
       'git',
       'commit',
-      changed_file,
+      deps_file,
       '-m',
       commit_prefix .. 'bump ' .. dependency.name .. ' to ' .. comment,
     },
@@ -201,10 +198,9 @@ end
 local function verify_cmakelists_committed()
   require_executable('git')
 
-  local cmakelists_path = nvim_src_dir .. '/' .. 'cmake.deps/CMakeLists.txt'
   run_die(
-    { 'git', 'diff', '--quiet', 'HEAD', '--', cmakelists_path },
-    cmakelists_path .. ' has uncommitted changes'
+    { 'git', 'diff', '--quiet', 'HEAD', '--', deps_file },
+    deps_file .. ' has uncommitted changes'
   )
 end
 
-- 
cgit 


From ed8c44f76762061e30cb8056483f55d38802eaef Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 May 2023 11:44:56 +0200
Subject: ci(deps): update bump_deps script (#23604)

* consistent capitalization (lower-case) of dependency names
* add bundled tree-sitter parsers
---
 scripts/bump_deps.lua | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'scripts/bump_deps.lua')

diff --git a/scripts/bump_deps.lua b/scripts/bump_deps.lua
index 6a049d136a..076ad374cf 100755
--- a/scripts/bump_deps.lua
+++ b/scripts/bump_deps.lua
@@ -69,7 +69,7 @@ run({ 'mkdir', '-p', temp_dir })
 
 local function get_dependency(dependency_name)
   local dependency_table = {
-    ['LuaJIT'] = {
+    ['luajit'] = {
       repo = 'LuaJIT/LuaJIT',
       symbol = 'LUAJIT',
     },
@@ -77,7 +77,7 @@ local function get_dependency(dependency_name)
       repo = 'libuv/libuv',
       symbol = 'LIBUV',
     },
-    ['Luv'] = {
+    ['luv'] = {
       repo = 'luvit/luv',
       symbol = 'LUV',
     },
@@ -85,6 +85,26 @@ local function get_dependency(dependency_name)
       repo = 'tree-sitter/tree-sitter',
       symbol = 'TREESITTER',
     },
+    ['tree-sitter-c'] = {
+      repo = 'tree-sitter/tree-sitter-c',
+      symbol = 'TREESITTER_C',
+    },
+    ['tree-sitter-lua'] = {
+      repo = 'MunifTanjim/tree-sitter-lua',
+      symbol = 'TREESITTER_LUA',
+    },
+    ['tree-sitter-vim'] = {
+      repo = 'neovim/tree-sitter-vim',
+      symbol = 'TREESITTER_VIM',
+    },
+    ['tree-sitter-vimdoc'] = {
+      repo = 'neovim/tree-sitter-vimdoc',
+      symbol = 'TREESITTER_VIMDOC',
+    },
+    ['tree-sitter-query'] = {
+      repo = 'nvim-treesitter/tree-sitter-query',
+      symbol = 'TREESITTER_QUERY',
+    },
   }
   local dependency = dependency_table[dependency_name]
   if dependency == nil then
-- 
cgit