Added GNURadio 3.4.2 and Ubuntu 11.10 compatibility. Environment variable GNURADIO_330_ROOT is now generic GNURADIO_ROOT

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@85 64b25241-fba3-4117-9849-534c7e92360d

README

@@ -1,10 +1,10 @@
 How to set up the compilation environment for Ubuntu 9.10 and 10.04
 
-- Download GNU Radio 3.3.0 from ftp://ftp.gnu.org/gnu/gnuradio
+- Download GNU Radio 3.3.0 or GNU Radio 3.4.2 from ftp://ftp.gnu.org/gnu/gnuradio
 - Compile and install following the instructions at http://gnuradio.org/redmine/wiki/1/UbuntuInstall
 - Install bjam with the command 'sudo apt-get install bjam'
 - Install Boost.Build with the command 'sudo apt-get install boost-build'
-- Add the system variable GNURADIO_330_ROOT with the location of the sources of gnuradio-3.3.0 
+- Add the system variable GNURADIO_ROOT with the location of the sources of gnuradio-3.3.0 or gnuradio-3.4.2
 - Download gtest-1.4.0.tar.gz from http://code.google.com/p/googletest.
 - Unpack gtest-1.4.0.tar.gz into some folder.
 - From the folder containing gtest build the libraries and install them:
@@ -74,7 +74,7 @@ to analyze the recorded data.
 (Sample of .bashrc configuration)
 
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-export GNURADIO_330_ROOT=/home/gnss/sdr/gnuradio-3.3.0
+export GNURADIO_ROOT=/home/gnss/sdr/gnuradio-3.3.0
 
 
 

conf/gnss-sdr.conf

@@ -17,7 +17,7 @@ ControlThread.wait_for_flowgraph=false
 SignalSource.implementation=File_Signal_Source
 
 ;#filename: path to file with the captured GNSS signal samples to be processed
-SignalSource.filename=/media/DATALOGGER/signals/Agilent GPS Generator/cap2/agilent_cap2.dat
+SignalSource.filename=/home/javier/signals/cap2/agilent_cap2.dat
 
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
 SignalSource.item_type=gr_complex

jamroot.jam

@@ -14,7 +14,7 @@ lib armadillo ;
 project : requirements
 <define>OMNITHREAD_POSIX
 <cxxflags>"-std=c++0x"
-<linkflags>"-larmadillo"
+<linkflags>"-larmadillo -lboost_thread -llapack -lblas"
 #<cxxflags>"-std=c++0x `pkg-config --cflags itpp`"
 #<linkflags>"`pkg-config --libs itpp`"
 # <include>src/utils
@@ -46,11 +46,11 @@ project : requirements
 <include>src/core/libs
 <include>src/core/receiver
 <include>src/core/system_parameters
-<include>$GNURADIO_330_ROOT/gr-usrp/src
-<include>$GNURADIO_330_ROOT/gnuradio-core/src/lib/runtime
-<include>$GNURADIO_330_ROOT/gnuradio-core/src/lib/filter
-<include>$GNURADIO_330_ROOT/gnuradio-core/src/lib/io
-<include>$GNURADIO_330_ROOT/gnuradio-core/src/lib/general
-<include>$GNURADIO_330_ROOT/gnuradio-core/src/lib/gengen ;
+<include>$GNURADIO_ROOT/gr-usrp/src
+<include>$GNURADIO_ROOT/gnuradio-core/src/lib/runtime
+<include>$GNURADIO_ROOT/gnuradio-core/src/lib/filter
+<include>$GNURADIO_ROOT/gnuradio-core/src/lib/io
+<include>$GNURADIO_ROOT/gnuradio-core/src/lib/general
+<include>$GNURADIO_ROOT/gnuradio-core/src/lib/gengen ;
 
-build-project src ;
+build-project src ;

src/algorithms/channel/adapters/channel.cc

@@ -42,6 +42,7 @@
 #include <iostream>
 #include <sstream>
 #include <boost/lexical_cast.hpp>
+#include <boost/thread/thread.hpp>
 
 #include <gnuradio/gr_io_signature.h>
 #include <gnuradio/gr_message.h>

src/algorithms/signal_source/adapters/usrp1_signal_source.cc

@@ -121,7 +121,10 @@ Usrp1SignalSource::Usrp1SignalSource(ConfigurationInterface* configuration,
     db_base_sptr subdev = usrp_source_->selected_subdev(usrp_subdev_spec(
             spec_side_, spec_subdev_));
 
-    DLOG(INFO) << "Subdevice name is " << subdev->side_and_name();
+    /*!
+    * The function side_and_name does not work on gnuradio 3.4.2..
+    * DLOG(INFO) << "Subdevice name is " << subdev->side_and_name();
+    */
     DLOG(INFO) << "Subdevice frequency ranges from " << subdev->freq_min()
             << " to " << subdev->freq_max();
 

src/core/receiver/gnss_flowgraph.cc

@@ -36,6 +36,8 @@
 #include <exception>
 #include "unistd.h"
 
+#include <boost/lexical_cast.hpp>
+
 #include <glog/log_severity.h>
 #include <glog/logging.h>