update swig stuff
This commit is contained in:
+7
-31
@@ -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
|
||||
)
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
%define GR_IEEE802_11_BLOCK_MAGIC2(PKG, BASE_NAME)
|
||||
%template(BASE_NAME ## _sptr) boost::shared_ptr<gr:: ## PKG ## :: ## BASE_NAME>;
|
||||
%pythoncode %{
|
||||
BASE_NAME ## _sptr.__repr__ = lambda self: "<gr::block %s (%d)>" % (self.name(), self.unique_id())
|
||||
BASE_NAME = BASE_NAME.make;
|
||||
%}
|
||||
%enddef
|
||||
@@ -1,33 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
########################################################################
|
||||
# block headers
|
||||
########################################################################
|
||||
%{
|
||||
#include <gnuradio/ieee802_11/ofdm_decode_mac.h>
|
||||
%}
|
||||
|
||||
%include <gnuradio/ieee802_11/ofdm_decode_mac.h>
|
||||
|
||||
########################################################################
|
||||
# block magic
|
||||
########################################################################
|
||||
using namespace gr::ieee802_11;
|
||||
GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_decode_mac)
|
||||
|
||||
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
########################################################################
|
||||
# block headers
|
||||
########################################################################
|
||||
%{
|
||||
#include <gnuradio/ieee802_11/ofdm_decode_signal.h>
|
||||
%}
|
||||
|
||||
%include <gnuradio/ieee802_11/ofdm_decode_signal.h>
|
||||
|
||||
########################################################################
|
||||
# block magic
|
||||
########################################################################
|
||||
using namespace gr::ieee802_11;
|
||||
GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_decode_signal)
|
||||
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
########################################################################
|
||||
# block headers
|
||||
########################################################################
|
||||
%{
|
||||
#include <gnuradio/ieee802_11/ofdm_equalize_symbols.h>
|
||||
%}
|
||||
|
||||
%include <gnuradio/ieee802_11/ofdm_equalize_symbols.h>
|
||||
|
||||
########################################################################
|
||||
# block magic
|
||||
########################################################################
|
||||
using namespace gr::ieee802_11;
|
||||
GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_equalize_symbols)
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
########################################################################
|
||||
# block headers
|
||||
########################################################################
|
||||
%{
|
||||
#include <gnuradio/ieee802_11/ofdm_parse_mac.h>
|
||||
%}
|
||||
|
||||
%include <gnuradio/ieee802_11/ofdm_parse_mac.h>
|
||||
|
||||
########################################################################
|
||||
# block magic
|
||||
########################################################################
|
||||
using namespace gr::ieee802_11;
|
||||
GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_parse_mac)
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
########################################################################
|
||||
# block headers
|
||||
########################################################################
|
||||
%{
|
||||
#include <gnuradio/ieee802_11/ofdm_sync_long.h>
|
||||
%}
|
||||
|
||||
%include <gnuradio/ieee802_11/ofdm_sync_long.h>
|
||||
|
||||
########################################################################
|
||||
# block magic
|
||||
########################################################################
|
||||
using namespace gr::ieee802_11;
|
||||
GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_sync_long)
|
||||
@@ -1,30 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
########################################################################
|
||||
# block headers
|
||||
########################################################################
|
||||
%{
|
||||
#include <gnuradio/ieee802_11/ofdm_sync_short.h>
|
||||
%}
|
||||
|
||||
%include <gnuradio/ieee802_11/ofdm_sync_short.h>
|
||||
|
||||
########################################################################
|
||||
# block magic
|
||||
########################################################################
|
||||
using namespace gr::ieee802_11;
|
||||
GR_IEEE802_11_BLOCK_MAGIC2(ieee802_11, ofdm_sync_short)
|
||||
+30
-15
@@ -14,20 +14,35 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#define GR_IEEE802_11_API
|
||||
#define IEEE802_11_API
|
||||
|
||||
########################################################################
|
||||
# standard includes
|
||||
########################################################################
|
||||
%include <gnuradio.i>
|
||||
%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 <ieee802_11_ofdm_decode_mac.i>
|
||||
%include <ieee802_11_ofdm_decode_signal.i>
|
||||
%include <ieee802_11_ofdm_equalize_symbols.i>
|
||||
%include <ieee802_11_ofdm_parse_mac.i>
|
||||
%include <ieee802_11_ofdm_sync_long.i>
|
||||
%include <ieee802_11_ofdm_sync_short.i>
|
||||
|
||||
Reference in New Issue
Block a user