diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-02-28 09:17:26 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-02-28 10:36:23 -0800 |
| commit | 2033713db5ca6224bc769747420458287eecc506 (patch) | |
| tree | 37f72a393c91379f7c1642c97be1f4a03262d134 /host/cmake/Modules | |
| parent | f591c4a80853a8ede173d36fad0049f19ae79636 (diff) | |
| download | uhd-2033713db5ca6224bc769747420458287eecc506.tar.gz uhd-2033713db5ca6224bc769747420458287eecc506.tar.bz2 uhd-2033713db5ca6224bc769747420458287eecc506.zip | |
cmake:
More git info used for build info
UHD version incorporates build info
apt/yum repos use new version number
New installer filename syntax
Diffstat (limited to 'host/cmake/Modules')
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 8 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 19 |
2 files changed, 15 insertions, 12 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 27a43b56e..ef303bc58 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -1,5 +1,5 @@ # -# Copyright 2010-2011 Ettus Research LLC +# Copyright 2010-2012 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -69,7 +69,7 @@ IF((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) ) #set a more sensible package name for this system - SET(CPACK_PACKAGE_FILE_NAME "UHD-${UHD_VERSION}-${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") + SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") ENDIF() @@ -83,9 +83,7 @@ ENDIF() SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ettus Research - USRP Hardware Driver") SET(CPACK_PACKAGE_VENDOR "Ettus Research LLC") SET(CPACK_PACKAGE_CONTACT "Ettus Research <support@ettus.com>") -SET(CPACK_PACKAGE_VERSION_MAJOR ${UHD_VERSION_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${UHD_VERSION_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${UHD_VERSION_PATCH}) +SET(CPACK_PACKAGE_VERSION "${UHD_VERSION}") SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.txt) SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/AUTHORS.txt) SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index adc653d87..8f77188ee 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -1,5 +1,5 @@ # -# Copyright 2010-2011 Ettus Research LLC +# Copyright 2010-2012 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,16 +45,21 @@ IF(UHD_BUILD_INFO_DISCOVERY) #grab the git ref id for the current head EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD - OUTPUT_VARIABLE _git_rev OUTPUT_STRIP_TRAILING_WHITESPACE - RESULT_VARIABLE _git_rev_result + COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8 --long + OUTPUT_VARIABLE _git_describe OUTPUT_STRIP_TRAILING_WHITESPACE + RESULT_VARIABLE _git_describe_result ) #only set the build info on success - IF(_git_rev_result EQUAL 0) - SET(UHD_BUILD_INFO ${_git_rev}) + IF(_git_describe_result EQUAL 0) + EXECUTE_PROCESS( + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND ${PYTHON_EXECUTABLE} -c "print '${_git_describe}'.split('-',1)[1]" + OUTPUT_VARIABLE UHD_BUILD_INFO OUTPUT_STRIP_TRAILING_WHITESPACE + ) ENDIF() + ENDIF(UHD_BUILD_INFO_DISCOVERY) ######################################################################## -SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}") +SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_BUILD_INFO}") |