Changeset 349 in pacpusframework

Timestamp:

Sep 23, 2015, 9:35:59 PM (9 years ago)

Author:

DHERBOMEZ Gérald

Message:

build of the trunk (release 0.2.x) under Linux Mint 17.2

Location:

trunk

Files:

• include/Pacpus/kernel/ComponentBase.h (modified) (2 diffs)
• scripts/build-linux.sh (modified) (1 diff)
• src/FileLib/test/CMakeLists.txt (modified) (1 diff)
• src/PacpusLib/ColorSeverityFormatter.hpp (modified) (1 diff)
• src/PacpusLib/ComponentBase.cpp (modified) (2 diffs)

trunk/include/Pacpus/kernel/ComponentBase.h

@@ -101 +101 @@
     /// @return Value of the current state.
     COMPONENT_STATE getState();
+    COMPONENT_STATE state();
 
     /// Checks whether the component if configurer or not.
@@ -109 +110 @@
     /// @return Name of the component.
     QString getName() const;
+    QString name() const;
     
     /// @returns @b true if the component has been started and is active (working)

trunk/scripts/build-linux.sh

@@ -35 +35 @@
         -DPACPUS_USE_LOG=TRUE -DCMAKE_BUILD_TYPE=Release \
         -DPACPUS_INSTALL_WITH_VERSION_NUMBER=TRUE
-    make
+    make -j4
     sudo make install
     cmake .. -DPACPUS_INSTALL_DIR=$1 -DPACPUS_INSTALL_3RD=TRUE \
         -DPACPUS_USE_LOG=TRUE -DCMAKE_BUILD_TYPE=Debug
         -DPACPUS_INSTALL_WITH_VERSION_NUMBER=TRUE \
-    make
+    make -j4
     sudo make install
     echo "Build finished"

trunk/src/FileLib/test/CMakeLists.txt

@@ -44 +44 @@
 )
 
-if(WIN32)
-    list(APPEND LIBS
-        optimized FileLib debug FileLib_d
-        optimized PacpusLib debug PacpusLib_d
-    )
-endif()
+list(APPEND LIBS
+    optimized FileLib debug FileLib_d
+    optimized PacpusLib debug PacpusLib_d
+)
 
 # LINK

trunk/src/PacpusLib/ColorSeverityFormatter.hpp

@@ -303 +303 @@
     }
 
-    BOOST_DELETED_FUNCTION(FormatSeverityWithColorsTerminal())
+    //BOOST_DELETED_FUNCTION(FormatSeverityWithColorsTerminal())
+    FormatSeverityWithColorsTerminal() = delete;
 };
 

trunk/src/PacpusLib/ComponentBase.cpp

@@ -207 +207 @@
 }
 
+// FIXME: this should be const.
+ComponentBase::COMPONENT_STATE ComponentBase::state()
+{
+    return getState();
+}
+
+
 ComponentBase::COMPONENT_CONFIGURATION ComponentBase::configurationState() const
 {
@@ -225 +232 @@
 {
     return m_componentName;
+}
+
+QString ComponentBase::name() const
+{
+    return getName();
 }