Merge branch 'gitlab-ci' into 'master'

Gitlab ci

See merge request bartoszek/eedb!10

.gitlab-ci.yml

@@ -0,0 +1,14 @@
+stages:
+  - build
+
+Build:
+  stage: build
+  image: eedb.pl:5001/eedb_buildsystem
+  tags:
+    - c++
+
+  script:
+    - mkdir build -p; cd build
+    - cmake -GNinja -DCMAKE_BUILD_TYPE=Release ../
+    - cmake --build .
+    - ccache -s

cmake/FindAllRequirements.cmake

@@ -1,4 +1,4 @@
-SET(_BOOST_COMPONENTS program_options system filesystem thread)
+SET(_BOOST_COMPONENTS program_options system filesystem thread chrono atomic date_time)
 hunter_add_package(Boost COMPONENTS ${_BOOST_COMPONENTS})
 find_package(Boost CONFIG REQUIRED ${_BOOST_COMPONENTS})
 
@@ -20,6 +20,9 @@ find_package(spdlog CONFIG REQUIRED)
 #hunter_add_package(range-v3)
 #find_package(range-v3 CONFIG REQUIRED)
 
+hunter_add_package(bison)
+hunter_add_package(flex)
+
 hunter_add_package(PostgreSQL)
 find_package(PostgreSQL REQUIRED)
 
@@ -27,8 +30,8 @@ set(INSTALL_DEPS_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/install_deps.sh")
 
 execute_process(
     COMMAND ${INSTALL_DEPS_SCRIPT}
-        ${CMAKE_COMMAND}
+        "${CMAKE_COMMAND}"
-        ${CMAKE_GENERATOR}
+        "${CMAKE_GENERATOR}"
         ${CMAKE_CXX_COMPILER}
         ${CMAKE_C_COMPILER}
         ${CMAKE_PREFIX_PATH}

cmake/install_deps.sh

@@ -45,16 +45,15 @@ fi
 # install all
 
 mkdir date-build; cd date-build
-${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ../date\
+${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" ../date\
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}\
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} \
-    -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"\
+    -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
-    -DTZ_CXX_STANDARD=14
 ${CMAKE_COMMAND} --build . --target install
 cd ../
 
 mkdir sqlpp11-build; cd sqlpp11-build
-${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ../sqlpp11\
+${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" ../sqlpp11\
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}\
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}\
     -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"\
@@ -63,7 +62,7 @@ ${CMAKE_COMMAND} --build . --target install
 cd ../
 
 mkdir sqlpp11-connector-postgresql-build; cd sqlpp11-connector-postgresql-build
-${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ../sqlpp11-connector-postgresql\
+${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" ../sqlpp11-connector-postgresql\
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}\
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}\
     -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"\
@@ -74,7 +73,7 @@ ${CMAKE_COMMAND} --build . --target install
 cd ../
 
 mkdir wt-build; cd wt-build
-${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ../wt\
+${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" ../wt\
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}\
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}\
     -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"\
@@ -102,7 +101,7 @@ ${CMAKE_COMMAND} --build . --target install
 cd ../
 
 mkdir ChaiScript-build; cd ChaiScript-build
-${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ../ChaiScript\
+${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" ../ChaiScript\
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}\
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}\
     -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"\
@@ -114,7 +113,6 @@ ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ../ChaiScript\
     -DBUILD_SAMPLES=FALSE\
     -DRUN_FUZZY_TESTS=FALSE\
     -DUSE_STD_MAKE_SHARED=TRUE\
-    -DRUN_PERFORMANCE_TESTS=FALSE\
+    -DRUN_PERFORMANCE_TESTS=FALSE 
-    -DBUILD_IN_CPP17_MODE=TRUE
 ${CMAKE_COMMAND} --build . --target install
 cd ../

src/app/CMakeLists.txt

@@ -2,7 +2,6 @@ set(SOURCES
     main.cpp
 )
 
-find_package(chaiscript)
 add_executable(eedb ${SOURCES})
 
 target_link_libraries(eedb

src/app/main.cpp

@@ -10,8 +10,6 @@
 
 #include <Wt/WEnvironment.h>
 
-#include <chaiscript/chaiscript.hpp>
-
 static auto _createSinks() {
     std::vector< spdlog::sink_ptr > sinks;
     auto stdout_sink = spdlog::sinks::stdout_sink_mt::instance();