From f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 27 Jun 2022 03:08:59 -0700 Subject: build: rename build-related dirs Problem: Dirs "config", "packaging", and "third-party" are all closely related but this is not obvious from the layout. This adds friction for new contributors. Solution: - rename config/ to cmake.config/ - rename test/config/ to test/cmakeconfig/ because it is used in Lua tests: require('test.cmakeconfig.paths'). - rename packaging/ to cmake.packaging/ - rename third-party/ to cmake.deps/ (parallel with .deps/) --- scripts/bump_deps.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/bump_deps.lua b/scripts/bump_deps.lua index 2ecbb2e658..17e3fd35d6 100644 --- a/scripts/bump_deps.lua +++ b/scripts/bump_deps.lua @@ -132,7 +132,7 @@ end local function write_cmakelists_line(symbol, kind, value) require_executable("sed") - local cmakelists_path = nvim_src_dir .. "/" .. "third-party/CMakeLists.txt" + local cmakelists_path = nvim_src_dir .. "/" .. "cmake.deps/CMakeLists.txt" run_die({ "sed", "-i", @@ -169,7 +169,7 @@ local function update_cmakelists(dependency, archive, comment) verify_branch(dependency.name) - local changed_file = nvim_src_dir .. "/" .. "third-party/CMakeLists.txt" + 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("/", "\\/")) @@ -183,7 +183,7 @@ end local function verify_cmakelists_committed() require_executable("git") - local cmakelists_path = nvim_src_dir .. "/" .. "third-party/CMakeLists.txt" + local cmakelists_path = nvim_src_dir .. "/" .. "cmake.deps/CMakeLists.txt" run_die({ "git", "diff", "--quiet", "HEAD", "--", cmakelists_path }, cmakelists_path .. " has uncommitted changes") end -- cgit From 4c0c6f8428681c7ceef1148abe40b7d06079449c Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 27 Jun 2022 12:30:27 -0700 Subject: build: move unicode/ to src/unicode/ --- scripts/download-unicode-files.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/download-unicode-files.sh b/scripts/download-unicode-files.sh index 12474d3c1e..4482cefa34 100755 --- a/scripts/download-unicode-files.sh +++ b/scripts/download-unicode-files.sh @@ -4,7 +4,7 @@ set -e data_files="UnicodeData.txt CaseFolding.txt EastAsianWidth.txt" emoji_files="emoji-data.txt" -UNIDIR_DEFAULT=unicode +UNIDIR_DEFAULT=src/unicode DOWNLOAD_URL_BASE_DEFAULT='http://unicode.org/Public' if test x$1 = 'x--help' ; then @@ -39,5 +39,5 @@ done ( cd "$UNIDIR" - git commit -m "Update unicode files" -- $files + git commit -m "feat: update unicode tables" -- $files ) -- cgit