Start of 3.9 port: gr-dab now builds as a python module called grdab.

Some of the Gnuradio Python API has changed in 3.9 and still needs porting

CMakeLists.txt

@@ -96,7 +96,7 @@ ENDIF()
 ########################################################################
 # Install directories
 ########################################################################
-find_package(Gnuradio "3.8" REQUIRED COMPONENTS blocks filter fft)
+find_package(Gnuradio "3.9" REQUIRED COMPONENTS blocks filter fft)
 include(GrVersion)
 
 include(GrPlatform) #define LIB_SUFFIX
@@ -105,8 +105,8 @@ if(NOT CMAKE_MODULES_DIR)
   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
 endif(NOT CMAKE_MODULES_DIR)
 
-set(GR_INCLUDE_DIR      include/dab)
-set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/dab)
+set(GR_INCLUDE_DIR      include/grdab)
+set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/grdab)
 set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_PKG_CONF_DIR     ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
@@ -137,6 +137,7 @@ endif(APPLE)
 ########################################################################
 find_package(Doxygen)
 find_package(CppUnit)
+find_package(pybind11 REQUIRED)
 
 ########################################################################
 # Setup doxygen option
@@ -167,7 +168,6 @@ add_subdirectory(include/grdab)
 add_subdirectory(lib)
 add_subdirectory(apps)
 add_subdirectory(docs)
-add_subdirectory(swig)
 add_subdirectory(python)
 add_subdirectory(grc)
 

cmake/Modules/dabConfig.cmake

@@ -1,5 +1,5 @@
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_DAB dab)
+PKG_CHECK_MODULES(PC_DAB grdab)
 
 FIND_PATH(
     DAB_INCLUDE_DIRS
@@ -13,7 +13,7 @@ FIND_PATH(
 
 FIND_LIBRARY(
     DAB_LIBRARIES
-    NAMES gnuradio-dab
+    NAMES gnuradio-grdab
     HINTS $ENV{DAB_DIR}/lib
         ${PC_DAB_LIBDIR}
     PATHS ${CMAKE_INSTALL_PREFIX}/lib

docs/doxygen/pydoc_macros.h

@@ -0,0 +1,19 @@
+#ifndef PYDOC_MACROS_H
+#define PYDOC_MACROS_H
+
+#define __EXPAND(x) x
+#define __COUNT(_1, _2, _3, _4, _5, _6, _7, COUNT, ...) COUNT
+#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1))
+#define __CAT1(a, b) a##b
+#define __CAT2(a, b) __CAT1(a, b)
+#define __DOC1(n1) __doc_##n1
+#define __DOC2(n1, n2) __doc_##n1##_##n2
+#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3
+#define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4
+#define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4##_##n5
+#define __DOC6(n1, n2, n3, n4, n5, n6) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6
+#define __DOC7(n1, n2, n3, n4, n5, n6, n7) \
+    __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7
+#define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__))
+
+#endif // PYDOC_MACROS_H