Merge pull request #127 from zussel/revert-125-feature/networking

Revert "Networking module"

.travis.yml

@@ -1,4 +1,5 @@
 language: cpp
+sudo: false
 dist: xenial
 
 os: linux
@@ -11,77 +12,59 @@ matrix:
   include:
 #  - env: GCC_VERSION=4.9 BUILD_TYPE=Debug ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [g++-4.9-multilib,"linux-libc-dev:i386",postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test]}}
-
   - env: GCC_VERSION=4.9 BUILD_TYPE=Debug ARCH=64
     compiler: gcc
     addons: { apt: {packages: [g++-4.9] , sources: [ubuntu-toolchain-r-test]}}
-
 #  - env: GCC_VERSION=5 BUILD_TYPE=Debug ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [g++-5-multilib,"linux-libc-dev:i386",postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test]}}
   - env: GCC_VERSION=5 BUILD_TYPE=Debug ARCH=64
     compiler: gcc
     addons: { apt: {packages: [g++-5] , sources: [ubuntu-toolchain-r-test]}}
 #  - env: GCC_VERSION=6 BUILD_TYPE=Debug ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [g++-6-multilib,"linux-libc-dev:i386",postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test]}}
-
   - env: GCC_VERSION=6 BUILD_TYPE=Debug ARCH=64
     compiler: gcc
     addons: { apt: {packages: [g++-6] , sources: [ubuntu-toolchain-r-test]}}
-
 #  - env: GCC_VERSION=7 BUILD_TYPE=Debug ARCH=32
 #    addons: &gcc7_32 { postgresql: "10" , apt: {packages: [g++-7-multilib,rpm,doxygen,"linux-libc-dev:i386",postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test]}}
 #  - env: GCC_VERSION=7 BUILD_TYPE=Release ARCH=32
 #    addons: *gcc7_32
-
   - env: GCC_VERSION=7 BUILD_TYPE=Debug ARCH=64
     compiler: gcc
     addons: &gcc7_64 { apt: {packages: [g++-7,rpm,doxygen] , sources: [ubuntu-toolchain-r-test]}}
   - env: GCC_VERSION=7 BUILD_TYPE=Release ARCH=64
     compiler: gcc
     addons: *gcc7_64
-
 #  - env: CLANG_VERSION=3.6 BUILD_TYPE=Release ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [clang-3.6,libstdc++-6-dev,postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test]}}
-
   - env: CLANG_VERSION=3.6 BUILD_TYPE=Release ARCH=64
     compiler: clang
     addons: { apt: {packages: [clang-3.6]}}
-
 #  - env: CLANG_VERSION=3.7 BUILD_TYPE=Release ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [clang-3.7,libstdc++-6-dev,postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test,llvm-toolchain-precise-3.7]}}
-
   - env: CLANG_VERSION=3.7 BUILD_TYPE=Release ARCH=64
     compiler: clang
     addons: { apt: {packages: [clang-3.7]}}
-
 #  - env: CLANG_VERSION=3.8 BUILD_TYPE=Release ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [clang-3.8,libstdc++-6-dev,postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test]}}
-
   - env: CLANG_VERSION=3.8 BUILD_TYPE=Release ARCH=64
     compiler: clang
     addons: { apt: {packages: [clang-3.8]}}
-
 #  - env: CLANG_VERSION=3.9 BUILD_TYPE=Release ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [clang-3.9,libstdc++-6-dev,postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test,llvm-toolchain-trusty-3.9]}}
-
   - env: CLANG_VERSION=3.9 BUILD_TYPE=Release ARCH=64
     compiler: clang
     addons: { apt: {packages: [clang-3.9]}}
-
 #  - env: CLANG_VERSION=4.0 BUILD_TYPE=Release ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [clang-4.0,libstdc++-6-dev,postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test,llvm-toolchain-trusty-4.0]}}
-
   - env: CLANG_VERSION=4.0 BUILD_TYPE=Release ARCH=64
     compiler: clang
     addons: { apt: {packages: [clang-4.0]}}
-
 #  - env: CLANG_VERSION=5.0 BUILD_TYPE=Release ARCH=32
 #    addons: { postgresql: "10" , apt: {packages: [clang-5.0,libstdc++-6-dev,postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test,llvm-toolchain-trusty-5.0]}}
-
   - env: CLANG_VERSION=5.0 BUILD_TYPE=Release ARCH=64
     compiler: clang
     addons: { apt: {packages: [clang-5.0]}}
