michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: fixed version handling

Browse source 
Use VERSION in top directory to specify version

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-11-07 19:32:47 -05:00 • committed by Anas Nashif
commit 388286663a
1 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

37
cmake/version.cmake
View file

@ -1,7 +1,23 @@
set(PROJECT_VERSION_MAJOR 1) include($ENV{ZEPHYR_BASE}/cmake/hex.cmake)
set(PROJECT_VERSION_MINOR 9) file(READ $ENV{ZEPHYR_BASE}/VERSION ver)
set(PROJECT_VERSION_PATCH 99)
set(PROJECT_VERSION_TWEAK 0) string(REGEX MATCH "VERSION_MAJOR = ([0-9]*)" _ ${ver})
set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1})
string(REGEX MATCH "VERSION_MINOR = ([0-9]*)" _ ${ver})
set(PROJECT_VERSION_MINOR ${CMAKE_MATCH_1})
string(REGEX MATCH "PATCHLEVEL = ([0-9]*)" _ ${ver})
set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_1})
string(REGEX MATCH "VERSION_TWEAK = ([0-9]*)" _ ${ver})
set(PROJECT_VERSION_TWEAK ${CMAKE_MATCH_1})
string(REGEX MATCH "EXTRAVERSION = (.*)" _ ${ver})
set(PROJECT_VERSION_EXTRA ${CMAKE_MATCH_1})
message("Zephyr version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
if(PROJECT_VERSION_TWEAK) if(PROJECT_VERSION_TWEAK)
@ -9,12 +25,19 @@ if(PROJECT_VERSION_TWEAK)
endif() endif()
set(MAJOR ${PROJECT_VERSION_MAJOR}) # Temporary convenience variable set(MAJOR ${PROJECT_VERSION_MAJOR}) # Temporary convenience variable
set(MINOR ${PROJECT_VERSION_MINOR}) # Temporary convenience variable
set(PATCH ${PROJECT_VERSION_PATCH}) # Temporary convenience variable
math(EXPR ZEPHYR_VERSION_CODE "(${MAJOR} << 16) + (${MAJOR} << 8) + (${MAJOR})") math(EXPR ZEPHYR_VERSION_CODE "(${MAJOR} << 16) + (${MINOR} << 8) + (${PATCH})")
math(EXPR KERNELVERSION "(${MAJOR} << 16) + (${MAJOR} << 8) + (${MAJOR})") math(EXPR KERNEL_VERSION_NUMBER_INT "(${MAJOR} << 16) + (${MINOR} << 8) + (${PATCH})")
math(EXPR KERNEL_VERSION_NUMBER "(${MAJOR} << 24) + (${MAJOR} << 16) + (${MAJOR} << 8) + ${PROJECT_VERSION_TWEAK}") math(EXPR KERNELVERSION_INT "(${MAJOR} << 24) + (${MINOR} << 16) + (${PATCH} << 8) + ${PROJECT_VERSION_TWEAK}")
to_hex(${KERNELVERSION_INT} KERNELVERSION)
to_hex(${KERNEL_VERSION_NUMBER_INT} KERNEL_VERSION_NUMBER)
unset(MAJOR) unset(MAJOR)
unset(MINOR)
unset(PATCH)
set(KERNEL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(KERNEL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(KERNEL_VERSION_MINOR ${PROJECT_VERSION_MINOR}) set(KERNEL_VERSION_MINOR ${PROJECT_VERSION_MINOR})