Merge branch 'mac_packaging'

6 files changed, 63 insertions, 45 deletions

diff --git a/host/AUTHORS b/host/AUTHORS.txt
index 512d4752e..44b7516cd 100644
--- a/host/AUTHORS
+++ b/host/AUTHORS.txt
@@ -1,11 +1,13 @@
 Matt Ettus - matt@ettus.com
     USRP1 FPGA code
-    USRP2 FPGA code
+    USRP2/N200 FPGA code
+    USRP-E100 FPGA code
 
 Josh Blum - josh@ettus.com
     driver framework
-    USRP2 firmware
-    USRP2 host code
+    USRP2/N200 firmware
+    USRP2/N200 host code
+    USRP-E100 host code
     Basic/LF host code
     XCVR2450 host code
     RFX Series host code
@@ -13,6 +15,8 @@ Josh Blum - josh@ettus.com
 Jason Abele - jason@ettus.com
     RFX Series host code
     WBX host code
+    DBSRX host code
+    DBSRX2 host code
 
 Eric Blossom - eb@comsec.com
     USRP1 firmware
@@ -28,3 +32,9 @@ Nick Foster - nick@ettus.com
     LIBUSB host code
     USRP1 host code
     TVRX host code
+    USRP-N200 firmware
+    USRP-N200 host code
+
+Philip Balister - philip@opensdr.com
+    USRP-E100 kernel module
+    USRP-E100 utilities
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 4160e8186..8516da401 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -163,9 +163,9 @@ INSTALL(
 # Install Package Docs
 ########################################################################
 INSTALL(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/README
-    ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
-    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.txt
     DESTINATION ${PKG_DOC_DIR}
     COMPONENT libraries
 )
diff --git a/host/LICENSE b/host/LICENSE.txt
index 9aa03b39b..9aa03b39b 100644
--- a/host/LICENSE
+++ b/host/LICENSE.txt
diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake
index 8ca8995cd..65897ceef 100644
--- a/host/Modules/UHDPackage.cmake
+++ b/host/Modules/UHDPackage.cmake
@@ -52,6 +52,13 @@ IF(UHD_PACKAGE_MODE STREQUAL AUTO)
         SET(CPACK_PACKAGE_FILE_NAME "UHD-${UHD_VERSION}-${_os_name}-${_os_version}-${_machine}")
 
     ENDIF(LSB_RELEASE_EXECUTABLE AND UNAME_EXECUTABLE)
+
+    IF(APPLE)
+        SET(CPACK_GENERATOR PackageMaker)
+    ELSEIF(WIN32)
+        SET(CPACK_GENERATOR NSIS)
+    ENDIF()
+
 ENDIF(UHD_PACKAGE_MODE STREQUAL AUTO)
 
 ########################################################################
@@ -63,8 +70,9 @@ 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(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
diff --git a/host/README b/host/README
deleted file mode 100644
index f3dcde53d..000000000
--- a/host/README
+++ /dev/null
@@ -1,37 +0,0 @@
-########################################################################
-# Ettus Research - Universal Hardware Driver
-########################################################################
-The hardware driver for Ettus Research products.
-
-########################################################################
-# Supported USRP Motherboards
-########################################################################
-USRP1
-USRP2
-USRP-N200
-USRP-N210
-USRP-E100
-
-########################################################################
-# Supported USRP Daughterboards
-########################################################################
-Basic RX
-Basic TX
-LF RX
-LF TX
-RFX Series
-XCVR 2450
-WBX Series
-DBSRX
-DBSRX2
-TVRX
-
-########################################################################
-# Documentation
-########################################################################
-Online documentation available at:
-http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki/
-
-The build system can generate the html for the manual and Doxygen.
-Docutils and Doxygen are required to build the html docs.
-See the docs directory for the manual source (reStructuredText).
diff --git a/host/README.txt b/host/README.txt
new file mode 100644
index 000000000..b510493d5
--- /dev/null
+++ b/host/README.txt
@@ -0,0 +1,37 @@
+###############################################
+# Ettus Research - Universal Hardware Driver
+###############################################
+The hardware driver for Ettus Research products.
+
+###############################################
+# Supported USRP Motherboards
+###############################################
+USRP1
+USRP2
+USRP-N200
+USRP-N210
+USRP-E100
+
+###############################################
+# Supported USRP Daughterboards
+###############################################
+Basic RX
+Basic TX
+LF RX
+LF TX
+RFX Series
+XCVR 2450
+WBX Series
+DBSRX
+DBSRX2
+TVRX
+
+###############################################
+# Documentation
+###############################################
+Online documentation available at:
+http://code.ettus.com/redmine/ettus/projects/uhd/wiki
+
+The build system can generate the html for the manual and Doxygen.
+Docutils and Doxygen are required to build the html docs.
+See the docs directory for the manual source (reStructuredText).