aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bump_deps.lua20
-rw-r--r--scripts/gen_help_html.lua3
-rwxr-xr-xscripts/gen_vimdoc.py1
3 files changed, 11 insertions, 13 deletions
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
diff --git a/scripts/gen_help_html.lua b/scripts/gen_help_html.lua
index e2ab70eca2..1bddd3aa8b 100644
--- a/scripts/gen_help_html.lua
+++ b/scripts/gen_help_html.lua
@@ -927,6 +927,9 @@ local function gen_css(fname)
/* Tag pseudo-header common in :help docs. */
.help-tag-right {
color: var(--tag-color);
+ margin-left: auto;
+ margin-right: 0;
+ float: right;
}
h1 .help-tag, h2 .help-tag, h3 .help-tag {
font-size: smaller;
diff --git a/scripts/gen_vimdoc.py b/scripts/gen_vimdoc.py
index d0686e92bc..e9209e219e 100755
--- a/scripts/gen_vimdoc.py
+++ b/scripts/gen_vimdoc.py
@@ -222,7 +222,6 @@ CONFIG = {
'util.lua',
'log.lua',
'rpc.lua',
- 'sync.lua',
'protocol.lua',
],
'files': [