Changeset 45 in flair-src for trunk/lib/FlairCore


Ignore:
Timestamp:
Jul 18, 2016, 4:13:56 PM (5 years ago)
Author:
Sanahuja Guillaume
Message:

added compile info

Location:
trunk/lib/FlairCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairCore/CMakeLists.txt

    r2 r45  
    1919
    2020FILE(GLOB FLAIRCORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    21 
     21message(${CMAKE_C_COMPILER})
    2222INCLUDE_DIRECTORIES(
    2323        ${LIBXML2_INCLUDE_DIR}
     
    3636
    3737add_custom_target(
    38         svn_rev
    39         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/svn_revision.sh $ENV{FLAIR_ROOT}/flair-src ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/svnversion.h
     38        compile_info
     39        COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    4040)
    4141
    42 add_dependencies(FlairCore_rt svn_rev)
    43 add_dependencies(FlairCore_nrt svn_rev)
     42add_dependencies(FlairCore_rt compile_info)
     43add_dependencies(FlairCore_nrt compile_info)
  • trunk/lib/FlairCore/src/FrameworkManager.cpp

    r15 r45  
    2020#include "IODevice.h"
    2121#include "config.h"
    22 #include "svnversion.h"
     22#include "compile_info.h"
    2323
    2424using std::string;
     
    2727
    2828namespace {
    29 flair::core::FrameworkManager *frameworkmanager = NULL;
     29  flair::core::FrameworkManager *frameworkmanager = NULL;
    3030}
     31
     32static void constructor() __attribute__((constructor));
     33
     34void constructor() {
     35  compile_info("FlairCore");
     36}
     37
    3138
    3239namespace flair {
     
    5562  }
    5663
    57   Printf(SVN_REV);
    5864  frameworkmanager = this;
    5965  pimpl_ = new FrameworkManager_impl(this, name);
  • trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

    r20 r45  
    106106  // Avoids memory swapping for this program
    107107  mlockall(MCL_CURRENT | MCL_FUTURE);
    108   struct sigaction sa;
    109108
    110109  // catch segfault
     
    114113#ifdef __XENO__
    115114#ifdef SIGDEBUG
     115  struct sigaction sa;
    116116  sigemptyset(&sa.sa_mask);
    117117  sa.sa_sigaction = warn_upon_switch;
  • trunk/lib/FlairCore/src/GpsData.cpp

    r42 r45  
    5656
    5757GpsData::GpsData(const Object *parent, std::string name, int n)
    58     : io_data(parent, name, n), dataType(floatType) {
     58    : io_data(parent, name, n), dataType() {
    5959  if (n > 1)
    6060    Warn("n>1 not supported\n");
    6161
    62   AppendLogDescription("raw_ax", floatType);
    63   AppendLogDescription("raw_ay", floatType);
    64   AppendLogDescription("raw_az", floatType);
     62  AppendLogDescription("latitude", floatType);
     63  AppendLogDescription("longitude", floatType);
     64  AppendLogDescription("altitude", floatType);
    6565
    66   AppendLogDescription("raw_gx", floatType);
    67   AppendLogDescription("raw_gy", floatType);
    68   AppendLogDescription("raw_gz", floatType);
    6966
    70   AppendLogDescription("raw_mx", floatType);
    71   AppendLogDescription("raw_my", floatType);
    72   AppendLogDescription("raw_mz", floatType);
    7367}
    7468
  • trunk/lib/FlairCore/src/GpsData.h

    r42 r45  
    3232  class Type : public DataType {
    3333  public:
    34     Type(ScalarType const &_elementDataType)
    35         : elementDataType(_elementDataType) {}
    36     ScalarType const &GetElementDataType() const { return elementDataType; }
     34    Type(void){}
    3735    std::string GetDescription() const { return "gps data"; }
    3836    size_t GetSize() const {
     
    4139
    4240  private:
    43     ScalarType const &elementDataType;
    4441  };
    4542
Note: See TracChangeset for help on using the changeset viewer.