From f5ac80ee5e2e8d5ff21cfb4c6437cd95054f6be4 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 11 Jun 2018 10:14:36 +0200 Subject: [PATCH 01/12] add simple gitlab-ci --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..b0a00e8 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,13 @@ +stages: + - build + +Build: + stage: build + image: rikorose/gcc-cmake + tags: + - c++ + + script: + - mkdir build -p; cd build + - cmake ../ + - cmake --build . From 5dd820af6afd93feaed7b03770721d166e9bb6c7 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 11 Jun 2018 11:19:19 +0200 Subject: [PATCH 02/12] add bison and flex packages --- cmake/FindAllRequirements.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/FindAllRequirements.cmake b/cmake/FindAllRequirements.cmake index d4c740a..1c375f0 100644 --- a/cmake/FindAllRequirements.cmake +++ b/cmake/FindAllRequirements.cmake @@ -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) From 482ebeb158c812d621e4a3d95b51b54349041b3e Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 11 Jun 2018 11:34:01 +0200 Subject: [PATCH 03/12] add quote --- cmake/FindAllRequirements.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindAllRequirements.cmake b/cmake/FindAllRequirements.cmake index 1c375f0..5b0d3a7 100644 --- a/cmake/FindAllRequirements.cmake +++ b/cmake/FindAllRequirements.cmake @@ -30,8 +30,8 @@ set(INSTALL_DEPS_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/install_deps.sh") execute_process( COMMAND ${INSTALL_DEPS_SCRIPT} - ${CMAKE_COMMAND} - ${CMAKE_GENERATOR} + "${CMAKE_COMMAND}" + "${CMAKE_GENERATOR}" ${CMAKE_CXX_COMPILER} ${CMAKE_C_COMPILER} ${CMAKE_PREFIX_PATH} From e3bd937b6e8ae15275af555c307e9347d4eac197 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 11 Jun 2018 11:38:15 +0200 Subject: [PATCH 04/12] print out all arguments --- cmake/install_deps.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cmake/install_deps.sh b/cmake/install_deps.sh index d30f7a1..1829ecd 100755 --- a/cmake/install_deps.sh +++ b/cmake/install_deps.sh @@ -7,6 +7,11 @@ CMAKE_RPATH=$6 CMAKE_INSTALL_PREFIX=$7 CMAKE_BUILD_TYPE=$8 + #/bin/bash + for i in $*; do + echo $i + done + if [ ! -d ${CMAKE_INSTALL_PREFIX} ]; then mkdir -p ${CMAKE_INSTALL_PREFIX} fi @@ -45,7 +50,7 @@ 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}"\ @@ -54,7 +59,7 @@ ${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 +68,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 +79,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 +107,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}"\ From ea5a2a24521ecfae7c8544fa03d593b97db2d51c Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 11 Jun 2018 12:36:42 +0200 Subject: [PATCH 05/12] add missing boost libs --- cmake/FindAllRequirements.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindAllRequirements.cmake b/cmake/FindAllRequirements.cmake index 5b0d3a7..708c265 100644 --- a/cmake/FindAllRequirements.cmake +++ b/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}) From 75249f6f5dcd1d5953d4ad1db32a91ac483d8675 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 11 Jun 2018 14:07:30 +0200 Subject: [PATCH 06/12] fix some cmake args --- cmake/install_deps.sh | 11 ++--------- src/app/CMakeLists.txt | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cmake/install_deps.sh b/cmake/install_deps.sh index 1829ecd..d7e18e6 100755 --- a/cmake/install_deps.sh +++ b/cmake/install_deps.sh @@ -7,11 +7,6 @@ CMAKE_RPATH=$6 CMAKE_INSTALL_PREFIX=$7 CMAKE_BUILD_TYPE=$8 - #/bin/bash - for i in $*; do - echo $i - done - if [ ! -d ${CMAKE_INSTALL_PREFIX} ]; then mkdir -p ${CMAKE_INSTALL_PREFIX} fi @@ -53,8 +48,7 @@ mkdir date-build; cd date-build ${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" ../date\ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}\ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} \ - -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"\ - -DTZ_CXX_STANDARD=14 + -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" ${CMAKE_COMMAND} --build . --target install cd ../ @@ -119,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\ - -DBUILD_IN_CPP17_MODE=TRUE + -DRUN_PERFORMANCE_TESTS=FALSE ${CMAKE_COMMAND} --build . --target install cd ../ diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index dcec1e9..0c454be 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -2,7 +2,6 @@ set(SOURCES main.cpp ) -find_package(chaiscript) add_executable(eedb ${SOURCES}) target_link_libraries(eedb From 2fc54c1929dd71a059ec8c5c79e965be899cedc5 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Tue, 12 Jun 2018 07:29:51 +0200 Subject: [PATCH 07/12] add build type --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0a00e8..8538d58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,5 +9,5 @@ Build: script: - mkdir build -p; cd build - - cmake ../ + - cmake -DCMAKE_BUILD_TYPE=Release ../ - cmake --build . From 15a464aeb66efcbddb930e81abb40c47056d06c0 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Tue, 12 Jun 2018 08:51:26 +0200 Subject: [PATCH 08/12] CHANGE IMAGE --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8538d58..9e5d1b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: Build: stage: build - image: rikorose/gcc-cmake + image: eedb_buildsystem:latest tags: - c++ From 03edc6fe28ca809d10dfee89496f77646c38bc8d Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Tue, 12 Jun 2018 08:59:51 +0200 Subject: [PATCH 09/12] change image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e5d1b7..9d0cf64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: Build: stage: build - image: eedb_buildsystem:latest + image: eedb.pl:5001/eedb_buildsystem tags: - c++ From 0adfac968951a8b16574b283d8c4da62339118a2 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Tue, 12 Jun 2018 09:58:57 +0200 Subject: [PATCH 10/12] changes in gitlabci --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d0cf64..9106f18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,3 +11,4 @@ Build: - mkdir build -p; cd build - cmake -DCMAKE_BUILD_TYPE=Release ../ - cmake --build . + - ccache -s From 94ef3c946636f41e78607b90a20c7d34e242cafc Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Tue, 12 Jun 2018 11:45:22 +0200 Subject: [PATCH 11/12] set ninja as build tool --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9106f18..7928721 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,6 @@ Build: script: - mkdir build -p; cd build - - cmake -DCMAKE_BUILD_TYPE=Release ../ + - cmake -GNinja -DCMAKE_BUILD_TYPE=Release ../ - cmake --build . - ccache -s From 9539eddc73c84e80f1f3c16aee8606ae5b3b16d3 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 18 Jun 2018 13:29:29 +0200 Subject: [PATCH 12/12] remove chaiscript from main --- src/app/main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 3135a70..fbfb5ab 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -10,8 +10,6 @@ #include -#include - static auto _createSinks() { std::vector< spdlog::sink_ptr > sinks; auto stdout_sink = spdlog::sinks::stdout_sink_mt::instance();