From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [94.100.177.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id CC7A24696C4 for ; Wed, 22 Apr 2020 20:44:49 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Wed, 22 Apr 2020 20:44:44 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v2 2/3] gitlab-ci: add out-of-source build List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Piskunov , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org Implemented out-of-source build at cmake files. Added out of source build make targets and added test job to gitlab-ci. Part of #4258 --- .gitlab-ci.yml | 7 +++++++ .travis.mk | 18 ++++++++++++++++++ cmake/BuildLibCURL.cmake | 6 +++--- cmake/utils.cmake | 4 ++-- src/box/CMakeLists.txt | 3 ++- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd265aa60..cbf02f8f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,6 +98,13 @@ variables: # Tests +out_of_source: + stage: test + tags: + - deploy_test + script: + - docker run -w /tmp/ro_src --mount type=bind,source="${PWD}",target=/tmp/ro_src,readonly,bind-propagation=rslave -i registry.gitlab.com/tarantool/tarantool/testing/debian-stretch:latest make -f /tmp/ro_src/.travis.mk test_outofsrc_no_deps + release: <<: *docker_test_definition script: diff --git a/.travis.mk b/.travis.mk index 8aa0e6116..5cde9d22e 100644 --- a/.travis.mk +++ b/.travis.mk @@ -6,6 +6,8 @@ DOCKER_IMAGE?=packpack/packpack:debian-stretch TEST_RUN_EXTRA_PARAMS?= MAX_FILES?=65534 MAX_PROC?=2500 +STARTED_AT_PATH=$(shell pwd) +OUT_OF_SRC_BLD_PATH=/tmp/rw_bins all: package @@ -74,6 +76,22 @@ deps_buster_clang_8: deps_debian apt-get update apt-get install -y clang-8 llvm-8-dev +# Out-of-source build + +build_outofsrc: + rm -rf ${OUT_OF_SRC_BLD_PATH} && \ + mkdir ${OUT_OF_SRC_BLD_PATH} && \ + cd ${OUT_OF_SRC_BLD_PATH} && \ + cmake ${STARTED_AT_PATH} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \ + make -j + +test_outofsrc_no_deps: build_outofsrc + cd ${OUT_OF_SRC_BLD_PATH} && make test-force + +test_outofsrc: deps_debian test_outofsrc_no_deps + # Release build_debian: diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake index 5f8b15a63..753b7293a 100644 --- a/cmake/BuildLibCURL.cmake +++ b/cmake/BuildLibCURL.cmake @@ -56,10 +56,10 @@ macro(curl_build) DOWNLOAD_DIR ${LIBCURL_BINARY_DIR} TMP_DIR ${LIBCURL_BINARY_DIR}/tmp STAMP_DIR ${LIBCURL_BINARY_DIR}/stamp - BINARY_DIR ${LIBCURL_BINARY_DIR} + BINARY_DIR ${LIBCURL_BINARY_DIR}/curl CONFIGURE_COMMAND - cd && ./buildconf && - cd && /configure + rm -rf && cp -rf && + cd && ./buildconf && ./configure # Pass the same toolchain as is used to build # tarantool itself, because they can be # incompatible. diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 3ab2d3ff2..6044ea7c0 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -70,9 +70,9 @@ endfunction() function(bin_source varname srcfile dstfile) set(var ${${varname}}) - set(${varname} ${var} ${dstfile} PARENT_SCOPE) + set(${varname} ${var} "${CMAKE_BINARY_DIR}/${dstfile}" PARENT_SCOPE) set (srcfile "${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}") - set (dstfile "${CMAKE_CURRENT_SOURCE_DIR}/${dstfile}") + set (dstfile "${CMAKE_BINARY_DIR}/${dstfile}") set (tmpfile "${dstfile}.tmp") get_filename_component(module ${dstfile} NAME_WE) diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt index c931ecdfe..51b0006b1 100644 --- a/src/box/CMakeLists.txt +++ b/src/box/CMakeLists.txt @@ -23,7 +23,7 @@ lua_source(lua_sources lua/xlog.lua) lua_source(lua_sources lua/key_def.lua) lua_source(lua_sources lua/merger.lua) set(bin_sources) -bin_source(bin_sources bootstrap.snap bootstrap.h) +bin_source(bin_sources bootstrap.snap src/box/bootstrap.h) add_custom_target(box_generate_lua_sources WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box @@ -32,6 +32,7 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${lua_sources}) include_directories(${ZSTD_INCLUDE_DIRS}) include_directories(${CMAKE_BINARY_DIR}/src/box/sql) +include_directories(${CMAKE_BINARY_DIR}/src/box) add_library(box_error STATIC error.cc errcode.c vclock.c mp_error.cc) target_link_libraries(box_error core stat mpstream) -- 2.17.1