mirror of https://github.com/YosysHQ/yosys.git
Merge pull request #5950 from YosysHQ/version_fix
Fix version number and git origin
This commit is contained in:
commit
8eb3133076
|
|
@ -70,6 +70,9 @@ function(yosys_extract_version)
|
|||
|
||||
# Build YOSYS_VERSION (just the version info).
|
||||
set(YOSYS_VERSION "${YOSYS_VERSION_MAJOR}.${YOSYS_VERSION_MINOR}")
|
||||
if (git_branch MATCHES "^release/v.+$")
|
||||
set(git_distance 0)
|
||||
endif()
|
||||
if (git_distance STREQUAL "")
|
||||
string(APPEND YOSYS_VERSION "+post")
|
||||
else()
|
||||
|
|
@ -107,7 +110,7 @@ function(yosys_extract_version)
|
|||
# Build YOSYS_ORIGIN_INFO (git repository origin and branch)
|
||||
if (git_origin AND git_branch)
|
||||
string(REGEX REPLACE "^https://|.git$" "" git_origin ${git_origin})
|
||||
if (git_origin STREQUAL "github.com/YosysHQ/yosys" AND git_branch MATCHES "^HEAD|main|release/v.+$")
|
||||
if (git_origin MATCHES "github\\.com[:/]YosysHQ/yosys$" AND git_branch MATCHES "^HEAD|main|release/v.+$")
|
||||
# Nothing to highlight.
|
||||
set(YOSYS_ORIGIN_INFO "")
|
||||
else()
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
set(YOSYS_VERSION_MAJOR 0)
|
||||
set(YOSYS_VERSION_MINOR 64)
|
||||
set(YOSYS_VERSION_MINOR 66)
|
||||
|
|
|
|||
Loading…
Reference in New Issue