[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 10/10: Merge remote-tracking branch 'github
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 10/10: Merge remote-tracking branch 'github/nuke-cpack' into next |
|
Date: |
Wed, 3 Aug 2016 23:35:12 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 675afc063c9ca5ccec3ede43d87aac83c1928182
Merge: e2ede2e c7692c3
Author: Johnathan Corgan <address@hidden>
Date: Wed Aug 3 16:09:50 2016 -0700
Merge remote-tracking branch 'github/nuke-cpack' into next
Conflicts:
gr-vocoder/CMakeLists.txt
CMakeLists.txt | 46 -
cmake/Modules/GrMiscUtils.cmake | 13 +-
cmake/Modules/GrPackage.cmake | 182 ----
cmake/Modules/GrPython.cmake | 4 +-
cmake/Modules/GrSwig.cmake | 5 +-
cmake/Modules/NSIS.InstallOptions.ini.in | 37 -
cmake/Modules/NSIS.template.in | 951 ---------------------
cmake/Packaging/Fedora-15.cmake | 11 -
cmake/Packaging/Fedora-16.cmake | 11 -
cmake/Packaging/Fedora-17.cmake | 11 -
cmake/Packaging/Fedora-18.cmake | 11 -
cmake/Packaging/Ubuntu-10.04.cmake | 11 -
cmake/Packaging/Ubuntu-10.10.cmake | 11 -
cmake/Packaging/Ubuntu-11.04.cmake | 12 -
cmake/Packaging/Ubuntu-11.10.cmake | 11 -
cmake/Packaging/Ubuntu-12.04.cmake | 11 -
cmake/Packaging/Ubuntu-12.10.cmake | 11 -
cmake/Packaging/Ubuntu-13.04.cmake | 13 -
cmake/Packaging/Ubuntu-15.10.cmake | 13 -
cmake/Packaging/post_install.in | 4 -
cmake/Packaging/post_uninstall.in | 3 -
cmake/Packaging/postinst.in | 6 -
cmake/Packaging/postrm.in | 5 -
cmake/Packaging/pre_install.in | 1 -
cmake/Packaging/pre_uninstall.in | 3 -
cmake/Packaging/preinst.in | 5 -
cmake/Packaging/prerm.in | 5 -
docs/CMakeLists.txt | 17 -
docs/doxygen/CMakeLists.txt | 2 +-
docs/exploring-gnuradio/CMakeLists.txt | 1 -
gnuradio-runtime/CMakeLists.txt | 36 -
gnuradio-runtime/apps/CMakeLists.txt | 1 -
gnuradio-runtime/examples/mp-sched/CMakeLists.txt | 2 -
gnuradio-runtime/examples/network/CMakeLists.txt | 2 -
.../examples/volk_benchmark/CMakeLists.txt | 2 -
gnuradio-runtime/include/gnuradio/CMakeLists.txt | 2 -
.../include/gnuradio/messages/CMakeLists.txt | 1 -
.../include/gnuradio/thread/CMakeLists.txt | 1 -
gnuradio-runtime/include/pmt/CMakeLists.txt | 2 +-
gnuradio-runtime/lib/CMakeLists.txt | 4 +-
gnuradio-runtime/lib/controlport/CMakeLists.txt | 1 -
gnuradio-runtime/lib/pmt/CMakeLists.txt | 5 +-
gnuradio-runtime/python/gnuradio/CMakeLists.txt | 1 -
.../python/gnuradio/ctrlport/CMakeLists.txt | 5 -
gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt | 1 -
.../python/gnuradio/gru/CMakeLists.txt | 1 -
gnuradio-runtime/python/pmt/CMakeLists.txt | 1 -
gnuradio-runtime/swig/CMakeLists.txt | 3 -
gr-analog/CMakeLists.txt | 35 -
gr-analog/examples/CMakeLists.txt | 2 -
gr-analog/examples/tags/CMakeLists.txt | 1 -
gr-analog/grc/CMakeLists.txt | 3 +-
gr-analog/include/gnuradio/analog/CMakeLists.txt | 1 -
gr-analog/lib/CMakeLists.txt | 4 +-
gr-analog/python/analog/CMakeLists.txt | 1 -
gr-analog/swig/CMakeLists.txt | 2 -
gr-audio/CMakeLists.txt | 42 -
gr-audio/examples/c++/CMakeLists.txt | 1 -
gr-audio/examples/grc/CMakeLists.txt | 1 -
gr-audio/examples/python/CMakeLists.txt | 1 -
gr-audio/grc/CMakeLists.txt | 2 +-
gr-audio/include/gnuradio/audio/CMakeLists.txt | 1 -
gr-audio/lib/CMakeLists.txt | 6 +-
gr-audio/python/audio/CMakeLists.txt | 1 -
gr-audio/swig/CMakeLists.txt | 2 -
gr-blocks/CMakeLists.txt | 35 -
gr-blocks/examples/CMakeLists.txt | 3 +-
gr-blocks/examples/ctrlport/CMakeLists.txt | 2 -
gr-blocks/examples/metadata/CMakeLists.txt | 1 -
gr-blocks/examples/msg_passing/CMakeLists.txt | 1 -
gr-blocks/examples/tags/CMakeLists.txt | 2 -
gr-blocks/grc/CMakeLists.txt | 2 +-
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 2 -
gr-blocks/lib/CMakeLists.txt | 4 +-
gr-blocks/python/blocks/CMakeLists.txt | 1 -
gr-blocks/python/grc_gnuradio/CMakeLists.txt | 2 -
gr-blocks/swig/CMakeLists.txt | 5 +-
gr-channels/CMakeLists.txt | 35 -
gr-channels/examples/CMakeLists.txt | 1 -
gr-channels/grc/CMakeLists.txt | 2 +-
.../include/gnuradio/channels/CMakeLists.txt | 1 -
gr-channels/lib/CMakeLists.txt | 4 +-
gr-channels/python/channels/CMakeLists.txt | 1 -
gr-channels/swig/CMakeLists.txt | 2 -
gr-comedi/CMakeLists.txt | 35 -
gr-comedi/include/gnuradio/comedi/CMakeLists.txt | 1 -
gr-comedi/lib/CMakeLists.txt | 4 +-
gr-comedi/python/comedi/CMakeLists.txt | 1 -
gr-comedi/swig/CMakeLists.txt | 2 -
gr-digital/CMakeLists.txt | 35 -
gr-digital/examples/CMakeLists.txt | 7 -
gr-digital/grc/CMakeLists.txt | 2 +-
gr-digital/include/gnuradio/digital/CMakeLists.txt | 1 -
gr-digital/lib/CMakeLists.txt | 4 +-
gr-digital/python/digital/CMakeLists.txt | 2 -
gr-digital/python/grc_gnuradio/CMakeLists.txt | 1 -
gr-digital/swig/CMakeLists.txt | 2 -
gr-dtv/CMakeLists.txt | 35 -
gr-dtv/apps/CMakeLists.txt | 1 -
gr-dtv/examples/CMakeLists.txt | 2 -
gr-dtv/grc/CMakeLists.txt | 1 -
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 1 -
gr-dtv/lib/CMakeLists.txt | 4 +-
gr-dtv/python/dtv/CMakeLists.txt | 1 -
gr-dtv/swig/CMakeLists.txt | 2 -
gr-fec/CMakeLists.txt | 35 -
gr-fec/apps/CMakeLists.txt | 2 -
gr-fec/examples/CMakeLists.txt | 1 -
gr-fec/grc/CMakeLists.txt | 6 +-
gr-fec/include/gnuradio/fec/CMakeLists.txt | 5 +-
gr-fec/lib/CMakeLists.txt | 4 +-
gr-fec/lib/reed-solomon/CMakeLists.txt | 1 -
gr-fec/lib/viterbi/CMakeLists.txt | 1 -
gr-fec/python/fec/CMakeLists.txt | 1 -
gr-fec/python/fec/LDPC/CMakeLists.txt | 3 +-
gr-fec/python/fec/polar/CMakeLists.txt | 4 -
gr-fec/swig/CMakeLists.txt | 2 -
gr-fft/CMakeLists.txt | 35 -
gr-fft/grc/CMakeLists.txt | 1 -
gr-fft/include/gnuradio/fft/CMakeLists.txt | 3 -
gr-fft/lib/CMakeLists.txt | 4 +-
gr-fft/python/fft/CMakeLists.txt | 1 -
gr-fft/swig/CMakeLists.txt | 2 -
gr-filter/CMakeLists.txt | 35 -
gr-filter/apps/CMakeLists.txt | 1 -
gr-filter/examples/CMakeLists.txt | 2 -
gr-filter/grc/CMakeLists.txt | 1 -
gr-filter/include/gnuradio/filter/CMakeLists.txt | 1 -
gr-filter/lib/CMakeLists.txt | 4 +-
gr-filter/python/filter/CMakeLists.txt | 1 -
gr-filter/python/filter/design/CMakeLists.txt | 1 -
gr-filter/python/filter/gui/CMakeLists.txt | 1 -
gr-filter/swig/CMakeLists.txt | 2 -
gr-qtgui/CMakeLists.txt | 37 -
gr-qtgui/apps/CMakeLists.txt | 2 -
gr-qtgui/examples/CMakeLists.txt | 2 -
gr-qtgui/examples/c++/CMakeLists.txt | 1 -
gr-qtgui/grc/CMakeLists.txt | 2 +-
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 1 -
gr-qtgui/lib/CMakeLists.txt | 4 +-
gr-qtgui/python/qtgui/CMakeLists.txt | 1 -
gr-qtgui/swig/CMakeLists.txt | 2 -
gr-trellis/CMakeLists.txt | 48 --
gr-trellis/doc/CMakeLists.txt | 2 -
gr-trellis/examples/grc/CMakeLists.txt | 1 -
gr-trellis/examples/python/CMakeLists.txt | 3 -
gr-trellis/grc/CMakeLists.txt | 1 -
gr-trellis/include/gnuradio/trellis/CMakeLists.txt | 1 -
gr-trellis/lib/CMakeLists.txt | 4 +-
gr-trellis/python/trellis/CMakeLists.txt | 1 -
gr-trellis/swig/CMakeLists.txt | 2 -
gr-uhd/CMakeLists.txt | 42 -
gr-uhd/apps/CMakeLists.txt | 7 -
gr-uhd/examples/c++/CMakeLists.txt | 1 -
gr-uhd/examples/grc/CMakeLists.txt | 1 -
gr-uhd/examples/python/CMakeLists.txt | 1 -
gr-uhd/grc/CMakeLists.txt | 1 -
gr-uhd/include/gnuradio/uhd/CMakeLists.txt | 1 -
gr-uhd/lib/CMakeLists.txt | 4 +-
gr-uhd/python/uhd/CMakeLists.txt | 1 -
gr-uhd/swig/CMakeLists.txt | 2 -
gr-utils/CMakeLists.txt | 10 -
gr-utils/python/modtool/CMakeLists.txt | 3 -
.../gr-newmod/cmake/Modules/GrMiscUtils.cmake | 12 +-
.../modtool/gr-newmod/cmake/Modules/GrPython.cmake | 4 +-
.../modtool/gr-newmod/cmake/Modules/GrSwig.cmake | 5 +-
.../python/modtool/gr-newmod/lib/CMakeLists.txt | 3 +-
gr-utils/python/utils/CMakeLists.txt | 2 -
gr-video-sdl/CMakeLists.txt | 35 -
gr-video-sdl/grc/CMakeLists.txt | 2 -
.../include/gnuradio/video_sdl/CMakeLists.txt | 1 -
gr-video-sdl/lib/CMakeLists.txt | 4 +-
gr-video-sdl/python/video_sdl/CMakeLists.txt | 1 -
gr-video-sdl/swig/CMakeLists.txt | 2 -
gr-vocoder/CMakeLists.txt | 42 -
gr-vocoder/examples/CMakeLists.txt | 3 -
gr-vocoder/grc/CMakeLists.txt | 3 -
gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt | 3 -
gr-vocoder/lib/CMakeLists.txt | 4 +-
gr-vocoder/python/vocoder/CMakeLists.txt | 1 -
gr-vocoder/swig/CMakeLists.txt | 2 -
gr-wavelet/CMakeLists.txt | 35 -
gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt | 1 -
gr-wavelet/lib/CMakeLists.txt | 4 +-
gr-wavelet/python/wavelet/CMakeLists.txt | 1 -
gr-wavelet/swig/CMakeLists.txt | 2 -
gr-wxgui/CMakeLists.txt | 33 -
gr-wxgui/grc/CMakeLists.txt | 3 +-
gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt | 1 -
gr-wxgui/lib/CMakeLists.txt | 6 +-
gr-wxgui/python/wxgui/CMakeLists.txt | 3 -
gr-wxgui/swig/CMakeLists.txt | 2 -
gr-zeromq/CMakeLists.txt | 36 -
gr-zeromq/examples/CMakeLists.txt | 1 -
gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt | 1 -
gr-zeromq/lib/CMakeLists.txt | 4 +-
gr-zeromq/swig/CMakeLists.txt | 2 -
grc/CMakeLists.txt | 24 -
grc/blocks/CMakeLists.txt | 1 -
grc/core/CMakeLists.txt | 2 -
grc/core/generator/CMakeLists.txt | 2 -
grc/core/utils/CMakeLists.txt | 1 -
grc/gui/CMakeLists.txt | 1 -
grc/scripts/CMakeLists.txt | 1 -
grc/scripts/freedesktop/CMakeLists.txt | 3 +-
205 files changed, 74 insertions(+), 2428 deletions(-)
diff --cc gnuradio-runtime/CMakeLists.txt
index bb401a4,67efafe..d24c17a
--- a/gnuradio-runtime/CMakeLists.txt
+++ b/gnuradio-runtime/CMakeLists.txt
@@@ -131,14 -97,14 +98,12 @@@ configure_file
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
DESTINATION ${GR_PREFSDIR}
- COMPONENT "runtime_runtime"
)
-if(ENABLE_GR_LOG AND HAVE_LOG4CPP)
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.conf
DESTINATION ${GR_PREFSDIR}
- COMPONENT "runtime_runtime"
)
-endif(ENABLE_GR_LOG AND HAVE_LOG4CPP)
########################################################################
# Add subdirectories
diff --cc gnuradio-runtime/include/gnuradio/CMakeLists.txt
index 7f7e9f4,ac2e59b..230f8d6
--- a/gnuradio-runtime/include/gnuradio/CMakeLists.txt
+++ b/gnuradio-runtime/include/gnuradio/CMakeLists.txt
@@@ -82,8 -81,8 +82,7 @@@ install(FILE
rpcserver_booter_aggregator.h
rpcserver_booter_base.h
rpcserver_selector.h
- ${CMAKE_CURRENT_BINARY_DIR}/logger.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio
- COMPONENT "runtime_devel"
)
if(THRIFT_FOUND)
@@@ -92,6 -91,13 +91,5 @@@ install(FILE
thrift_application_base.h
thrift_server_template.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio
- COMPONENT "runtime_devel"
)
endif(THRIFT_FOUND)
-
-##########################################################################
-# Configure logger
-##########################################################################
-CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/logger.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/logger.h
-)
diff --cc gr-vocoder/CMakeLists.txt
index 56ba2a9,2fb9986..686378f
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@@ -48,70 -48,6 +48,29 @@@ SET(GR_PKG_VOCODER_EXAMPLES_DIR ${GR_PK
if(ENABLE_GR_VOCODER)
########################################################################
- # Setup CPack components
- ########################################################################
- include(GrPackage)
- CPACK_SET(CPACK_COMPONENT_GROUP_VOCODER_DESCRIPTION "GNU Radio Vocoder
Blocks")
-
- CPACK_COMPONENT("vocoder_runtime"
- GROUP "Vocoder"
- DISPLAY_NAME "Runtime"
- DESCRIPTION "Dynamic link libraries"
- DEPENDS "runtime_runtime"
- )
-
- CPACK_COMPONENT("vocoder_devel"
- GROUP "Vocoder"
- DISPLAY_NAME "Development"
- DESCRIPTION "C++ headers, package config, import libraries"
- DEPENDS "runtime_devel"
- )
-
- CPACK_COMPONENT("vocoder_python"
- GROUP "Vocoder"
- DISPLAY_NAME "Python"
- DESCRIPTION "Python modules for runtime"
- DEPENDS "runtime_python;vocoder_runtime"
- )
-
- CPACK_COMPONENT("vocoder_examples"
- GROUP "Vocoder"
- DISPLAY_NAME "Examples"
- DESCRIPTION "Python examples for vocoder"
- DEPENDS "vocoder_python"
- )
-
- CPACK_COMPONENT("vocoder_swig"
- GROUP "Vocoder"
- DISPLAY_NAME "SWIG"
- DESCRIPTION "SWIG development .i files"
- DEPENDS "runtime_swig;vocoder_python;vocoder_devel"
- )
-
- ########################################################################
+## CODEC2 Support
+########################################################################
+find_package(Codec2)
+if(LIBCODEC2_FOUND)
+ GR_APPEND_SUBCOMPONENT("codec2")
+ #message(STATUS "libcodec2 modes: ${CODEC2_MODES}")
+ if(LIBCODEC2_HAS_CODEC2_MODE_700)
+ #message(STATUS "libcodec2 has 700bps mode")
+ endif()
+ if (LIBCODEC2_HAS_FREEDV_API)
+ #message(STATUS "libcodec2 had FreeDV api modes: ${FREEDV_MODES}")
+ endif()
+endif(LIBCODEC2_FOUND)
+
+########################################################################
+## GSM Support
+########################################################################
+find_package(GSM)
+if(LIBGSM_FOUND)
+ GR_APPEND_SUBCOMPONENT("gsm")
+endif(LIBGSM_FOUND)
+
+########################################################################
# Add subdirectories
########################################################################
add_subdirectory(include/gnuradio/vocoder)
diff --cc gr-vocoder/examples/CMakeLists.txt
index 0957d81,fc92ecd..e5895c8
--- a/gr-vocoder/examples/CMakeLists.txt
+++ b/gr-vocoder/examples/CMakeLists.txt
@@@ -29,23 -30,7 +29,20 @@@ GR_PYTHON_INSTALL
g721_audio_loopback.py
g723_24_audio_loopback.py
g723_40_audio_loopback.py
- gsm_audio_loopback.py
ulaw_audio_loopback.py
DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR}
- COMPONENT "vocoder_examples"
)
+if(LIBCODEC2_FOUND)
+ GR_PYTHON_INSTALL(
+ PROGRAMS
+ codec2_audio_loopback.py
+ DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR}
- COMPONENT "vocoder_examples"
+ )
+endif(LIBCODEC2_FOUND)
+if(LIBGSM_FOUND)
+ GR_PYTHON_INSTALL(
+ PROGRAMS
+ gsm_audio_loopback.py
+ DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR}
- COMPONENT "vocoder_examples"
+ )
+endif(LIBGSM_FOUND)
diff --cc gr-vocoder/grc/CMakeLists.txt
index e6c8115,0f8bbb0..fd32054
--- a/gr-vocoder/grc/CMakeLists.txt
+++ b/gr-vocoder/grc/CMakeLists.txt
@@@ -34,23 -36,6 +34,20 @@@ install(FILE
vocoder_ulaw_decode_bs.xml
vocoder_ulaw_encode_sb.xml
DESTINATION ${GRC_BLOCKS_DIR}
- COMPONENT "vocoder_python"
)
+
+if(LIBCODEC2_FOUND)
+ install(FILES
+ vocoder_codec2_decode_ps.xml
+ vocoder_codec2_encode_sp.xml
+ DESTINATION ${GRC_BLOCKS_DIR}
- COMPONENT "vocoder_python"
+ )
+endif(LIBCODEC2_FOUND)
+
+if(LIBGSM_FOUND)
+ install(FILES
+ vocoder_gsm_fr_decode_ps.xml
+ vocoder_gsm_fr_encode_sp.xml
+ DESTINATION ${GRC_BLOCKS_DIR}
- COMPONENT "vocoder_python"
+ )
+endif(LIBGSM_FOUND)
diff --cc gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
index 13efea7,ed0990d..172f18a
--- a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
+++ b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
@@@ -35,22 -35,6 +35,19 @@@ install(FILE
ulaw_decode_bs.h
ulaw_encode_sb.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder
- COMPONENT "vocoder_devel"
)
+if(LIBCODEC2_FOUND)
+install(FILES
+ codec2.h
+ codec2_decode_ps.h
+ codec2_encode_sp.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder
- COMPONENT "vocoder_devel"
+)
+endif(LIBCODEC2_FOUND)
+if(LIBGSM_FOUND)
+install(FILES
+ gsm_fr_decode_ps.h
+ gsm_fr_encode_sp.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder
- COMPONENT "vocoder_devel"
+)
+endif(LIBGSM_FOUND)
- [Commit-gnuradio] [gnuradio] branch next updated (77f902e -> 675afc0), git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 09/10: Merge remote-tracking branch 'github/require-logging' into next, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 07/10: vocoder: fix python QA after unembed, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 08/10: Merge remote-tracking branch 'github/vocoder-unembed' into next, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 03/10: gr-vocoder: gsm subcomponent using external gsm library, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 01/10: gr-vocoder: codec2 subcomponent using external codec2 library, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 05/10: cmake: remove ENABLE_GR_LOG and require log4cpp, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 10/10: Merge remote-tracking branch 'github/nuke-cpack' into next,
git <=
- [Commit-gnuradio] [gnuradio] 04/10: gr-vocoder: remove embedded gsm, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 06/10: cmake: nuke cpack from existence, git, 2016/08/03
- [Commit-gnuradio] [gnuradio] 02/10: gr-vocoder: remove embedded codec2, git, 2016/08/03