From 27cc4d29bb524e1f59240d22ce5fed9af1d8bc4c Mon Sep 17 00:00:00 2001 From: Martin Beseda <martin.beseda@vsb.cz> Date: Wed, 27 Mar 2019 03:53:46 +0100 Subject: [PATCH] Revert "[FIX] Trying to fix CI" This reverts commit 34cfee6fb3ee074d8c9f95a8bb39dcc696b81ee3. --- .../linux/linux_gcc_build_x64_debug_system.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/build_scripts/linux/linux_gcc_build_x64_debug_system.sh b/build_scripts/linux/linux_gcc_build_x64_debug_system.sh index 144ecb2c..7988ba68 100755 --- a/build_scripts/linux/linux_gcc_build_x64_debug_system.sh +++ b/build_scripts/linux/linux_gcc_build_x64_debug_system.sh @@ -96,6 +96,9 @@ then echo -e "Building the '${CYAN}lib4neuro${NC}' project for ${WHITE}Debug${NC} (preparing makefiles)" + + cd ../.. + cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${C_COMPILER} -DBOOST_LIBRARYDIR=${BOOST_LIBRARYDIR} -DBOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -DBUILD_TESTS=${BUILD_TESTS} -DBUILD_EXAMPLES=${BUILD_EXAMPLES} -DBUILD_LIB=${BUILD_LIB} -DDEPENDENCIES_LINK_TYPE=${LINK_TYPE} -S . -B build || { echo -e "${RED}Makefile preparation finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; } if [ ${BUILD_ERROR_OCCURED} -eq 0 ] @@ -104,6 +107,34 @@ then cmake --build build --config Debug -- -j ${N_CORES} && echo -e "${GREEN}Build complete${NC}." || { echo -e "${RED}Build finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; } fi + cd build_scripts/linux + +fi + +if [ ${CLEAN_AF} = "yes" ] +then + +if [ ${BUILD_LIB} = "yes" ] +then + ./linux_clean_after_lib.sh +fi + +if [ ${BUILD_EXAMPLES} = "yes" ] +then + pwd + ./linux_clean_after_examples.sh +fi + +if [ ${BUILD_TESTS} = "yes" ] +then + ./linux_clean_after_tests.sh +fi + +if [ ${BUILD_SOMETHING_LIB} = "yes" ] +then + ./linux_clean_garbage.sh +fi + fi if [ ${BUILD_ERROR_OCCURED} -eq 1 ] -- GitLab