Changing UHD's versioning system

* Version numbers now Major.API.ABI.Patch

5 files changed, 22 insertions, 17 deletions

diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake
index 58c0b1287..48d0c34cf 100644
--- a/host/cmake/Modules/UHDGlobalDefs.cmake
+++ b/host/cmake/Modules/UHDGlobalDefs.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright 2015 Ettus Research LLC
+# Copyright 2015,2016 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
@@ -24,9 +24,9 @@ CHECK_CXX_SYMBOL_EXISTS(log2 cmath HAVE_LOG2)
 
 ## Macros for the version number
 IF(UHD_VERSION_DEVEL)
-    MATH(EXPR UHD_VERSION_ADDED "10000 * ${TRIMMED_VERSION_MAJOR} + 100 * ${TRIMMED_VERSION_MINOR} + 99")
+    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + 99")
 ELSE()
-    MATH(EXPR UHD_VERSION_ADDED "10000 * ${TRIMMED_VERSION_MAJOR} + 100 * ${TRIMMED_VERSION_MINOR} + ${TRIMMED_VERSION_PATCH}")
+    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + ${TRIMMED_VERSION_PATCH}")
 ENDIF(UHD_VERSION_DEVEL)
 ADD_DEFINITIONS(-DUHD_VERSION=${UHD_VERSION_ADDED})
 
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 2b105585b..bb1eed132 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2014 Ettus Research LLC
+# Copyright 2010-2014,2016 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
@@ -21,13 +21,15 @@ FIND_PACKAGE(Git QUIET)
 
 ########################################################################
 # Setup Version Numbers
-#  - increment major on api compatibility changes
-#  - increment minor on feature-level changes
-#  - increment patch on for bug fixes and docs
+#  - Increment major on large-scale library changes
+#  - Increment API on API changes
+#  - Increment ABI on ABI changes
+#  - Increment patch for bugfixes and docs
 #  - set UHD_VERSION_DEVEL to true for master and development branches
 ########################################################################
 SET(UHD_VERSION_MAJOR 003)
-SET(UHD_VERSION_MINOR 010)
+SET(UHD_VERSION_API   010)
+SET(UHD_VERSION_ABI   000)
 SET(UHD_VERSION_PATCH git)
 SET(UHD_VERSION_DEVEL TRUE)
 
@@ -83,13 +85,14 @@ FUNCTION(DEPAD_NUM input_num output_num)
 ENDFUNCTION(DEPAD_NUM)
 
 DEPAD_NUM(${UHD_VERSION_MAJOR} TRIMMED_VERSION_MAJOR)
-DEPAD_NUM(${UHD_VERSION_MINOR} TRIMMED_VERSION_MINOR)
+DEPAD_NUM(${UHD_VERSION_API}   TRIMMED_VERSION_API)
+DEPAD_NUM(${UHD_VERSION_ABI}   TRIMMED_VERSION_ABI)
 IF(UHD_VERSION_DEVEL)
     SET(TRIMMED_VERSION_PATCH ${UHD_VERSION_PATCH})
 ELSE(UHD_VERSION_DEVEL)
     DEPAD_NUM(${UHD_VERSION_PATCH} TRIMMED_VERSION_PATCH)
 ENDIF(UHD_VERSION_DEVEL)
-SET(TRIMMED_UHD_VERSION "${TRIMMED_VERSION_MAJOR}.${TRIMMED_VERSION_MINOR}.${TRIMMED_VERSION_PATCH}")
+SET(TRIMMED_UHD_VERSION "${TRIMMED_VERSION_MAJOR}.${TRIMMED_VERSION_API}.${TRIMMED_VERSION_ABI}.${TRIMMED_VERSION_PATCH}")
 
 ########################################################################
 # Version information discovery through git log
@@ -150,7 +153,7 @@ ENDIF()
 
 ########################################################################
 IF(TRIM_UHD_VERSION STREQUAL "True")
-    SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_HASH}")
+    SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}.${UHD_VERSION_PATCH}-${UHD_GIT_HASH}")
 ELSE()
-    SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}")
+    SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}")
 ENDIF()
diff --git a/host/include/config.h.in b/host/include/config.h.in
index 83370f06f..8931d6580 100644
--- a/host/include/config.h.in
+++ b/host/include/config.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Ettus Research LLC
+ * Copyright 2015,2016 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
@@ -19,7 +19,8 @@
 
 /* Version macros */
 #cmakedefine UHD_VERSION_MAJOR ${TRIMMED_VERSION_MAJOR}
-#cmakedefine UHD_VERSION_MINOR ${TRIMMED_VERSION_MINOR}
+#cmakedefine UHD_VERSION_API   ${TRIMMED_VERSION_API}
+#cmakedefine UHD_VERSION_ABI   ${TRIMMED_VERSION_ABI}
 #cmakedefine UHD_VERSION_PATCH ${TRIMMED_VERSION_PATCH}
 #cmakedefine ENABLE_USB
 #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index a7a1cea3b..d6e2ec2cd 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -138,6 +138,7 @@ ENDIF(ENABLE_C_API)
 # Add DLL resource file to Windows build
 ########################################################################
 IF(MSVC)
+    MATH(EXPR TRIMMED_VERSION_MAJOR_API "${TRIMMED_VERSION_MAJOR} * 1000 + ${TRIMMED_VERSION_API}")
     SET(RC_TRIMMED_VERSION_PATCH ${TRIMMED_VERSION_PATCH})
     IF(UHD_VERSION_DEVEL)
         SET(RC_TRIMMED_VERSION_PATCH "999")
@@ -174,7 +175,7 @@ TARGET_LINK_LIBRARIES(uhd ${Boost_LIBRARIES} ${libuhd_libs})
 SET_TARGET_PROPERTIES(uhd PROPERTIES DEFINE_SYMBOL "UHD_DLL_EXPORTS")
 IF(NOT LIBUHDDEV_PKG)
     SET_TARGET_PROPERTIES(uhd PROPERTIES SOVERSION "${UHD_VERSION_MAJOR}")
-    SET_TARGET_PROPERTIES(uhd PROPERTIES VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}")
+    SET_TARGET_PROPERTIES(uhd PROPERTIES VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}")
 ENDIF(NOT LIBUHDDEV_PKG)
 IF(DEFINED LIBUHD_OUTPUT_NAME)
     SET_TARGET_PROPERTIES(uhd PROPERTIES OUTPUT_NAME ${LIBUHD_OUTPUT_NAME})
diff --git a/host/lib/uhd.rc.in b/host/lib/uhd.rc.in
index 051511327..24177a00a 100644
--- a/host/lib/uhd.rc.in
+++ b/host/lib/uhd.rc.in
@@ -1,8 +1,8 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
-  PRODUCTVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
+  FILEVERSION @TRIMMED_VERSION_MAJOR_API@,@TRIMMED_VERSION_ABI@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
+  PRODUCTVERSION @TRIMMED_VERSION_MAJOR_API@,@TRIMMED_VERSION_ABI@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
   FILEFLAGSMASK 0x3fL
 #ifndef NDEBUG
   FILEFLAGS 0x0L