Merge pull request #7 from solidoss/work

version 6.0
solidoss · Oct 26, 2019 · fa88ffd · fa88ffd
2 parents d406f46 + 63d822b
commit fa88ffd
Show file tree

Hide file tree

Showing 279 changed files with 15,284 additions and 7,091 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,25 +8,49 @@ language: cpp
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: bionic
       sudo: false
-      addons:
-        apt:
-          packages:
-            - gcc-6
-            - g++-6
-          sources:
-            - ubuntu-toolchain-r-test
+      compiler: gcc
+    - os: linux
+      dist: bionic
+      sudo: false
+      compiler: clang
     - os: osx
-      osx_image: xcode8.3
       compiler: clang
+    - os: osx
+      osx_image: xcode11
+      compiler: clang
+    - os: windows
 install:
-    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 50; fi
-    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 50; fi
-    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo update-alternatives --auto gcc; fi
-    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo update-alternatives --auto g++; fi
-    - gcc --version
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then choco install strawberryperl; fi
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then choco install nasm; fi
 script:
- - ./configure -b maintain && cd build/maintain && make -j4 Experimental
-
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo "nproc = " $(nproc); fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./configure -b maintain && cd build/maintain && make -j$(nproc) && make Experimental; fi
+    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./configure -b maintain && cd build/maintain && make -j$(nproc) && make Experimental; fi
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then export PATH=$PATH:"c:\Program Files\NASM"; fi
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then unset CC && unset CXX; fi
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then prerequisites/run_in_visual_studio_2017_environment.sh amd64 bash ./configure -b maintain -f mnt -g "Visual Studio 15 2017 Win64"; fi
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cd build/mnt; fi
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then travis_wait 20 ../../prerequisites/run_in_visual_studio_2017_environment.sh amd64 bash -c "PATH=\"${PATH}\":\"c:\Program Files\NASM\" cmake --build . --config release --target build-openssl && exit"; fi
+    - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cmake --build . --config release --target Experimental; fi
+
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then travis_wait 30 ../../prerequisites/run_in_visual_studio_2017_environment.sh amd64 bash -c "cmake --build . --config release --target build-boost && exit"; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat external/openssl/src/build-openssl-stamp/build-openssl-configure-err.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat external/openssl/src/build-openssl-stamp/build-openssl-configure-out.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat external/openssl/src/build-openssl-stamp/build-openssl-build-err.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat external/openssl/src/build-openssl-stamp/build-openssl-build-out.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then travis_wait 40 prerequisites/run_in_visual_studio_2017_environment.sh amd64 bash ./configure -b maintain -f mnt -g "Visual Studio 15 2017 Win64" && cd build/mnt && cmake --build . --config release --target Experimental; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then "`find c\:/Program\ Files\ \(x86\)/ -name vcvarsall.bat 2>/dev/null | grep -v -F "Permission" | grep -F "2017"`" amd64; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then prerequisites/run_in_visual_studio_2017_environment.sh amd64 bash; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then ./configure -b maintain -f maintain -g "Visual Studio 15 2017 Win64" && cd build/maintain; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then export PATH=$PATH:"c:\Program Files\NASM"; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then travis_wait 20 cmake --build . --config release --target build-openssl; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then echo $PATH; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat /c/Users/travis/build/vipalade/solidframe/build/maintain/external/openssl/src/build-openssl-stamp/build-openssl-configure-err.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat /c/Users/travis/build/vipalade/solidframe/build/maintain/external/openssl/src/build-openssl-stamp/build-openssl-configure-out.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat /c/Users/travis/build/vipalade/solidframe/build/maintain/external/openssl/src/build-openssl-stamp/build-openssl-build-err.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cat /c/Users/travis/build/vipalade/solidframe/build/maintain/external/openssl/src/build-openssl-stamp/build-openssl-build-out.log; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then travis_wait 30 cmake --build . --config release --target build-boost; fi
+    # - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cmake --build . --config release --target Experimental; fi
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 #-----------------------------------------------------------------
 # The project
 #-----------------------------------------------------------------
