summaryrefslogtreecommitdiff
path: root/gr-zeromq
diff options
context:
space:
mode:
Diffstat (limited to 'gr-zeromq')
-rw-r--r--gr-zeromq/CMakeLists.txt36
-rw-r--r--gr-zeromq/examples/CMakeLists.txt1
-rwxr-xr-xgr-zeromq/examples/python/client.py20
-rwxr-xr-xgr-zeromq/examples/python/gui.py22
-rwxr-xr-xgr-zeromq/examples/python/server.py18
-rw-r--r--gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt1
-rw-r--r--gr-zeromq/lib/CMakeLists.txt4
-rw-r--r--gr-zeromq/swig/CMakeLists.txt2
8 files changed, 32 insertions, 72 deletions
diff --git a/gr-zeromq/CMakeLists.txt b/gr-zeromq/CMakeLists.txt
index ffb9a0fc67..1ebd0ff4f5 100644
--- a/gr-zeromq/CMakeLists.txt
+++ b/gr-zeromq/CMakeLists.txt
@@ -47,41 +47,6 @@ SET(GR_PKG_ZEROMQ_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/zeromq)
########################################################################
if(ENABLE_GR_ZEROMQ)
-
-########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_ZEROMQ_DESCRIPTION "GNU Radio ZeromMQ Interface Blocks")
-
-CPACK_COMPONENT("zeromq_runtime"
- GROUP "ZeroMQ Blocks"
- DISPLAY_NAME "Runtime"
- DESCRIPTION "Runtime"
- DEPENDS "runtime_runtime"
-)
-
-CPACK_COMPONENT("zeromq_devel"
- GROUP "ZeroMQ Blocks"
- DISPLAY_NAME "Development"
- DESCRIPTION "C++ headers, package config, import libraries"
- DEPENDS "runtime_devel"
-)
-
-CPACK_COMPONENT("zeromq_python"
- GROUP "ZeroMQ Blocks"
- DISPLAY_NAME "Python"
- DESCRIPTION "Python modules for runtime; GRC xml files"
- DEPENDS "runtime_python;zeromq_runtime"
-)
-
-CPACK_COMPONENT("zeromq_swig"
- GROUP "ZeroMQ Blocks"
- DISPLAY_NAME "SWIG"
- DESCRIPTION "SWIG development .i files"
- DEPENDS "runtime_swig;zeromq_python;zeromq_devel"
-)
-
########################################################################
# Add subdirectories
########################################################################
@@ -105,7 +70,6 @@ configure_file(
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-zeromq.pc
DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
- COMPONENT "zeromq_devel"
)
endif(ENABLE_GR_ZEROMQ)
diff --git a/gr-zeromq/examples/CMakeLists.txt b/gr-zeromq/examples/CMakeLists.txt
index ce673cf1f5..dd31185d99 100644
--- a/gr-zeromq/examples/CMakeLists.txt
+++ b/gr-zeromq/examples/CMakeLists.txt
@@ -27,5 +27,4 @@ INSTALL(FILES
zmq_msg.grc
zmq_stream.grc
DESTINATION ${GR_PKG_ZEROMQ_EXAMPLES_DIR}
- COMPONENT "zeromq_python"
)
diff --git a/gr-zeromq/examples/python/client.py b/gr-zeromq/examples/python/client.py
index a63a77aa0d..ca7ad1830a 100755
--- a/gr-zeromq/examples/python/client.py
+++ b/gr-zeromq/examples/python/client.py
@@ -28,8 +28,8 @@ from gnuradio import gr
from gnuradio import blocks
from gnuradio import analog
from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from gnuradio.eng_arg import eng_float, intx
+from argparse import ArgumentParser
import numpy
import sys
from threading import Thread
@@ -81,13 +81,13 @@ class top_block(gr.top_block):
###############################################################################
# Options Parser
###############################################################################
-def parse_options():
- """ Options parser. """
- parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
- parser.add_option("-s", "--servername", type="string", default="localhost",
+def parse_args():
+ """Argument parser."""
+ parser = ArgumentParser()
+ parser.add_argument("-s", "--servername", default="localhost",
help="Server hostname")
- (options, args) = parser.parse_args()
- return options
+ args = parser.parse_args()
+ return args
###############################################################################
# Waiter Thread
@@ -102,8 +102,8 @@ class waiter(Thread):
# Main
###############################################################################
if __name__ == "__main__":
- options = parse_options()
- tb = top_block(options)
+ args = parse_args()
+ tb = top_block(args)
try:
# keep the program running when flowgraph is stopped
while True:
diff --git a/gr-zeromq/examples/python/gui.py b/gr-zeromq/examples/python/gui.py
index ffdfdc2a75..c932549408 100755
--- a/gr-zeromq/examples/python/gui.py
+++ b/gr-zeromq/examples/python/gui.py
@@ -22,8 +22,8 @@
###############################################################################
# Imports
###############################################################################
-from optparse import OptionParser
-from gnuradio.eng_option import eng_option
+from argparse import ArgumentParser
+from gnuradio.eng_arg import eng_float, intx
import gui
import sys
import os
@@ -141,24 +141,24 @@ class gui(QtGui.QMainWindow):
###############################################################################
# Options Parser
###############################################################################
-def parse_options():
- """ Options parser. """
- parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
- parser.add_option("-s", "--servername", type="string", default="localhost",
+def parse_args():
+ """Options parser."""
+ parser = ArgumentParser()
+ parser.add_argument("-s", "--servername", default="localhost",
help="Server hostname")
- parser.add_option("-c", "--clientname", type="string", default="localhost",
+ parser.add_argument("-c", "--clientname", default="localhost",
help="Server hostname")
- (options, args) = parser.parse_args()
- return options
+ args = parser.parse_args()
+ return args
###############################################################################
# Main
###############################################################################
if __name__ == "__main__":
- options = parse_options()
+ args = parse_args()
qapp = Qt.QApplication(sys.argv)
- qapp.main_window = gui("Remote GNU Radio GUI",options)
+ qapp.main_window = gui("Remote GNU Radio GUI", args)
qapp.main_window.show()
qapp.exec_()
diff --git a/gr-zeromq/examples/python/server.py b/gr-zeromq/examples/python/server.py
index e3b7c9b928..23951664c1 100755
--- a/gr-zeromq/examples/python/server.py
+++ b/gr-zeromq/examples/python/server.py
@@ -27,8 +27,8 @@ from gnuradio import gr
from gnuradio import blocks
from gnuradio import analog
from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from gnuradio.eng_arg import eng_float, intx
+from argparse import ArgumentParser
import numpy
import sys
from threading import Thread
@@ -101,18 +101,18 @@ class top_block(gr.top_block):
###############################################################################
# Options Parser
###############################################################################
-def parse_options():
- """ Options parser. """
- parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
- (options, args) = parser.parse_args()
- return options
+def parse_args():
+ """Argument parser."""
+ parser = ArgumentParser()
+ args = parser.parse_args()
+ return args
###############################################################################
# Main
###############################################################################
if __name__ == "__main__":
- options = parse_options()
- tb = top_block(options)
+ args = parse_args()
+ tb = top_block(args)
try:
# keep the program running when flowgraph is stopped
while True:
diff --git a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
index d365532003..5e99ab140b 100644
--- a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
+++ b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
@@ -36,5 +36,4 @@ install(FILES
req_msg_source.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/zeromq
- COMPONENT "zeromq_devel"
)
diff --git a/gr-zeromq/lib/CMakeLists.txt b/gr-zeromq/lib/CMakeLists.txt
index d7b03fa4ed..880a6522a9 100644
--- a/gr-zeromq/lib/CMakeLists.txt
+++ b/gr-zeromq/lib/CMakeLists.txt
@@ -75,7 +75,7 @@ list(APPEND zeromq_libs
add_library(gnuradio-zeromq SHARED ${zeromq_sources})
target_link_libraries(gnuradio-zeromq ${zeromq_libs})
-GR_LIBRARY_FOO(gnuradio-zeromq RUNTIME_COMPONENT "zeromq_runtime" DEVEL_COMPONENT "zeromq_devel")
+GR_LIBRARY_FOO(gnuradio-zeromq)
if(ENABLE_STATIC_LIBS)
if(ENABLE_GR_CTRLPORT)
@@ -97,6 +97,6 @@ if(ENABLE_STATIC_LIBS)
endif(NOT WIN32)
install(TARGETS gnuradio-zeromq_static
- ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "zeromq_devel" # .lib file
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
)
endif(ENABLE_STATIC_LIBS)
diff --git a/gr-zeromq/swig/CMakeLists.txt b/gr-zeromq/swig/CMakeLists.txt
index 5c2aff2ed0..0c557a3ffa 100644
--- a/gr-zeromq/swig/CMakeLists.txt
+++ b/gr-zeromq/swig/CMakeLists.txt
@@ -44,7 +44,6 @@ GR_SWIG_MAKE(zeromq_swig zeromq_swig.i)
GR_SWIG_INSTALL(
TARGETS zeromq_swig
DESTINATION ${GR_PYTHON_DIR}/gnuradio/zeromq
- COMPONENT "zeromq_python"
)
install(
@@ -52,5 +51,4 @@ install(
zeromq_swig.i
${CMAKE_CURRENT_BINARY_DIR}/zeromq_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
- COMPONENT "zeromq_swig"
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 20:46:22 +0000