-
 #  - env: CLANG_VERSION=6.0 BUILD_TYPE=Debug ARCH=32
 #    addons: &clang6_32 { postgresql: "10" , apt: {packages: [clang-6.0,libstdc++-6-dev,postgresql-10,postgresql-client-10] , sources: [ubuntu-toolchain-r-test,llvm-toolchain-trusty-6.0]}}
 #  - env: CLANG_VERSION=6.0 BUILD_TYPE=Release ARCH=32
@@ -186,6 +169,7 @@ deploy:
   - "${RELEASE_TGZ_FILE}"
   - "${RELEASE_DEB_FILE}"
   - "${RELEASE_RPM_FILE}"
+  skip_cleanup: true
   on:
     tags: true
     condition: "$GCC_VERSION = 7 && $BUILD_TYPE = Release"

CMakeLists.txt

@@ -13,10 +13,11 @@ SET(APP_VERSION "${APP_MAJOR_VERSION}.${APP_MINOR_VERSION}.${APP_PATCH_LEVEL}")
 
 MESSAGE(STATUS "${PROJECT_NAME_UPPER} ${APP_VERSION}")
 
+
 # Common compiler flags
 # These are defined for clang/gcc compatibility.
 # When non-compatible flags are implemented then we must specify them separately.
-SET(GCC_CLANG_COMMON_FLAGS "-std=c++14 -Wall -Wextra -pedantic")
+SET(GCC_CLANG_COMMON_FLAGS "-std=c++11 -Wall -Wextra -pedantic")
 SET(GCC_CLANG_COMMON_FLAGS_DEBUG "-O0 -g -DDEBUG")
 SET(GCC_CLANG_COMMON_FLAGS_RELEASE "-O1 -DNDEBUG")
 SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -45,6 +46,7 @@ ELSEIF(MSVC)
     SET(CMAKE_CXX_FLAGS_RELEASE "/O1 /DNDEBUG")
 ENDIF()
 
+
 MESSAGE(STATUS "Architecture: ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_SYSTEM_NAME}")
 
 SET(SYSTEM_NAME_LOWER)
@@ -61,30 +63,24 @@ ELSE()
 ENDIF()
 
 OPTION(COVERAGE "Enable generation of code coverage" false)
-IF (NOT COVERAGE_TESTS)
-  SET(COVERAGE_TESTS "all")
-ENDIF()
-
 OPTION(ARCH "Compiler architecture for Clang/GCC" "")
 
-FIND_PACKAGE( Threads REQUIRED )
-
 if (NOT MSVC AND (COVERAGE) AND CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT CMAKE_CXX_COMPILER MATCHES "clang")
   MESSAGE(STATUS "coverage for compiler ${CMAKE_CXX_COMPILER}")
-  MESSAGE(STATUS "coverage tests are: ${COVERAGE_TESTS}")
 
   SET(GCOV_BINARY "gcov" CACHE STRING "gcov binary")
 
   MESSAGE(STATUS "gcov binary: ${GCOV_BINARY}")
 
   INCLUDE(CodeCoverage)
   MESSAGE(STATUS "will generate coverage data")
+  SET(CMAKE_BUILD_TYPE "Debug")
   SET(GCOV_ADDITIONAL_FLAGS "-fprofile-arcs -ftest-coverage")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCOV_ADDITIONAL_FLAGS}")
   SET(CMAKE_C_FLAGS "{CMAKE_C_FLAGS} ${GCOV_ADDITIONAL_FLAGS}")
-  SET(CMAKE_EXE_LINKER_FLAGS "${GCOV_ADDITIONAL_FLAGS} ")
+  SET(CMAKE_EXE_LINKER_FLAGS "${GCOV_ADDITIONAL_FLAGS}")
 
-  SETUP_TARGET_FOR_COVERAGE(coverage test_matador src coverage "exec;${COVERAGE_TESTS}")
+  SETUP_TARGET_FOR_COVERAGE(coverage test_matador src coverage "exec;all")
 else()
   MESSAGE(STATUS "no coverage for compiler ${CMAKE_CXX_COMPILER}")
 endif()
@@ -171,10 +167,10 @@ MESSAGE( STATUS "CMAKE_BINARY_DIR: " ${CMAKE_BINARY_DIR} )
 
 ENABLE_TESTING()
 
+
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(test)
-ADD_SUBDIRECTORY(examples)
 ADD_SUBDIRECTORY(sandbox)
 
 INSTALL(

README.md

@@ -28,8 +28,6 @@ Features:
  * Filter with simple expressions
  * Transactions
  * STL like interface and iterators
- * Json support including parser and object mapper
- * Simple Logging mechanism
 
 Supported databases:
  * PostgreSQL