-project (SolidFrame VERSION 5.0)
+project (SolidFrame VERSION 6.0)
 
 execute_process(
     COMMAND "git" "rev-parse" "HEAD"
@@ -28,6 +28,10 @@ endif()
 set(EXTRA_COMPILE_OPTIONS "" CACHE STRING "Extra compiler definitions")
 add_definitions(${EXTRA_COMPILE_OPTIONS})
 
+
+set(EXTRA_LINK_OPTIONS "" CACHE STRING "Extra compiler definitions")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_LINK_OPTIONS}")
+
 #-----------------------------------------------------------------
 # Prepare the external path
 #-----------------------------------------------------------------
@@ -109,6 +113,13 @@ if(CMAKE_SYSTEM MATCHES "FreeBSD*")
     )
 
     set(SYSTEM_BASIC_LIBRARIES pmc pthread rt)
+
+    find_library(EXECINFO_LIBRARY NAMES execinfo)
+
+    if(EXECINFO_LIBRARY)
+        message("Execinfo library found: ${EXECINFO_LIBRARY}")
+        list(APPEND SYSTEM_BASIC_LIBRARIES ${EXECINFO_LIBRARY})
+    endif()
 endif(CMAKE_SYSTEM MATCHES "FreeBSD*")
 
 if(CMAKE_SYSTEM MATCHES "Darwin*")
@@ -136,18 +147,17 @@ if(CMAKE_SYSTEM MATCHES "Linux*")
 
 
 
-    set(SYS_DEBUG_FLAGS " -Wreorder -Wreturn-type -Wunused-variable -Winline -g3")
     if(CMAKE_CXX_COMPILER MATCHES "clang")
         add_compile_options(
             "$<$<CONFIG:RELASE>:-O3>"
-            "$<$<CONFIG:DEBUG>:-Wall;-Wshorten-64-to-32;-Wunreachable-code;-Wconditional-uninitialized;-Wreorder;-Wreturn-type;-Wunused-variable;-Winline;-g3>"
-            "$<$<CONFIG:MAINTAIN>:-Wall;-Wshorten-64-to-32;-Wunreachable-code;-Wconditional-uninitialized;-O3;-g3>"
+            "$<$<CONFIG:DEBUG>:-Wall;-Wshorten-64-to-32;-Wunreachable-code;-Wconditional-uninitialized;-Wreorder;-Wreturn-type;-Wunused-variable;-Winline;-Wdelete-non-virtual-dtor;-Wnon-virtual-dtor;-g3>"
+            "$<$<CONFIG:MAINTAIN>:-Wall;-Wshorten-64-to-32;-Wunreachable-code;-Wconditional-uninitialized;-Wdelete-non-virtual-dtor;-Wnon-virtual-dtor;-O3;-g3>"
         )
     else()
         add_compile_options(
             "$<$<CONFIG:RELASE>:-O3>"
-            "$<$<CONFIG:DEBUG>:-Wall;-Wreorder;-Wreturn-type;-Wunused-variable;-Winline;-g3>"
-            "$<$<CONFIG:MAINTAIN>:-Wall;-O3;-g3>"
+            "$<$<CONFIG:DEBUG>:-Wall;-Wreorder;-Wreturn-type;-Wunused-variable;-Winline;-Wdelete-non-virtual-dtor;-Wnon-virtual-dtor;-g3>"
+            "$<$<CONFIG:MAINTAIN>:-Wall;-Wdelete-non-virtual-dtor;-Wnon-virtual-dtor;-O3;-g3>"
         )
     endif()
 
@@ -212,20 +222,18 @@ if(NOT NO_EXTERNAL)
 
     set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
     include(cmake/build_snappy.cmake)
+    include(cmake/build_cxxopts.cmake)
 
     include_directories(${CMAKE_BINARY_DIR}/external/include)
 
     if(EXTERNAL_DIR STREQUAL "")
         set(EXTERNAL_DIR "${CMAKE_CURRENT_BINARY_DIR}/external")
 
-        include(cmake/build_boost.cmake)
         include(cmake/build_openssl.cmake)
     else()
         #define dummy targets
-        add_custom_target(build_boost)
-        add_custom_target(build_openssl)
+        add_custom_target(build-openssl)
 
-        include(cmake/find_boost.cmake)
         include(cmake/find_openssl.cmake)
     endif()
 
@@ -324,7 +332,7 @@ add_custom_target(libraries
     solid_frame_aio
     solid_frame_aio_openssl
     solid_frame_file
-    solid_frame_mpipc
+    solid_frame_mprpc
 )
 
 include(CMakePackageConfigHelpers)