From 2249acd9f97e969f619fa87cb206fc9392b9b5fe Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 25 Mar 2011 15:04:23 -0700 Subject: uhd: work on mac osx packaging Renamed README type files to have .txt extension (needed for CPACK_RESOURCE_FILE_*). Tweaks to the cpack setup on CPACK_RESOURCE_FILE_* and handling for when UHD_PACKAGE_MODE==AUTO. As of this commit, the mac packages do not contain the .dylib files (do not know why yet). --- host/AUTHORS | 30 ------------------------------ host/AUTHORS.txt | 40 ++++++++++++++++++++++++++++++++++++++++ host/CMakeLists.txt | 6 +++--- host/LICENSE | 12 ------------ host/LICENSE.txt | 12 ++++++++++++ host/Modules/UHDPackage.cmake | 12 ++++++++++-- host/README | 37 ------------------------------------- host/README.txt | 37 +++++++++++++++++++++++++++++++++++++ 8 files changed, 102 insertions(+), 84 deletions(-) delete mode 100644 host/AUTHORS create mode 100644 host/AUTHORS.txt delete mode 100644 host/LICENSE create mode 100644 host/LICENSE.txt delete mode 100644 host/README create mode 100644 host/README.txt diff --git a/host/AUTHORS b/host/AUTHORS deleted file mode 100644 index 512d4752e..000000000 --- a/host/AUTHORS +++ /dev/null @@ -1,30 +0,0 @@ -Matt Ettus - matt@ettus.com - USRP1 FPGA code - USRP2 FPGA code - -Josh Blum - josh@ettus.com - driver framework - USRP2 firmware - USRP2 host code - Basic/LF host code - XCVR2450 host code - RFX Series host code - -Jason Abele - jason@ettus.com - RFX Series host code - WBX host code - -Eric Blossom - eb@comsec.com - USRP1 firmware - USRP2 firmware - -Tom Tsou - ttsou@vt.edu - UHD-USB framework - LIBUSB host code - USRP1 host code - USRP1 firmware - -Nick Foster - nick@ettus.com - LIBUSB host code - USRP1 host code - TVRX host code diff --git a/host/AUTHORS.txt b/host/AUTHORS.txt new file mode 100644 index 000000000..44b7516cd --- /dev/null +++ b/host/AUTHORS.txt @@ -0,0 +1,40 @@ +Matt Ettus - matt@ettus.com + USRP1 FPGA code + USRP2/N200 FPGA code + USRP-E100 FPGA code + +Josh Blum - josh@ettus.com + driver framework + USRP2/N200 firmware + USRP2/N200 host code + USRP-E100 host code + Basic/LF host code + XCVR2450 host code + RFX Series host code + +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 + USRP2 firmware + +Tom Tsou - ttsou@vt.edu + UHD-USB framework + LIBUSB host code + USRP1 host code + USRP1 firmware + +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 deleted file mode 100644 index 9aa03b39b..000000000 --- a/host/LICENSE +++ /dev/null @@ -1,12 +0,0 @@ -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 -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . diff --git a/host/LICENSE.txt b/host/LICENSE.txt new file mode 100644 index 000000000..9aa03b39b --- /dev/null +++ b/host/LICENSE.txt @@ -0,0 +1,12 @@ +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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . 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). -- cgit v1.2.3