Supernode

.travis.yml

@@ -5,9 +5,6 @@ sudo: required
 
 dist: bionic # ubuntu 18.04
 
-#os:
- # - linux
-
 compiler:
 - gcc
 - clang
@@ -48,6 +45,17 @@ install:
     brew update;
     brew install cmake pkg-config openssl boost libsodium readline protobuf ncurses;
     export OPENSSL_ROOT_DIR=`brew --prefix openssl`;
+    git clone https://github.com/eclipse/paho.mqtt.c.git;
+    cd paho.mqtt.c;
+    git checkout v1.3.1;
+    mkdir build && cd build;
+    cmake -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE ..;
+    sudo make install;
+    sudo mkdir /usr/local/include/mqtt/;
+    sudo chmod 755 /usr/local/include/mqtt/;
+    sudo cp ${TRAVIS_BUILD_DIR}/src/mqtt/src/mqtt/* /usr/local/include/mqtt/;
+    sudo chmod 644 /usr/local/include/mqtt/*;
+    cd ${TRAVIS_BUILD_DIR};
   else
     sudo apt-get update -qq;
     sudo apt install -y g++ cmake libboost-all-dev openssl libssl1.0-dev libreadline-dev pkg-config libprotobuf-dev protobuf-compiler libncurses5-dev autoconf;
@@ -60,15 +68,27 @@ install:
     make -j2;
     sudo make install;
     cd ../;
+    git clone https://github.com/eclipse/paho.mqtt.c.git;
+    cd paho.mqtt.c;
+    git checkout v1.3.1;
+    mkdir build && cd build;
+    cmake -DPAHO_BUILD_STATIC=TRUE -DPAHO_WITH_SSL=TRUE ..;
+    sudo make install;
+    sudo cp -r  ${TRAVIS_BUILD_DIR}/src/mqtt/src/mqtt/ /usr/local/include/;
+    sudo chmod 755 /usr/local/include/mqtt;
+    cd /usr/local/include/mqtt;
+    sudo chmod 644 *;
+    cd -;
+    cd ../..;
   fi
 
 before_script:
 - ulimit -c unlimited -S       # enable core dumps
 
 script:
-- ./INSTALL.sh 
+- ./INSTALL.sh
 - ./build/test/test_big
 - ./build/test/test_ctsdb
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    cppcheck --error-exitcode=1 --std=c++11 --enable=warning,performance,portability -i libsodium-1.0.18 -i src/leveldb -i build -i src/snappy -i src/crypto -i src/jsonrpc/json -i src/xengine/docker -i script -i test . ;
+    cppcheck -j2 --error-exitcode=1 --std=c++11 --enable=warning,performance,portability -i libsodium-1.0.18 -i src/leveldb -i build -i src/snappy -i src/crypto -i src/jsonrpc/json -i src/xengine/docker -i script -i test -i paho.mqtt.c -i src/mqtt . ;
   fi

CMakeLists.txt

@@ -38,7 +38,7 @@ elseif(UNIX)
     set(CMAKE_CXX_EXTENSIONS OFF)
 
 else()
-    message(FATAL_ERROR "Unsupported plantform")
+    message(FATAL_ERROR "Unsupported platform")
 endif()
 
 # build type
@@ -57,7 +57,7 @@ endif()
 if(UNIX AND NOT CYGWIN)
     string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Werror -Wno-char-subscripts -Wno-unused-parameter -Wno-sign-compare -Wno-reorder -Wno-unused-local-typedefs -Wno-implicit-fallthrough -Wno-overloaded-virtual -Wno-strict-aliasing")
     if (APPLE)
-        string(APPEND CMAKE_CXX_FLAGS " -fvisibility-inlines-hidden -fvisibility=hidden")
+        string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-field-initializers -fvisibility-inlines-hidden -fvisibility=hidden")
     endif()
 endif()
 

INSTALL.sh

@@ -12,24 +12,25 @@ fi
 cd build
 
 # cmake
-flagdebug=""
+flag=""
 if [[ "$1" = "debug" || "$2" = "debug" ]]
 then
-    flagdebug="-DCMAKE_BUILD_TYPE=Debug"
+    flag="-DCMAKE_BUILD_TYPE=Debug"
 else
-    flagdebug="-DCMAKE_BUILD_TYPE=Release"
+    flag="-DCMAKE_BUILD_TYPE=Release"
 fi
 
-flagtestnet=""
 if [[ "$1" = "testnet" || "$2" = "testnet" ]]
 then
-    flagtestnet="-DTESTNET=on"
+    flag+=" -DTESTNET=on"
 else
-    flagtestnet="-DTESTNET=off"
+    flag+=" -DTESTNET=off"
 fi
 
-cmake .. $flagdebug $flagtestnet
-if [ $? -ne 0 ]; then 
+flag+=" -DPAHO_BUILD_STATIC=TRUE -DPAHO_BUILD_SHARED=FALSE"
+
+cmake .. $flag
+if [ $? -ne 0 ]; then
     cd $origin_path
     exit 1 
 fi 

doc/auto_rpc.md

@@ -30,11 +30,11 @@ CBasicConfig* CreateConfig(const std::string& cmd)
 {
 	if (cmd == "help")
 	{
-		return new mode_impl::CCombinConfig<CHelpConfig, T...>;
+		return new mode_impl::CCombineConfig<CHelpConfig, T...>;
 	}
 	else if (cmd == "stop")
 	{
-		return new mode_impl::CCombinConfig<CStopConfig, T...>;
+		return new mode_impl::CCombineConfig<CStopConfig, T...>;
 	}
     ...
 }