From 659d2e2c78d21ca79099c0ee0b7f5cffefbe04de Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 11 Dec 2014 16:05:10 +0100 Subject: cmake: Dev branches can get a named version --- host/cmake/Modules/UHDConfigVersion.cmake.in | 11 +++++++++++ host/cmake/Modules/UHDVersion.cmake | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'host/cmake') diff --git a/host/cmake/Modules/UHDConfigVersion.cmake.in b/host/cmake/Modules/UHDConfigVersion.cmake.in index 3d09687e1..67e0e408d 100644 --- a/host/cmake/Modules/UHDConfigVersion.cmake.in +++ b/host/cmake/Modules/UHDConfigVersion.cmake.in @@ -32,6 +32,7 @@ set(ENV{UHD_CONFIG_VERSION_USED} TRUE) SET(MAJOR_VERSION @TRIMMED_VERSION_MAJOR@) SET(MINOR_VERSION @TRIMMED_VERSION_MINOR@) SET(PATCH_VERSION @TRIMMED_VERSION_PATCH@) +SET(DEVEL_VERSION @UHD_VERSION_DEVEL@) SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@) SET(ENV{UHD_PACKAGE_VERSION} ${PACKAGE_VERSION}) @@ -48,6 +49,13 @@ IF(NOT PACKAGE_FIND_VERSION) RETURN() ENDIF(NOT PACKAGE_FIND_VERSION) +# Development branches of UHD don't have a patch version. This is a hack +# to add a fake patch version that should be higher than anything the user +# requests. +IF(DEVEL_VERSION) + SET(PACKAGE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.999") +ENDIF(DEVEL_VERSION) + # assume incorrect versioning by default SET(PACKAGE_VERSION_COMPATIBLE FALSE) SET(PACKAGE_VERSION_EXACT FALSE) @@ -164,3 +172,6 @@ ENDIF(UHD_USE_ABI) IF(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION}) SET(PACKAGE_VERSION_EXACT TRUE) ENDIF() + +# Undo our patch-version-number hack +SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@) diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 69f668d3f..bcbf66750 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -24,10 +24,12 @@ FIND_PACKAGE(Git QUIET) # - increment major on api compatibility changes # - increment minor on feature-level changes # - increment patch on for bug fixes and docs +# - set UHD_VERSION_DEVEL to true for master and development branches ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 008) SET(UHD_VERSION_PATCH 001) +SET(UHD_VERSION_DEVEL FALSE) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages @@ -36,7 +38,7 @@ SET(UHD_VERSION_PATCH 001) FUNCTION(DEPAD_NUM input_num output_num) EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${PYTHON_EXECUTABLE} -c "print int('${input_num}')" + COMMAND ${PYTHON_EXECUTABLE} -c "print int('${input_num}') if isinstance('${input_num}', (int, long)) else '${input_num}'" OUTPUT_VARIABLE depadded_num OUTPUT_STRIP_TRAILING_WHITESPACE ) SET(${output_num} ${depadded_num} PARENT_SCOPE) -- cgit v1.2.3 From d3bdb8f1602fda76e0a5a2578cb06902abfe7209 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 28 Jan 2015 23:48:16 +0100 Subject: 3.8.2 Release - Updated fpga-src - Updated version strings - Updated images package --- CHANGELOG | 14 ++++++++++++++ fpga-src | 2 +- host/CMakeLists.txt | 4 ++-- host/cmake/Modules/UHDVersion.cmake | 2 +- host/include/uhd/version.hpp.in | 2 +- 5 files changed, 19 insertions(+), 5 deletions(-) (limited to 'host/cmake') diff --git a/CHANGELOG b/CHANGELOG index a5c67cbac..28ac1fad2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,20 @@ Change Log for Releases ============================== +## 003.008.002 +* CMake: Introducing named versions for dev branches, enable static libs, +* E300: Docs updates, compat number bump, VCTCXO updates, + more status bits for ref locking, fixed serial number length fix, + RSSI Sensor +* B200: RSSI sensor +* AD9361: Better handling of different interpolation rates in FIR, + fix for gain value truncation +* UBX: Added drivers +* Manual/Docs: Numerous updates, minimum compiler versions now specified, +* Converters: Multiple fixes for sc12 +* Examples: Fixes to txrx_loopback_to_file +* Minor UHD fixes + ## 003.008.001 * B2x0: Fixed PLL settings, Fixed external ref selection, serialized streamer setup (thread-safety) diff --git a/fpga-src b/fpga-src index b40be5ae5..fc192fbc2 160000 --- a/fpga-src +++ b/fpga-src @@ -1 +1 @@ -Subproject commit b40be5ae504ccf0a5ebb5add0ab777250ca77407 +Subproject commit fc192fbc2037076075f2eee09cc632447252b539 diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 4a6c171f5..3e01cfe6c 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -268,8 +268,8 @@ UHD_INSTALL(FILES #{{{IMG_SECTION # This section is written automatically by /images/create_imgs_package.py # Any manual changes in here will be overwritten. -SET(UHD_IMAGES_MD5SUM "b20992748b90e6bdd228fe693f4d2ba2") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.008.001-release.zip") +SET(UHD_IMAGES_MD5SUM "164e052f2192f3652b03ee5976c9f53b") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.008.002-release.zip") #}}} ######################################################################## diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index bcbf66750..0fb8c0af3 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -28,7 +28,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 008) -SET(UHD_VERSION_PATCH 001) +SET(UHD_VERSION_PATCH 002) SET(UHD_VERSION_DEVEL FALSE) ######################################################################## diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in index 725a655c4..2d578d77e 100644 --- a/host/include/uhd/version.hpp.in +++ b/host/include/uhd/version.hpp.in @@ -27,7 +27,7 @@ * The format is oldest API compatible release - ABI compat number. * The compatibility number allows pre-release ABI to be versioned. */ -#define UHD_VERSION_ABI_STRING "3.8.0-0" +#define UHD_VERSION_ABI_STRING "3.8.2-0" /*! * A macro to check UHD version at compile-time. -- cgit v1.2.3