Merge branch 'master' into next

Conflicts:
	fpga/usrp2/top/u2plus/Makefile.N200

1 files changed, 129 insertions, 15 deletions

diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake
index 2a11d407b..416d89998 100644
--- a/host/Modules/UHDPackage.cmake
+++ b/host/Modules/UHDPackage.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright 2010 Ettus Research LLC
+# Copyright 2010-2011 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,64 @@
 INCLUDE(UHDVersion) #sets version information
 
 ########################################################################
-# Setup CPack
+# Setup additional defines for OS types
+########################################################################
+IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    SET(LINUX TRUE)
+ENDIF()
+
+IF(LINUX AND EXISTS "/etc/debian_version")
+    SET(DEBIAN TRUE)
+ENDIF()
+
+IF(LINUX AND EXISTS "/etc/redhat-release")
+    SET(REDHAT TRUE)
+ENDIF()
+
+########################################################################
+# Setup package file name
+########################################################################
+IF(UHD_RELEASE_MODE)
+
+    #set generator type for recognized systems
+    IF(APPLE)
+        SET(CPACK_GENERATOR PackageMaker)
+    ELSEIF(WIN32)
+        SET(CPACK_GENERATOR NSIS)
+    ELSEIF(DEBIAN)
+        SET(CPACK_GENERATOR DEB)
+    ELSEIF(REDHAT)
+        SET(CPACK_GENERATOR RPM)
+    ELSE()
+        SET(CPACK_GENERATOR TGZ)
+    ENDIF()
+
+    FIND_PROGRAM(LSB_RELEASE_EXECUTABLE lsb_release)
+    IF(LSB_RELEASE_EXECUTABLE)
+
+        #extract system information by executing the commands
+        EXECUTE_PROCESS(
+            COMMAND ${LSB_RELEASE_EXECUTABLE} --short --id
+            OUTPUT_VARIABLE LSB_ID OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        EXECUTE_PROCESS(
+            COMMAND ${LSB_RELEASE_EXECUTABLE} --short --release
+            OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+
+        #set a more sensible package name for this system
+        SET(CPACK_PACKAGE_FILE_NAME "UHD-${UHD_VERSION}-${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}")
+
+    ENDIF(LSB_RELEASE_EXECUTABLE)
+
+    IF(${CPACK_GENERATOR} STREQUAL NSIS)
+        SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
+    ENDIF()
+
+ENDIF(UHD_RELEASE_MODE)
+
+########################################################################
+# Setup CPack General
 ########################################################################
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ettus Research - Universal Hardware Driver")
 SET(CPACK_PACKAGE_VENDOR              "Ettus Research LLC")
@@ -27,18 +84,75 @@ SET(CPACK_PACKAGE_CONTACT             "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_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README)
-SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
-SET(BOOST_MIN_VERSION 1.36) #used in setup for boost
-STRING(REPLACE "," ", " CPACK_DEBIAN_PACKAGE_DEPENDS
-    "libboost-date-time-dev          (>= ${BOOST_MIN_VERSION}),"
-    "libboost-filesystem-dev         (>= ${BOOST_MIN_VERSION}),"
-    "libboost-program-options-dev    (>= ${BOOST_MIN_VERSION}),"
-    "libboost-regex-dev              (>= ${BOOST_MIN_VERSION}),"
-    "libboost-system-dev             (>= ${BOOST_MIN_VERSION}),"
-    "libboost-test-dev               (>= ${BOOST_MIN_VERSION}),"
-    "libboost-thread-dev             (>= ${BOOST_MIN_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)
+
+########################################################################
+# Setup CPack Components
+########################################################################
+SET(CPACK_COMPONENT_LIBRARIES_GROUP      "Development")
+SET(CPACK_COMPONENT_HEADERS_GROUP        "Development")
+SET(CPACK_COMPONENT_UTILITIES_GROUP      "Runtime")
+SET(CPACK_COMPONENT_EXAMPLES_GROUP       "Runtime")
+SET(CPACK_COMPONENT_TESTS_GROUP          "Runtime")
+SET(CPACK_COMPONENT_MANUAL_GROUP         "Documentation")
+SET(CPACK_COMPONENT_DOXYGEN_GROUP        "Documentation")
+SET(CPACK_COMPONENT_README_GROUP         "Documentation")
+
+SET(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME      "Libraries")
+SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME        "C++ Headers")
+SET(CPACK_COMPONENT_UTILITIES_DISPLAY_NAME      "Utilities")
+SET(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME       "Examples")
+SET(CPACK_COMPONENT_TESTS_DISPLAY_NAME          "Unit Tests")
+SET(CPACK_COMPONENT_MANUAL_DISPLAY_NAME         "Manual")
+SET(CPACK_COMPONENT_DOXYGEN_DISPLAY_NAME        "Doxygen")
+SET(CPACK_COMPONENT_README_DISPLAY_NAME         "Readme")
+SET(CPACK_COMPONENT_IMAGES_DISPLAY_NAME         "Images")
+
+SET(CPACK_COMPONENT_LIBRARIES_DESCRIPTION     "Dynamic link library")
+SET(CPACK_COMPONENT_HEADERS_DESCRIPTION       "C++ development headers")
+SET(CPACK_COMPONENT_UTILITIES_DESCRIPTION     "Utility executables and python scripts")
+SET(CPACK_COMPONENT_EXAMPLES_DESCRIPTION      "Example executables")
+SET(CPACK_COMPONENT_TESTS_DESCRIPTION         "Unit test executables")
+SET(CPACK_COMPONENT_MANUAL_DESCRIPTION        "Manual/application notes (rst and html)")
+SET(CPACK_COMPONENT_DOXYGEN_DESCRIPTION       "API documentation (html)")
+SET(CPACK_COMPONENT_README_DESCRIPTION        "Readme files (txt)")
+SET(CPACK_COMPONENT_IMAGES_DESCRIPTION        "FPGA and firmware images")
+
+SET(CPACK_COMPONENT_README_REQUIRED TRUE)
+
+SET(CPACK_COMPONENT_UTILITIES_DEPENDS libraries)
+SET(CPACK_COMPONENT_EXAMPLES_DEPENDS libraries)
+SET(CPACK_COMPONENT_TESTS_DEPENDS libraries)
+
+SET(CPACK_COMPONENTS_ALL libraries headers utilities examples tests manual doxygen readme images)
+
+########################################################################
+# Setup CPack Debian
+########################################################################
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libusb-1.0-0, libboost-dev")
 SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "python, python-tk")
-SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel >= ${BOOST_MIN_VERSION}")
+
+########################################################################
+# Setup CPack RPM
+########################################################################
+SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel, libusb1")
+
+########################################################################
+# Setup CPack NSIS
+########################################################################
+SET(CPACK_NSIS_MODIFY_PATH ON)
+
+SET(HLKM_ENV "\\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"")
+
+SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+    WriteRegStr HKLM ${HLKM_ENV} \\\"UHD_PKG_DATA_PATH\\\" \\\"$INSTDIR\\\\share\\\\uhd\\\"
+")
+
+SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+    DeleteRegValue HKLM ${HLKM_ENV} \\\"UHD_PKG_DATA_PATH\\\"
+")
+
+########################################################################
 INCLUDE(CPack) #include after setting vars