Changeset 110 in pacpusframework for branches/2.0-beta1/src

Timestamp:

Jun 13, 2013, 1:43:39 PM (11 years ago)

Author:

morasjul

Message:

Beta-2 : Fix CMakeList (link), remove useless code and add improvement

Location:

branches/2.0-beta1/src

Files:

• DBITEPlayer/CMakeLists.txt (modified) (2 diffs)
• DBITEPlayerLib/CMakeLists.txt (modified) (2 diffs)
• FileLib/CMakeLists.txt (modified) (1 diff)
• PacpusLib/CMakeLists.txt (modified) (3 diffs)
• PacpusLib/ComponentBase.cpp (modified) (1 diff)
• PacpusLib/ComponentManager.cpp (modified) (6 diffs)
• PacpusLib/XmlComponentConfig.cpp (modified) (1 diff)
• PacpusLib/XmlConfigFile.cpp (modified) (2 diffs)
• PacpusLib/inputOutputInterface.cpp (deleted)
• PacpusSensor/CMakeLists.txt (modified) (2 diffs)
• PacpusTools/CMakeLists.txt (modified) (2 diffs)

branches/2.0-beta1/src/DBITEPlayer/CMakeLists.txt

@@ -32 +32 @@
     ${CMAKE_BINARY_DIR}/DBITEPlayer
     ${QT_INCLUDE_DIR}
+)
+
+# ========================================
+# Link directories
+# ========================================
+link_directories(
+    ${PROJECT_BINARY_DIR}/../PacpusLib
+    ${PROJECT_BINARY_DIR}/../FileLib
 )
 
@@ -73 +81 @@
     ${QT_LIBRARIES}
     dbiteplayerlib
-    FileLib
-    PacpusLib
-    PacpusTools
+#    FileLib
+#    PacpusLib
+#    PacpusTools
 )
 # Windows

branches/2.0-beta1/src/DBITEPlayerLib/CMakeLists.txt

@@ -33 +33 @@
     ${CMAKE_BINARY_DIR}/DBITEPlayer
     ${QT_INCLUDE_DIR}
+)
+
+# ========================================
+# Link directories
+# ========================================
+link_directories(
+    ${PROJECT_BINARY_DIR}/../PacpusLib
+    ${PROJECT_BINARY_DIR}/../FileLib
 )
 
@@ -92 +100 @@
 target_link_libraries(
     ${PROJECT_NAME}
-    FileLib
-    PacpusTools
-        #optimized FileLib debug FileLib_d
-        #optimized PacpusTools debug PacpusTools_d
+    ${PACPUS_DEPENDENCIES_LIB}
+    #FileLib
+    #PacpusTools
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
     ${QT_LIBRARIES}
 )

branches/2.0-beta1/src/FileLib/CMakeLists.txt

@@ -52 +52 @@
 target_link_libraries(
     ${PROJECT_NAME}
-    #optimized PacpusLib debug PacpusLib_d
-        PacpusLib
+    ${PACPUS_DEPENDENCIES_LIB}
+    optimized PacpusLib debug PacpusLib_d
+        #PacpusLib
 )
 endif()

branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

@@ -40 +40 @@
 # ========================================
 link_directories(
-        ${PROJECT_BINARY_DIR}/../RoadTime
+    ${PROJECT_BINARY_DIR}/../RoadTime
+    ${PROJECT_BINARY_DIR}/../FileLib
 )
 
@@ -73 +74 @@
     ./XmlComponentConfig.cpp
     ./XmlConfigFile.cpp
-    ./inputOutputInterface.cpp
+    ./inputOutputBase.cpp
 )
 
@@ -96 +97 @@
 
 if(UNIX)
-        set(LIBS FileLib)#optimized FileLib debug FileLib_d)
+        #set(LIBS FileLib)
+        set(LIBS optimized FileLib debug FileLib_d)
 else()
-    set(LIBS 
+    set(LIBS
         #optimized ROAD_TIME debug ROAD_TIME_d # TODO why debug not found ?
-        ROAD_TIME
-        )
+        ROAD_TIME
+        )
 endif()
 

branches/2.0-beta1/src/PacpusLib/ComponentBase.cpp

@@ -20 +20 @@
   , mgr(NULL)
   , componentState_(NOT_MONITORED)
