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

Timestamp:

Jul 18, 2016, 4:13:56 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

added compile info

Location:

trunk/lib/FlairCore

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/FrameworkManager.cpp (modified) (3 diffs)
• src/FrameworkManager_impl.cpp (modified) (2 diffs)
• src/GpsData.cpp (modified) (1 diff)
• src/GpsData.h (modified) (2 diffs)

trunk/lib/FlairCore/CMakeLists.txt

@@ -19 +19 @@
 
 FILE(GLOB FLAIRCORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
-
+message(${CMAKE_C_COMPILER})
 INCLUDE_DIRECTORIES(
         ${LIBXML2_INCLUDE_DIR}
@@ -36 +36 @@
 
 add_custom_target(
-        svn_rev
-        COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/svn_revision.sh $ENV{FLAIR_ROOT}/flair-src ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/svnversion.h
+        compile_info
+        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
 )
 
-add_dependencies(FlairCore_rt svn_rev)
-add_dependencies(FlairCore_nrt svn_rev)
+add_dependencies(FlairCore_rt compile_info)
+add_dependencies(FlairCore_nrt compile_info)

trunk/lib/FlairCore/src/FrameworkManager.cpp

@@ -20 +20 @@
 #include "IODevice.h"
 #include "config.h"
-#include "svnversion.h"
+#include "compile_info.h"
 
 using std::string;
@@ -27 +27 @@
 
 namespace {
-flair::core::FrameworkManager *frameworkmanager = NULL;
+  flair::core::FrameworkManager *frameworkmanager = NULL;
 }
+
+static void constructor() __attribute__((constructor));
+
+void constructor() {
+  compile_info("FlairCore");
+}
+
 
 namespace flair {
@@ -55 +62 @@
   }
 
-  Printf(SVN_REV);
   frameworkmanager = this;
   pimpl_ = new FrameworkManager_impl(this, name);

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -106 +106 @@
   // Avoids memory swapping for this program
   mlockall(MCL_CURRENT | MCL_FUTURE);
-  struct sigaction sa;
 
   // catch segfault
@@ -114 +113 @@
 #ifdef __XENO__
 #ifdef SIGDEBUG
+  struct sigaction sa;
   sigemptyset(&sa.sa_mask);
   sa.sa_sigaction = warn_upon_switch;

trunk/lib/FlairCore/src/GpsData.cpp

@@ -56 +56 @@
 
 GpsData::GpsData(const Object *parent, std::string name, int n)
-    : io_data(parent, name, n), dataType(floatType) {
+    : io_data(parent, name, n), dataType() {
   if (n > 1)
     Warn("n>1 not supported\n");
 
-  AppendLogDescription("raw_ax", floatType);
-  AppendLogDescription("raw_ay", floatType);
-  AppendLogDescription("raw_az", floatType);
+  AppendLogDescription("latitude", floatType);
+  AppendLogDescription("longitude", floatType);
+  AppendLogDescription("altitude", floatType);
 
-  AppendLogDescription("raw_gx", floatType);
-  AppendLogDescription("raw_gy", floatType);
-  AppendLogDescription("raw_gz", floatType);
 
-  AppendLogDescription("raw_mx", floatType);
-  AppendLogDescription("raw_my", floatType);
-  AppendLogDescription("raw_mz", floatType);
 }
 

trunk/lib/FlairCore/src/GpsData.h

@@ -32 +32 @@
   class Type : public DataType {
   public:
-    Type(ScalarType const &_elementDataType)
-        : elementDataType(_elementDataType) {}
-    ScalarType const &GetElementDataType() const { return elementDataType; }
+    Type(void){}
     std::string GetDescription() const { return "gps data"; }
     size_t GetSize() const {
@@ -41 +39 @@
 
   private:
-    ScalarType const &elementDataType;
   };