Merge pull request #10 from scala-network/impl/felidae

Impl: Felidae, prep for V8, prelim V7.9

Author: hayzamjs

.gitmodules

@@ -15,3 +15,6 @@
 [submodule "external/trezor-common"]
 	path = external/trezor-common
 	url = https://github.com/trezor/trezor-common.git
+[submodule "external/felidae"]
+	path = external/felidae
+	url = https://github.com/scala-network/felidae

Brewfile

@@ -0,0 +1,25 @@
+tap "bottech/outcasts"
+tap "homebrew/bundle"
+tap "homebrew/cask"
+tap "homebrew/cask-versions"
+tap "homebrew/core"
+brew "boost"
+brew "ccache"
+brew "cmake"
+brew "expat"
+brew "git"
+brew "htop"
+brew "openssl@1.1"
+brew "libgcrypt"
+brew "libpgm"
+brew "libsodium"
+brew "libunwind-headers"
+brew "miniupnpc"
+brew "node"
+brew "pkg-config"
+brew "protobuf"
+brew "qrencode"
+brew "smartmontools"
+brew "tmux"
+brew "zeromq"
+brew "bottech/outcasts/cppzmq"

CMakeLists.txt

@@ -103,16 +103,18 @@ function (scala_add_library_with_deps)
 endfunction ()
 
 function (add_c_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_c)
-  check_c_compiler_flag(${flag} ${supported})
+  set(TMP "-Werror ${flag}")
+  string(REGEX REPLACE "[- ]" "_" supported ${TMP}_c)
+  check_c_compiler_flag(${TMP} ${supported})
   if(${${supported}})
     set(${var} "${${var}} ${flag}" PARENT_SCOPE)
   endif()
 endfunction()
 
 function (add_cxx_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_cxx)
-  check_cxx_compiler_flag(${flag} ${supported})
+  set(TMP "-Werror ${flag}")
+  string(REGEX REPLACE "[- ]" "_" supported ${TMP}_cxx)
+  check_cxx_compiler_flag(${TMP} ${supported})
   if(${${supported}})
     set(${var} "${${var}} ${flag}" PARENT_SCOPE)
   endif()
@@ -241,6 +243,7 @@ if(CHECK_SUBMODULES)
     check_submodule(external/rapidjson)
     check_submodule(external/trezor-common)
     check_submodule(external/randomx)
+    check_submodule(external/felidae)
   endif()
 endif()
 
@@ -461,7 +464,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)")
 endif ()
 
 if (APPLE AND NOT IOS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -std=c++11")
   if (NOT OpenSSL_DIR)
       EXECUTE_PROCESS(COMMAND brew --prefix openssl
         OUTPUT_VARIABLE OPENSSL_ROOT_DIR

contrib/brew/Brewfile.lock.json

@@ -196,7 +196,7 @@ namespace epee
         if (m_read_status == state_cancelled)
           return false;
 
-        int retval = ::WaitForSingleObject(::GetStdHandle(STD_INPUT_HANDLE), 100);
+        DWORD retval = ::WaitForSingleObject(::GetStdHandle(STD_INPUT_HANDLE), 100);
         switch (retval)
         {
           case WAIT_FAILED:

contrib/epee/include/console_handler.h

@@ -43,6 +43,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/utility/string_ref.hpp>
+#include <boost/algorithm/string.hpp>
 #include "misc_log_ex.h"
 #include "storages/parserse_base_utils.h"
 #include "hex.h"
@@ -124,6 +125,8 @@ POP_WARNINGS
 	}
 	//----------------------------------------------------------------------------
 	std::string get_ip_string_from_int32(uint32_t ip);
+  //----------------------------------------------------------------------------
+  std::vector<std::string> split_string_wd(const std::string str_, const std::string delim_);
 	//----------------------------------------------------------------------------
 	bool get_ip_int32_from_string(uint32_t& ip, const std::string& ip_str);
   //----------------------------------------------------------------------------

contrib/epee/include/string_tools.h

@@ -24,8 +24,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#include "string_tools.h"
-
+#include <vector>
 #include <ctype.h>
 
 #ifdef _WIN32
@@ -35,6 +34,8 @@
 # include <netinet/in.h>
 #endif
 
+#include "string_tools.h"
+
 namespace epee
 {
 namespace string_tools
@@ -49,6 +50,13 @@ namespace string_tools
     else
       return "[failed]";
   }
+
+  std::vector<std::string> split_string_wd(const std::string str_, const std::string delim_) {
+    std::vector<std::string> results;
+    boost::algorithm::split(results, str_, boost::is_any_of(delim_));
+    return results;
+  }
+
   //----------------------------------------------------------------------------
   bool get_ip_int32_from_string(uint32_t& ip, const std::string& ip_str)
   {

contrib/epee/src/string_tools.cpp

@@ -81,3 +81,4 @@ endif()
 add_subdirectory(db_drivers)
 add_subdirectory(easylogging++)
 add_subdirectory(randomx EXCLUDE_FROM_ALL)
+add_subdirectory(felidae EXCLUDE_FROM_ALL)

external/CMakeLists.txt

@@ -27,10 +27,11 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cmake_minimum_required(VERSION 2.8.7)
-
 project(easylogging CXX)
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 find_package(Threads)
 find_package(Backtrace)