+  , ui(NULL)
 {
     LOG_TRACE("constructor");

branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

@@ -7 +7 @@
 #include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/ComponentBase.h>
+#include <Pacpus/kernel/ConnectionBase.h>
 #include <Pacpus/kernel/Log.h>
-#include <Pacpus/kernel/ConnectionBase.h>
 #include <QObject>
 
@@ -227 +227 @@
         QString componentType = cfg.getComponentType();
         QString componentName = cfg.getComponentName();
-        //LOG_DEBUG("try to create component '" << componentName << "'");
+        LOG_DEBUG("try to create component '" << componentName << "'");
+
         // create the component and automatically add it to the component manager list
         if (!createComponent(componentType, componentName)) {
@@ -239 +240 @@
     // Second, try to configure the components without regarding the dependencies
     for (int i = 0; i < componentsNodeList.size(); ++i) {
-        //LOG_DEBUG("try to configure component '" << (*it) << "'");
         cfg.localCopy(componentsNodeList.item(i).toElement());
         QString componentName = cfg.getComponentName();
+        LOG_DEBUG("try to configure component '" << componentName << "'");
 
         // copy locally the config parameters of the component
@@ -250 +251 @@
             component->param.localCopy(cfg.qDomElement());
             component->configuration_ = component->configureComponent(cfg);
-
         }
     } // for
@@ -264 +264 @@
         } else {
             if (component->configuration_ == ComponentBase::CONFIGURATION_DELAYED) {
-                //LOG_DEBUG("try to configure component '" << (*it) << "'");
+                LOG_DEBUG("try to configure component '" << componentName << "'");
 
                 // copy locally the config parameters of the component
@@ -274 +274 @@
                 --componentsToConfigureCount;
             } else {
-                /*LOG_ERROR("cannot configure component '" << (*it) << "'"
+                LOG_ERROR("cannot configure component '" << componentName << "'"
                           << ". Dependencies with other components are too complex"
                           << ". It was not configured, please review your configuration and/or your component"
-                          );*/
+                          );
                 component->configuration_ = ComponentBase::CONFIGURED_FAILED;
             }

branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp

@@ -20 +20 @@
 static const string kPropertyConnectionOutput = "output";
 static const string kPropertyConnectionPriority = "priority";
-static const string kPropertyConnectionInputC = "inputC";
-static const string kPropertyConnectionInputP = "inputP";
-static const string kPropertyConnectionOutputC = "outputC";
-static const string kPropertyConnectionOutputP = "outputP";
+//static const string kPropertyConnectionInputC = "inputC";
+//static const string kPropertyConnectionInputP = "inputP";
+//static const string kPropertyConnectionOutputC = "outputC";
+//static const string kPropertyConnectionOutputP = "outputP";
 
 XmlComponentConfig::XmlComponentConfig(const QString& name)

branches/2.0-beta1/src/PacpusLib/XmlConfigFile.cpp

@@ -75 +75 @@
     _mutex.lock();
 // TODO change .tagName => .attribute(kPropertyComponentName.c_str())
-    if (_document.documentElement().namedItem(componentSection).namedItem(component.tagName()).isNull()) {
-        LOG_WARN("component " << component.tagName() << " exists already in the document");
+    if (_document.documentElement().namedItem(componentSection).namedItem(component.attribute(nameAttribute)/*.tagName()*/).isNull()) {
+        LOG_WARN("component " << component.attribute(nameAttribute)/*tagName()*/ << " exists already in the document");
     } else {
         QDomNode node = _document.documentElement().namedItem(componentSection).appendChild(component);
@@ -92 +92 @@
     QDomNode node = _document.documentElement().namedItem(componentSection).removeChild(component);
     if (node.isNull()) {
-        LOG_WARN("component " << component.tagName() << " doesn't exist in the document.");
+        LOG_WARN("component " << component.attribute(nameAttribute)/*tagName()*/ << " doesn't exist in the document.");
     } else {
         LOG_INFO("component " << node.nodeName() << " has been removed from the section "

branches/2.0-beta1/src/PacpusSensor/CMakeLists.txt

@@ -32 +32 @@
   ${PROJECT_BINARY_DIR}
   ${QT_INCLUDE_DIR}
+)
+# ========================================
+# Link directories
+# ========================================
+link_directories(
+    ${PROJECT_BINARY_DIR}/../PacpusLib
+    ${PROJECT_BINARY_DIR}/../FileLib
 )
 
@@ -72 +79 @@
 target_link_libraries(
     ${PROJECT_NAME}
-    dbiteplayerlib
-    FileLib
-    PacpusLib
-    PacpusTools
+    ${PACPUS_DEPENDENCIES_LIB}
+#    dbiteplayerlib
+#    FileLib
+#    PacpusLib
+#    PacpusTools
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
     ${QT_LIBRARIES}
 )

branches/2.0-beta1/src/PacpusTools/CMakeLists.txt

@@ -31 +31 @@
 include_directories(
     ${QT_INCLUDE_DIR}
+)
+# ========================================
+# Link directories
+# ========================================
+link_directories(
+    ${PROJECT_BINARY_DIR}/../PacpusLib
 )
 
@@ -94 +100 @@
 # ========================================
 pacpus_add_library(
-    ${PROJECT_NAME}
+    ${PROJECT_NAME} SHARED
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
+)
+
+# ========================================
+# Libraries
+# ========================================
+target_link_libraries(
+    ${PROJECT_NAME}
+    ${QT_LIBRARIES}
+    ${PACPUS_DEPENDENCIES_LIB}
+    optimized PacpusLib debug PacpusLib_d
 )