diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-noaa | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-noaa')
| -rw-r--r-- | gr-noaa/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-noaa/examples/file_rx_hrpt.grc | 8 | ||||
| -rw-r--r-- | gr-noaa/examples/hrpt_decode.grc | 2 | ||||
| -rw-r--r-- | gr-noaa/examples/hrpt_demod.grc | 8 | ||||
| -rw-r--r-- | gr-noaa/examples/usrp_rx_hrpt.grc | 4 | ||||
| -rw-r--r-- | gr-noaa/examples/usrp_rx_hrpt_nogui.grc | 2 | ||||
| -rw-r--r-- | gr-noaa/gnuradio-noaa.pc.in | 2 | ||||
| -rw-r--r-- | gr-noaa/include/noaa/api.h | 2 | ||||
| -rw-r--r-- | gr-noaa/lib/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | gr-noaa/swig/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gr-noaa/swig/noaa_swig.i | 2 |
11 files changed, 24 insertions, 25 deletions
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt index 707f593a55..cb0c576147 100644 --- a/gr-noaa/CMakeLists.txt +++ b/gr-noaa/CMakeLists.txt @@ -28,7 +28,7 @@ include(GrBoost) include(GrComponent) GR_REGISTER_COMPONENT("gr-noaa" ENABLE_GR_NOAA Boost_FOUND - ENABLE_GR_CORE + ENABLE_GNURADIO_RUNTIME ENABLE_GR_BLOCKS ) diff --git a/gr-noaa/examples/file_rx_hrpt.grc b/gr-noaa/examples/file_rx_hrpt.grc index 0b490269b4..3a7caaed71 100644 --- a/gr-noaa/examples/file_rx_hrpt.grc +++ b/gr-noaa/examples/file_rx_hrpt.grc @@ -318,7 +318,7 @@ </param> </block> <block> - <key>gr_file_sink</key> + <key>blocks_file_sink</key> <param> <key>id</key> <value>frame_sink</value> @@ -469,10 +469,10 @@ </param> </block> <block> - <key>gr_file_source</key> + <key>blocks_file_source</key> <param> <key>id</key> - <value>gr_file_source_0</value> + <value>blocks_file_source_0</value> </param> <param> <key>_enabled</key> @@ -883,7 +883,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>gr_file_source_0</source_block_id> + <source_block_id>blocks_file_source_0</source_block_id> <sink_block_id>throttle</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-noaa/examples/hrpt_decode.grc b/gr-noaa/examples/hrpt_decode.grc index 39fe195d15..2fb57746e8 100644 --- a/gr-noaa/examples/hrpt_decode.grc +++ b/gr-noaa/examples/hrpt_decode.grc @@ -323,7 +323,7 @@ </param> </block> <block> - <key>gr_file_source</key> + <key>blocks_file_source</key> <param> <key>id</key> <value>file_source</value> diff --git a/gr-noaa/examples/hrpt_demod.grc b/gr-noaa/examples/hrpt_demod.grc index feb352d9d2..1400f5ed1f 100644 --- a/gr-noaa/examples/hrpt_demod.grc +++ b/gr-noaa/examples/hrpt_demod.grc @@ -196,7 +196,7 @@ </param> </block> <block> - <key>gr_file_source</key> + <key>blocks_file_source</key> <param> <key>id</key> <value>file_source</value> @@ -521,10 +521,10 @@ </param> </block> <block> - <key>gr_file_sink</key> + <key>blocks_file_sink</key> <param> <key>id</key> - <value>gr_file_sink_0</value> + <value>blocks_file_sink_0</value> </param> <param> <key>_enabled</key> @@ -720,7 +720,7 @@ </connection> <connection> <source_block_id>noaa_hrpt_deframer_0</source_block_id> - <sink_block_id>gr_file_sink_0</sink_block_id> + <sink_block_id>blocks_file_sink_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-noaa/examples/usrp_rx_hrpt.grc b/gr-noaa/examples/usrp_rx_hrpt.grc index 2cf2a7fe0c..56d07446bf 100644 --- a/gr-noaa/examples/usrp_rx_hrpt.grc +++ b/gr-noaa/examples/usrp_rx_hrpt.grc @@ -1667,7 +1667,7 @@ </param> <param> <key>trig_mode</key> - <value>gr.gr_TRIG_MODE_AUTO</value> + <value>wxgui.TRIG_MODE_AUTO</value> </param> <param> <key>y_axis_label</key> @@ -1872,7 +1872,7 @@ </param> </block> <block> - <key>gr_file_sink</key> + <key>blocks_file_sink</key> <param> <key>id</key> <value>frame_sink</value> diff --git a/gr-noaa/examples/usrp_rx_hrpt_nogui.grc b/gr-noaa/examples/usrp_rx_hrpt_nogui.grc index cfaa8c6310..3594ca035f 100644 --- a/gr-noaa/examples/usrp_rx_hrpt_nogui.grc +++ b/gr-noaa/examples/usrp_rx_hrpt_nogui.grc @@ -1250,7 +1250,7 @@ </param> </block> <block> - <key>gr_file_sink</key> + <key>blocks_file_sink</key> <param> <key>id</key> <value>frame_sink</value> diff --git a/gr-noaa/gnuradio-noaa.pc.in b/gr-noaa/gnuradio-noaa.pc.in index cacfeeccae..134b31bc5e 100644 --- a/gr-noaa/gnuradio-noaa.pc.in +++ b/gr-noaa/gnuradio-noaa.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gnuradio-noaa Description: GNU Radio blocks implementing a NOAA satellite protocols -Requires: gnuradio-core +Requires: gnuradio-runtime Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-noaa Cflags: -I${includedir} diff --git a/gr-noaa/include/noaa/api.h b/gr-noaa/include/noaa/api.h index d3c3fbf2d0..86bc8eb077 100644 --- a/gr-noaa/include/noaa/api.h +++ b/gr-noaa/include/noaa/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_NOAA_API_H #define INCLUDED_NOAA_API_H -#include <gruel/attributes.h> +#include <attributes.h> #ifdef gnuradio_noaa_EXPORTS # define NOAA_API __GR_ATTR_EXPORT diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt index baa4c732a2..2c69c65675 100644 --- a/gr-noaa/lib/CMakeLists.txt +++ b/gr-noaa/lib/CMakeLists.txt @@ -22,14 +22,13 @@ ######################################################################## include_directories( ${GR_NOAA_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} + ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories(${Boost_LIBRARY_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) +link_directories(${LOG4CPP_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) @@ -60,9 +59,9 @@ if(MSVC) endif(MSVC) list(APPEND noaa_libs - gnuradio-core + gnuradio-runtime ${Boost_LIBRARIES} - ${LOG4CXX_LIBRARIES} + ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-noaa SHARED ${noaa_sources}) diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt index b89b3a7680..829ca4f17d 100644 --- a/gr-noaa/swig/CMakeLists.txt +++ b/gr-noaa/swig/CMakeLists.txt @@ -25,13 +25,13 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_NOAA_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/noaa_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/noaa) +set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-noaa) diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i index 63859103e6..a7d3879369 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -22,7 +22,7 @@ #define NOAA_API -%include "gnuradio.i" +%include "runtime_swig.i" //load generated python docstrings %include "noaa_swig_doc.i" |