mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-13 02:40:32 +00:00
Code Issues Releases Wiki Activity

Changes in the building system

Browse Source
This commit is contained in:
Carles Fernandez 2014-11-05 23:26:31 +01:00
parent 76d00c7b1e
commit 79f88bd142
7 changed files with 45 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/signal_source/adapters/CMakeLists.txt
View File

@ -127,6 +127,8 @@ if(ARCH_64BITS)
add_definitions(-DARCH_64BITS=1)
endif(ARCH_64BITS)
add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
file(GLOB SIGNAL_SOURCE_ADAPTER_HEADERS "*.h")
add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES} ${SIGNAL_SOURCE_ADAPTER_HEADERS})
source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS})

60
src/algorithms/signal_source/adapters/file_signal_source.cc
View File

@ -31,9 +31,6 @@
*/
#include "file_signal_source.h"
#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
#include <cstdlib>
#include <iostream>
#include <fstream>
@ -56,18 +53,9 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
boost::shared_ptr<gr::msg_queue> queue) :
role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue)
{
char* userHomePath;
userHomePath = getenv ("HOME");
if (userHomePath == NULL)
{
struct passwd *pw = getpwuid(getuid());
userHomePath = pw->pw_dir;
}
std::string hmpath(userHomePath);
std::string default_filename = hmpath + "/.gnss-sdr/data/my_capture.dat";
std::string default_filename = "./example_capture.dat";
std::string default_item_type = "short";
std::string default_dump_filename = hmpath + "/.gnss-sdr/data/my_capture.dat";
std::string default_dump_filename = "./my_capture.dat";
samples_ = configuration->property(role + ".samples", 0);
sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
@ -113,32 +101,38 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
}
catch (const std::exception &e)
{
std::string default_conf_file;
std::string text_;
if (filename_.compare(default_filename) == 0)
{
default_conf_file = hmpath + "/.gnss-sdr/conf/gnss-sdr.conf";
text_ = "Please modify the configuration taking the example at " + default_conf_file;
std::cerr
<< "The configuration file has not been found."
<< std::endl
<< "Please create a configuration file based on the examples at the 'conf/' folder "
<< std::endl
<< "and then generate your own GNSS Software Defined Receiver by doing:"
<< std::endl
<< "$ gnss-sdr --config_file=/path/to/my_GNSS_SDR_configuration.conf"
<< std::endl;
}
else
{
text_ = "Please modify your configuration file"; //+
std::cerr
<< "The receiver was configured to work with a file signal source "
<< std::endl
<< "but the specified file is unreachable by GNSS-SDR."
<< std::endl
<< "Please modify your configuration file"
<< std::endl
<< "and point SignalSource.filename to a valid raw data file. Then:"
<< std::endl
<< "$ gnss-sdr --config_file=/path/to/my_GNSS_SDR_configuration.conf"
<< std::endl
<< "Examples of configuration files available at:"
<< std::endl
<< GNSSSDR_INSTALL_DIR "/gnss-sdr/conf/"
<< std::endl;
}
std::cerr
<< "The receiver was configured to work with a file signal source "
<< std::endl
<< "but the specified file is unreachable by GNSS-SDR."
<< std::endl
<< text_
<< std::endl
<< "and point SignalSource.filename to a valid file,"
<< std::endl
<< "and specify your own receiver with the flag"
<< std::endl
<< "$ gnss-sdr --config_file=/path/to/my_GNSS_SDR_configuration.conf"
<< std::endl;
LOG(INFO) << "file_signal_source: Unable to open the samples file "
<< filename_.c_str() << ", exiting the program.";
throw(e);

28
src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
View File

@ -31,9 +31,6 @@
*/
#include "nsr_file_signal_source.h"
#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
#include <cstdlib>
#include <exception>
#include <fstream>
@ -56,15 +53,6 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration,
boost::shared_ptr<gr::msg_queue> queue) :
role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue)
{
char* userHomePath;
userHomePath = getenv ("HOME");
if (userHomePath == NULL)
{
struct passwd *pw = getpwuid(getuid());
userHomePath = pw->pw_dir;
}
std::string hmpath(userHomePath);
std::string default_filename = "../data/my_capture.dat";
std::string default_item_type = "byte";
std::string default_dump_filename = "../data/my_capture_dump.dat";
@ -99,24 +87,22 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration,
}
catch (const std::exception &e)
{
std::string default_conf_file;
std::string text_;
default_conf_file = hmpath + "/.gnss-sdr/conf/gnss-sdr_GPS_L1_nsr.conf";
text_ = "Please modify the configuration taking the example at " + default_conf_file;
std::cerr
<< "The receiver was configured to work with a file signal source "
<< std::endl
<< "but the specified file is unreachable by GNSS-SDR."
<< std::endl
<< text_
<< "Please modify your configuration file"
<< std::endl
<< "and point SignalSource.filename to a valid file,"
<< std::endl
<< "and specify your own receiver and source with the flag"
<< "and point SignalSource.filename to a valid raw data file. Then:"
<< std::endl
<< "$ gnss-sdr --config_file=/path/to/my_GNSS_SDR_configuration.conf"
<< std::endl
<< "Examples of configuration files available at:"
<< std::endl
<< GNSSSDR_INSTALL_DIR "/gnss-sdr/conf/"
<< std::endl;
LOG(WARNING) << "file_signal_source: Unable to open the samples file "
<< filename_.c_str() << ", exiting the program.";
throw(e);

2
src/core/receiver/CMakeLists.txt
View File

@ -85,6 +85,8 @@ else(OPENCL_FOUND)
add_definitions(-DOPENCL_BLOCKS=0)
endif(OPENCL_FOUND)
add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
file(GLOB GNSS_RECEIVER_HEADERS "*.h")
file(GLOB GNSS_RECEIVER_INTERFACE_HEADERS "../interfaces/*.h")
add_library(gnss_rx ${GNSS_RECEIVER_SOURCES} ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS})

4
src/core/receiver/control_thread.cc
View File

@ -90,8 +90,8 @@ extern concurrent_queue<Galileo_Almanac> global_galileo_almanac_queue;
using google::LogMessage;
DEFINE_string(config_file, "../conf/gnss-sdr.conf",
"Path to the file containing the configuration parameters");
DEFINE_string(config_file, std::string(GNSSSDR_INSTALL_DIR "/etc/gnss-sdr/conf/default.conf"),
"File containing the configuration parameters");
ControlThread::ControlThread()
{

2
src/core/receiver/gnss_block_factory.cc
View File

@ -367,7 +367,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
catch (const std::exception &e)
{
std::cout << "GNSS-SDR program ended." << std::endl;
LOG(ERROR) << implementation << ": Source file not found";
exit(1);
}
}
@ -383,7 +382,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
catch (const std::exception &e)
{
std::cout << "GNSS-SDR program ended." << std::endl;
LOG(ERROR) << implementation << ": Source file not found";
exit(1);
}
}

7
src/main/CMakeLists.txt
View File

@ -79,8 +79,11 @@ install(TARGETS gnss-sdr
COMPONENT "gnss-sdr"
)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION $ENV{HOME}/.gnss-sdr
install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION etc/gnss-sdr
FILES_MATCHING PATTERN "*.conf"
)
install(DIRECTORY DESTINATION $ENV{HOME}/.gnss-sdr/data/)
install(DIRECTORY DESTINATION etc/gnss-sdr/data/)
install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf DESTINATION etc/gnss-sdr/conf
RENAME default.conf)