Merge branch 'maint'

Conflicts:
	fpga-src

7 files changed, 28 insertions, 10 deletions

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 960e321ff..b48d433f7 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -284,8 +284,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/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..0fb8c0af3 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_PATCH 002)
+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)
diff --git a/host/include/uhd/transport/nirio/status.h b/host/include/uhd/transport/nirio/status.h
index e4117ac73..917e66775 100644
--- a/host/include/uhd/transport/nirio/status.h
+++ b/host/include/uhd/transport/nirio/status.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2013 Ettus Research LLC
+// Copyright 2013-2014 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
@@ -23,6 +23,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
+#include <uhd/config.hpp>
 #include <uhd/exception.hpp>
 
 #define ENABLE_EXTENDED_ERROR_INFO false
@@ -40,9 +41,9 @@ struct nirio_err_info {
     static const size_t NIRIO_ERROR_TABLE_SIZE;
 };
 
-const std::string lookup_err_msg(nirio_status code);
+UHD_API const std::string lookup_err_msg(nirio_status code);
 
-void nirio_status_to_exception(const nirio_status& status, const std::string& message);
+UHD_API void nirio_status_to_exception(const nirio_status& status, const std::string& message);
 }}
 
 #define nirio_status_fatal(status) ((status) < 0)
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.
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 5755a6c4c..321278db5 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -99,6 +99,10 @@ LIBUHD_APPEND_SOURCES(
 # Add DLL resource file to Windows build
 ########################################################################
 IF(MSVC)
+    SET(RC_TRIMMED_VERSION_PATCH TRIMMED_VERSION_PATCH)
+    IF(UHD_VERSION_DEVEL)
+        SET(RC_TRIMMED_VERSION_PATCH "999")
+    ENDIF(UHD_VERSION_DEVEL)
     CONFIGURE_FILE(
         ${CMAKE_CURRENT_SOURCE_DIR}/uhd.rc.in
         ${CMAKE_CURRENT_BINARY_DIR}/uhd.rc
diff --git a/host/lib/uhd.rc.in b/host/lib/uhd.rc.in
index feb006bd3..a0eb27b8c 100644
--- a/host/lib/uhd.rc.in
+++ b/host/lib/uhd.rc.in
@@ -1,8 +1,8 @@
 #include <afxres.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
-  PRODUCTVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
+  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@
   FILEFLAGSMASK 0x3fL
 #ifndef NDEBUG
   FILEFLAGS 0x0L