Commit bbe2cca1ae32af322abcf4cc4a6d6bee671bf5b8 | zig

author	Jay Petacat <jay@jayschwa.net> 2020-12-14 21:09:13-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-12-29 13:17:08-08:00
log	bbe2cca1ae32af322abcf4cc4a6d6bee671bf5b8
tree	2133d3804817c6cd5c471db2a3f5a1f07bb07e6c
parent	8078d8cd3fb989b0c7a26adde0ee2486e1f473f8

Comply with semantic versioning pre-release format

Example version: 0.8.0-dev.460+g81b343a16

From a semantic versioning perspective, development builds will now be
considered distinct from a tagged release. The number of commits added
since the last tag is included in the pre-release component.

Updates #6466

1 files changed, 21 insertions(+), 8 deletions(-)

CMakeLists.txt

CMakeLists.txt+21-8

 @@ -25,8 +25,8 @@ project(zig C CXX)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 set(ZIG_VERSION_MAJOR 0)
-set(ZIG_VERSION_MINOR 7)
+set(ZIG_VERSION_MINOR 8)
-set(ZIG_VERSION_PATCH 1)
+set(ZIG_VERSION_PATCH 0)
 set(ZIG_VERSION "" CACHE STRING "Override Zig version string. Default is to find out with git.")
 if("${ZIG_VERSION}" STREQUAL "")
 @@ -34,18 +34,31 @@ if("${ZIG_VERSION}" STREQUAL "")
     find_program(GIT_EXE NAMES git)
     if(GIT_EXE)
         execute_process(
-            COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} name-rev HEAD --tags --name-only --no-undefined --always
+            COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} describe --match *.*.* --tags
             RESULT_VARIABLE EXIT_STATUS
-            OUTPUT_VARIABLE ZIG_GIT_REV
+            OUTPUT_VARIABLE GIT_DESCRIBE
             OUTPUT_STRIP_TRAILING_WHITESPACE
             ERROR_QUIET)
         if(EXIT_STATUS EQUAL "0")
-            if(ZIG_GIT_REV MATCHES "\\^0$")
+            if(GIT_DESCRIBE MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)$")
-                if(NOT("${ZIG_GIT_REV}" STREQUAL "${ZIG_VERSION}^0"))
+                # Tagged release version.
-                    message("WARNING: Tag does not match configured Zig version")
+                set(GIT_TAG ${CMAKE_MATCH_1})
+                if(NOT GIT_TAG VERSION_EQUAL ZIG_VERSION)
+                    message(SEND_ERROR "Configured Zig version (${ZIG_VERSION}) does not match Git tag (${GIT_TAG}).")
                 endif()
+            elseif(GIT_DESCRIBE MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-(.+)$")
+                # Untagged pre-release. The Zig version is updated to include the number of commits
+                # since the last tagged version and the commit hash. The version is formatted in
+                # accordance with the https://semver.org specification.
+                set(GIT_TAG ${CMAKE_MATCH_1})
+                set(GIT_COMMITS_AFTER_TAG ${CMAKE_MATCH_2})
+                set(GIT_COMMIT ${CMAKE_MATCH_3})
+                if(NOT ZIG_VERSION VERSION_GREATER GIT_TAG)
+                    message(SEND_ERROR "Configured Zig version (${ZIG_VERSION}) must be greater than tagged ancestor (${GIT_TAG}).")
+                endif()
+                set(ZIG_VERSION "${ZIG_VERSION}-dev.${GIT_COMMITS_AFTER_TAG}+${GIT_COMMIT}")
             else()
-                set(ZIG_VERSION "${ZIG_VERSION}+${ZIG_GIT_REV}")
+                message(WARNING "Failed to parse version from output of `git describe`.")
             endif()
         endif()
     endif()