diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 7ffd62c..4751456 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -18,62 +18,38 @@ ######################################################################## # Include swig generation macros ######################################################################## -include(GrPython) find_package(SWIG) find_package(PythonLibs) if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND) return() endif() include(GrSwig) +include(GrPython) ######################################################################## # Setup swig generation ######################################################################## -set(GR_SWIG_INCLUDE_DIRS - ${GR_IEEE802_11_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} -) - foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS}) list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gnuradio/swig) endforeach(incdir) -foreach(incdir ${GRUEL_INCLUDE_DIRS}) - list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gruel/swig) -endforeach(incdir) - set(GR_SWIG_LIBRARIES gnuradio-ieee802_11) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/ieee802_11_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/ieee802_11) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include) GR_SWIG_MAKE(ieee802_11_swig ieee802_11_swig.i) ######################################################################## # Install the build swig module ######################################################################## -GR_SWIG_INSTALL( - TARGETS ieee802_11_swig - DESTINATION ${GR_PYTHON_DIR}/gnuradio/ieee802_11 - COMPONENT "ieee802_11_python" -) +GR_SWIG_INSTALL(TARGETS ieee802_11_swig DESTINATION ${GR_PYTHON_DIR}/ieee802_11) ######################################################################## # Install swig .i files for development ######################################################################## -list(APPEND swig_sources - ieee802_11_swig.i - ieee802_11_factory.i - ieee802_11_ofdm_decode_mac.i - ieee802_11_ofdm_decode_signal.i - ieee802_11_ofdm_equalize_symbols.i - ieee802_11_ofdm_parse_mac.i - ieee802_11_ofdm_sync_long.i - ieee802_11_ofdm_sync_short.i - ${CMAKE_CURRENT_BINARY_DIR}/ieee802_11_swig_doc.i -) - install( - FILES ${swig_sources} - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/ieee802_11/swig - COMPONENT "ieee802_11_swig" + FILES + ieee802_11_swig.i + ${CMAKE_CURRENT_BINARY_DIR}/ieee802_11_swig_doc.i + DESTINATION ${GR_INCLUDE_DIR}/ieee802_11/swig ) diff --git a/swig/ieee802_11_factory.i b/swig/ieee802_11_factory.i deleted file mode 100644 index f0a93da..0000000 --- a/swig/ieee802_11_factory.i +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * 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 . - */ -%define GR_IEEE802_11_BLOCK_MAGIC2(PKG, BASE_NAME) -%template(BASE_NAME ## _sptr) boost::shared_ptr; -%pythoncode %{ - BASE_NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self.unique_id()) - BASE_NAME = BASE_NAME.make; -%} -%enddef diff --git a/swig/ieee802_11_ofdm_decode_mac.i b/swig/ieee802_11_ofdm_decode_mac.i deleted file mode 100644 index 138e3cc..0000000 --- a/swig/ieee802_11_ofdm_decode_mac.i +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * 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 . - */ -######################################################################## -# block headers -######################################################################## -%{ -#include -%} - -%include - -######################################################################## -# block magic -######################################################################## -using namespace gr::ieee802_11; -GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_decode_mac) - - - diff --git a/swig/ieee802_11_ofdm_decode_signal.i b/swig/ieee802_11_ofdm_decode_signal.i deleted file mode 100644 index 09c44bc..0000000 --- a/swig/ieee802_11_ofdm_decode_signal.i +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * 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 . - */ -######################################################################## -# block headers -######################################################################## -%{ -#include -%} - -%include - -######################################################################## -# block magic -######################################################################## -using namespace gr::ieee802_11; -GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_decode_signal) - - diff --git a/swig/ieee802_11_ofdm_equalize_symbols.i b/swig/ieee802_11_ofdm_equalize_symbols.i deleted file mode 100644 index 60cc4e9..0000000 --- a/swig/ieee802_11_ofdm_equalize_symbols.i +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * 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 . - */ -######################################################################## -# block headers -######################################################################## -%{ -#include -%} - -%include - -######################################################################## -# block magic -######################################################################## -using namespace gr::ieee802_11; -GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_equalize_symbols) - diff --git a/swig/ieee802_11_ofdm_parse_mac.i b/swig/ieee802_11_ofdm_parse_mac.i deleted file mode 100644 index b869e92..0000000 --- a/swig/ieee802_11_ofdm_parse_mac.i +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * 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 . - */ -######################################################################## -# block headers -######################################################################## -%{ -#include -%} - -%include - -######################################################################## -# block magic -######################################################################## -using namespace gr::ieee802_11; -GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_parse_mac) - diff --git a/swig/ieee802_11_ofdm_sync_long.i b/swig/ieee802_11_ofdm_sync_long.i deleted file mode 100644 index 58a3016..0000000 --- a/swig/ieee802_11_ofdm_sync_long.i +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * 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 . - */ -######################################################################## -# block headers -######################################################################## -%{ -#include -%} - -%include - -######################################################################## -# block magic -######################################################################## -using namespace gr::ieee802_11; -GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_sync_long) diff --git a/swig/ieee802_11_ofdm_sync_short.i b/swig/ieee802_11_ofdm_sync_short.i deleted file mode 100644 index 2aa94d3..0000000 --- a/swig/ieee802_11_ofdm_sync_short.i +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * 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 . - */ -######################################################################## -# block headers -######################################################################## -%{ -#include -%} - -%include - -######################################################################## -# block magic -######################################################################## -using namespace gr::ieee802_11; -GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_sync_short) diff --git a/swig/ieee802_11_swig.i b/swig/ieee802_11_swig.i index 26e68ad..420a692 100644 --- a/swig/ieee802_11_swig.i +++ b/swig/ieee802_11_swig.i @@ -14,20 +14,35 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#define GR_IEEE802_11_API +#define IEEE802_11_API -######################################################################## -# standard includes -######################################################################## -%include -%include "ieee802_11_factory.i" +%include "gnuradio.i" + +%include "ieee802_11_swig_doc.i" + +%{ +#include "ieee802-11/ether_encap.h" +#include "ieee802-11/ofdm_decode_mac.h" +#include "ieee802-11/ofdm_decode_signal.h" +#include "ieee802-11/ofdm_equalize_symbols.h" +#include "ieee802-11/ofdm_parse_mac.h" +#include "ieee802-11/ofdm_sync_long.h" +#include "ieee802-11/ofdm_sync_short.h" +%} + +%include "ieee802-11/ether_encap.h" +%include "ieee802-11/ofdm_decode_mac.h" +%include "ieee802-11/ofdm_decode_signal.h" +%include "ieee802-11/ofdm_equalize_symbols.h" +%include "ieee802-11/ofdm_parse_mac.h" +%include "ieee802-11/ofdm_sync_long.h" +%include "ieee802-11/ofdm_sync_short.h" + +GR_SWIG_BLOCK_MAGIC2(ieee802_11, ether_encap); +GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_decode_mac); +GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_decode_signal); +GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_equalize_symbols); +GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_parse_mac); +GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_sync_long); +GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_sync_short); -######################################################################## -# block includes -######################################################################## -%include -%include -%include -%include -%include -%include