diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-12-06 15:22:20 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2020-12-06 21:01:11 -0500 |
| commit | 2b594b9c81fea02598e0f6b6dff7972677f2c150 (patch) | |
| tree | 6009730b9f95b678b95f51c2f949ec6c3c6b212a | |
| parent | 5855a3ea7bf19fdf8d1c0351ce062386fb98127a (diff) | |
| download | rneovim-2b594b9c81fea02598e0f6b6dff7972677f2c150.tar.gz rneovim-2b594b9c81fea02598e0f6b6dff7972677f2c150.tar.bz2 rneovim-2b594b9c81fea02598e0f6b6dff7972677f2c150.zip | |
Use vX.Y.Z-dev+{git-describe} for development versions
| -rwxr-xr-x | scripts/update_version_stamp.lua | 9 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/update_version_stamp.lua b/scripts/update_version_stamp.lua index 11b521fab6..0342e08f31 100755 --- a/scripts/update_version_stamp.lua +++ b/scripts/update_version_stamp.lua @@ -35,11 +35,10 @@ if not described then end -- `git describe` annotates the most recent tagged release; for pre-release --- builds we must replace that with the unreleased version. -local with_prefix = described:gsub("^v%d+%.%d+%.%d+", prefix) -if described == with_prefix then - -- Prepend the prefix always, e.g. with "nightly-12208-g4041b62b9". - with_prefix = prefix .. "-" .. described +-- builds we append that to the dev version +local with_prefix = prefix +if prefix:match('-dev$') ~= nil then + with_prefix = prefix .. '+' .. described:gsub('^v%d+%.%d+%.%d+-', '') end -- Read existing include file. diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 8ec087c626..db77931c16 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -242,7 +242,7 @@ if(use_git_version) add_custom_target(update_version_stamp ALL COMMAND ${LUA_PRG} scripts/update_version_stamp.lua ${relbuild}/config/auto/versiondef_git.h - "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}" + "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}${NVIM_VERSION_PRERELEASE}" WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} BYPRODUCTS ${CMAKE_BINARY_DIR}/config/auto/versiondef_git.h) else() |