Skip to content
Snippets Groups Projects
Commit 5e5608a0 authored by Martin Beseda's avatar Martin Beseda
Browse files

FIX: Fixed mistakes in CI scripts.

parents 2e053bdb e4ff5a27
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 1
− 1
View file @ 5e5608a0
......@@ -69,7 +69,7 @@ ubuntu_boost_system:
tags:
- centos7
image: martinbeseda/dockertest:latest
image: martinbeseda/ubuntu-ci:latest
before_script:
- rm -rf external_dependencies/boost/*
......
build_scripts/linux/linux_gcc_build_x64_debug_local.sh
+ 18
− 18
View file @ 5e5608a0
......@@ -26,13 +26,13 @@ if [ -z ${DEPENDENCIES_LINK_TYPE} ]; then DEPENDENCIES_LINK_TYPE=static; fi
if [ -z ${CLEAN_AFTER} ]; then CLEAN_AFTER=yes; fi
export LINK_TYPE=static
if [ $DEPENDENCIES_LINK_TYPE = "shared" ]
if [ ${DEPENDENCIES_LINK_TYPE} = "shared" ]
then
export LINK_TYPE=shared
fi
CLEAN_AF=yes
if [ $CLEAN_AFTER = "no" ]
if [ ${CLEAN_AFTER} = "no" ]
then
CLEAN_AF=no
fi
......@@ -52,7 +52,7 @@ echo "Building the '${CYAN}lib4neuro${NC}' project for ${WHITE}Debug${NC}"
BUILD_SOMETHING=no
BUILD_SOMETHING_LIB=no
if [ $BUILD_LIB = "yes" ]
if [ ${BUILD_LIB} = "yes" ]
then
echo "${CYAN}lib4neuro${NC} build type: ${WHITE}Debug${NC}"
echo "${CYAN}lib4neuro${NC} build architecture: ${WHITE}x64${NC}"
......@@ -68,14 +68,14 @@ then
BUILD_SOMETHING_LIB=yes
fi
if [ $BUILD_EXAMPLES = "yes" ]
if [ ${BUILD_EXAMPLES} = "yes" ]
then
echo "${CYAN}lib4neuro${NC} examples will be built in '${YELLOW}build/examples${NC}'"
BUILD_SOMETHING=yes
BUILD_SOMETHING_LIB=yes
fi
if [ $REBUILD_BOOST = "yes" ]
if [ ${REBUILD_BOOST} = "yes" ]
then
echo "The required '${CYAN}BOOST${NC}' library will be recompiled in the directory '${YELLOW}external_dependencies/boost${NC}'"
rm -rf ../../external_dependencies/boost/stage
......@@ -85,26 +85,26 @@ fi
# Boost rebuild
if [ $REBUILD_BOOST = "yes" ]
if [ ${REBUILD_BOOST} = "yes" ]
then
./build_boost_gcc.sh || BUILD_ERROR_OCCURED=1
fi
# Should we build the lib4neuro library? (yes)
if [ $BUILD_SOMETHING_LIB = "yes" -a $BUILD_ERROR_OCCURED = "0" ]
if [ ${BUILD_SOMETHING_LIB} = "yes" -a $BUILD_ERROR_OCCURED = "0" ]
then
if [ $BUILD_LIB = "yes" ]
if [ ${BUILD_LIB} = "yes" ]
then
./linux_clean_lib.sh
fi
if [ $BUILD_EXAMPLES = "yes" ]
if [ ${BUILD_EXAMPLES} = "yes" ]
then
./linux_clean_examples.sh
fi
if [ $BUILD_TESTS = "yes" ]
if [ ${BUILD_TESTS} = "yes" ]
then
./linux_clean_tests.sh
fi
......@@ -114,12 +114,12 @@ then
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} -DLIB4NEURO_DIR=${PWD}/build/lib -DDEPENDENCIES_LINK_TYPE=${LINK_TYPE} -DLIB4NEURO_INCLUDE_DIR=${LIB4NEURO_INCLUDE_DIR} . || ( echo "${RED}Makefile preparation finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; )
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} -DLIB4NEURO_DIR=${PWD}/build/lib -DDEPENDENCIES_LINK_TYPE=${LINK_TYPE} -DLIB4NEURO_INCLUDE_DIR=${LIB4NEURO_INCLUDE_DIR} . || echo "${RED}Makefile preparation finished with errors${NC}!"; BUILD_ERROR_OCCURED=1;
if [ $BUILD_ERROR_OCCURED = "0" ]
if [ ${BUILD_ERROR_OCCURED} = "0" ]
then
echo "Building the '${CYAN}lib4neuro${NC}' project for ${WHITE}Debug${NC} (building)"
( cmake --build . --config Debug -- -j${N_CORES} ) && ( echo "${GREEN}Build complete${NC}." ) || ( echo "${RED}Build finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; )
cmake --build . --config Debug -- -j${N_CORES} && echo "${GREEN}Build complete${NC}." || echo "${RED}Build finished with errors${NC}!"; BUILD_ERROR_OCCURED=1;
fi
cd build_scripts/linux
......@@ -128,28 +128,28 @@ fi
if [ ${CLEAN_AF} = "yes" ]
then
if [ $BUILD_LIB = "yes" ]
if [ ${BUILD_LIB} = "yes" ]
then
./linux_clean_after_lib.sh
fi
if [ $BUILD_EXAMPLES = "yes" ]
if [ ${BUILD_EXAMPLES} = "yes" ]
then
./linux_clean_after_examples.sh
fi
if [ $BUILD_TESTS = "yes" ]
if [ ${BUILD_TESTS} = "yes" ]
then
./linux_clean_after_tests.sh
fi
if [ $BUILD_SOMETHING_LIB = "yes" ]
if [ ${BUILD_SOMETHING_LIB} = "yes" ]
then
./linux_clean_garbage.sh
fi
fi
if [ $BUILD_ERROR_OCCURED = "1" ]
if [ ${BUILD_ERROR_OCCURED} = "1" ]
then
echo "${RED}Build encountered some errors!${NC}"
exit 1
......
build_scripts/linux/linux_gcc_build_x64_debug_system.sh
+ 19
− 18
View file @ 5e5608a0
......@@ -24,13 +24,13 @@ if [ -z ${DEPENDENCIES_LINK_TYPE} ]; then DEPENDENCIES_LINK_TYPE=static; fi
if [ -z ${CLEAN_AFTER} ]; then CLEAN_AFTER=yes; fi
LINK_TYPE=static
if [ $DEPENDENCIES_LINK_TYPE = "shared" ]
if [ ${DEPENDENCIES_LINK_TYPE} = "shared" ]
then
LINK_TYPE=shared
fi
CLEAN_AF=yes
if [ $CLEAN_AFTER = "no" ]
if [ ${CLEAN_AFTER} = "no" ]
then
CLEAN_AF=no
fi
......@@ -49,7 +49,7 @@ echo "Building the '${CYAN}lib4neuro${NC}' project for ${WHITE}Debug${NC}"
BUILD_SOMETHING=no
BUILD_SOMETHING_LIB=no
if [ $BUILD_LIB = "yes" ]
if [ ${BUILD_LIB} = "yes" ]
then
echo "${CYAN}lib4neuro${NC} build type: ${WHITE}Debug${NC}"
echo "${CYAN}lib4neuro${NC} build architecture: ${WHITE}x64${NC}"
......@@ -58,14 +58,14 @@ then
BUILD_SOMETHING_LIB=yes
fi
if [ $BUILD_TESTS = "yes" ]
if [ ${BUILD_TESTS} = "yes" ]
then
echo "${CYAN}lib4neuro${NC} unit tests will be built in '${YELLOW}build/unit-tests${NC}'"
BUILD_SOMETHING=yes
BUILD_SOMETHING_LIB=yes
fi
if [ $BUILD_EXAMPLES = "yes" ]
if [ ${BUILD_EXAMPLES} = "yes" ]
then
echo "${CYAN}lib4neuro${NC} examples will be built in '${YELLOW}build/examples${NC}'"
BUILD_SOMETHING=yes
......@@ -76,20 +76,20 @@ rm -rf ../../external_dependencies/boost/*
rm -rf ../../external_dependencies/exprtk/*
# Should we build the lib4neuro library? (yes)
if [ $BUILD_SOMETHING_LIB = "yes" -a $BUILD_ERROR_OCCURED = "0" ]
if [ ${BUILD_SOMETHING_LIB} = "yes" -a ${BUILD_ERROR_OCCURED} = "0" ]
then
if [ $BUILD_LIB = "yes" ]
if [ ${BUILD_LIB} = "yes" ]
then
./linux_clean_lib.sh
fi
if [ $BUILD_EXAMPLES = "yes" ]
if [ ${BUILD_EXAMPLES} = "yes" ]
then
./linux_clean_examples.sh
fi
if [ $BUILD_TESTS = "yes" ]
if [ ${BUILD_TESTS} = "yes" ]
then
./linux_clean_tests.sh
fi
......@@ -99,12 +99,12 @@ then
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} -DLIB4NEURO_DIR=${PWD}/build/lib -DDEPENDENCIES_LINK_TYPE=${LINK_TYPE} -DLIB4NEURO_INCLUDE_DIR=${LIB4NEURO_INCLUDE_DIR} . || ( echo "${RED}Makefile preparation finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; )
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} -DLIB4NEURO_DIR=${PWD}/build/lib -DDEPENDENCIES_LINK_TYPE=${LINK_TYPE} -DLIB4NEURO_INCLUDE_DIR=${LIB4NEURO_INCLUDE_DIR} . || echo "${RED}Makefile preparation finished with errors${NC}!"; BUILD_ERROR_OCCURED=1;
if [ $BUILD_ERROR_OCCURED = "0" ]
if [ ${BUILD_ERROR_OCCURED} = "0" ]
then
echo "Building the '${CYAN}lib4neuro${NC}' project for ${WHITE}Debug${NC} (building)"
( cmake --build . --config Debug -- -j${N_CORES} ) && ( echo "${GREEN}Build complete${NC}." ) || ( echo "${RED}Build finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; )
cmake --build . --config Debug -- -j${N_CORES} && echo "${GREEN}Build complete${NC}." || echo "${RED}Build finished with errors${NC}!"; BUILD_ERROR_OCCURED=1;
fi
cd build_scripts/linux
......@@ -113,29 +113,30 @@ fi
if [ ${CLEAN_AF} = "yes" ]
then
if [ $BUILD_LIB = "yes" ]
if [ ${BUILD_LIB} = "yes" ]
then
./linux_clean_after_lib.sh
fi
if [ $BUILD_EXAMPLES = "yes" ]
if [ ${BUILD_EXAMPLES} = "yes" ]
then
./linux_clean_after_examples.sh
fi
if [ $BUILD_TESTS = "yes" ]
if [ ${BUILD_TESTS} = "yes" ]
then
./linux_clean_after_tests.sh
fi
if [ $BUILD_SOMETHING_LIB = "yes" ]
if [ ${BUILD_SOMETHING_LIB} = "yes" ]
then
./linux_clean_garbage.sh
fi
fi
fi
if [ $BUILD_ERROR_OCCURED = "1" ]
if [ ${BUILD_ERROR_OCCURED} = "1" ]
then
echo "${RED}Build encountered some errors!${NC}"
exit 1
......
build_scripts/windows/win_VS_build_x64_debug.bat
+ 1
− 0
View file @ 5e5608a0
......@@ -106,6 +106,7 @@ IF "%BUILD_SOMETHING_LIB%"=="yes" (
cd ..\..
cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% . || goto error_occured_lib
rem cmake -G "mingw32-make" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% . || goto error_occured_lib
title Building the 'lib4neuro' project for Debug [building]
cmake --build . --config Debug && echo "Build complete." || goto error_occured_lib
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment