From a33077ec78a4fc3d86e23455da153321287d5909 Mon Sep 17 00:00:00 2001 From: timerix Date: Fri, 9 Sep 2022 19:57:59 +0600 Subject: [PATCH] buil scripts moved to submodule --- .gitmodules | 3 + build_scripts/build_configurations/test.sh | 8 -- .../build_configurations/test_valgrind.sh | 9 --- build_scripts/colors.sh | 11 --- build_scripts/default.config.sh | 25 ------- build_scripts/functions.sh | 73 ------------------- build_scripts/init.sh | 22 ------ build_scripts/pre_build.sh | 3 - cbuild | 1 + .../build_configurations => tasks}/build.sh | 0 .../build_dbg.sh | 0 11 files changed, 4 insertions(+), 151 deletions(-) delete mode 100644 build_scripts/build_configurations/test.sh delete mode 100644 build_scripts/build_configurations/test_valgrind.sh delete mode 100644 build_scripts/colors.sh delete mode 100644 build_scripts/default.config.sh delete mode 100644 build_scripts/functions.sh delete mode 100644 build_scripts/init.sh delete mode 100644 build_scripts/pre_build.sh create mode 160000 cbuild rename {build_scripts/build_configurations => tasks}/build.sh (100%) rename {build_scripts/build_configurations => tasks}/build_dbg.sh (100%) diff --git a/.gitmodules b/.gitmodules index 5ae58c5..20d3017 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "kerep"] path = kerep url = https://github.com/Timerix22/kerep.git +[submodule "cbuild"] + path = cbuild + url = https://github.com/Timerix22/cbuild.git diff --git a/build_scripts/build_configurations/test.sh b/build_scripts/build_configurations/test.sh deleted file mode 100644 index a75a49c..0000000 --- a/build_scripts/build_configurations/test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -source build_scripts/init.sh - -print "${CYAN}================[test]================\n" -cd $OUTDIR -./$BUILD_FILE -cd .. diff --git a/build_scripts/build_configurations/test_valgrind.sh b/build_scripts/build_configurations/test_valgrind.sh deleted file mode 100644 index 6b65334..0000000 --- a/build_scripts/build_configurations/test_valgrind.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -source build_scripts/init.sh - -print "${CYAN}===========[test_valgrind]============\n" -cd $OUTDIR -valgrind $VALGRIND_ARGS ./$BUILD_DBG_FILE -cat valgrind.log -cd .. diff --git a/build_scripts/colors.sh b/build_scripts/colors.sh deleted file mode 100644 index e3e8363..0000000 --- a/build_scripts/colors.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -BLACK='\033[0;30m' -GRAY='\033[0;37m' -WHITE='\033[0;97m' -RED='\033[0;91m' -GREEN='\033[0;92m' -YELLOW='\033[0;93m' -BLUE='\033[0;94m' -PURPLE='\033[0;95m' -CYAN='\033[0;96m' diff --git a/build_scripts/default.config.sh b/build_scripts/default.config.sh deleted file mode 100644 index 12e0046..0000000 --- a/build_scripts/default.config.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -OUTDIR=bin -OBJDIR=obj -CMP_C=gcc -CMP_CPP=g++ -STD_C=c11 -STD_CPP=c++17 -WARN_C="-Wall -Wno-discarded-qualifiers" #-Wextra -WARN_CPP="-Wall -Wno-unused-variable -Wno-return-type" #-Wextra -SRC_C="$( find src -name '*.c')" -SRC_CPP="$( find src -name '*.cpp')" -VALGRIND_ARGS="-s --log-file=valgrind.log --read-var-info=yes --track-origins=yes --fullpath-after=cobek/ --leak-check=full --show-leak-kinds=all" - -# build -BUILD_FILE=cb2c.com -BUILD_C_ARGS="-O2" -BUILD_CPP_ARGS="$BUILD_C_ARGS" -BUILD_LINKER_ARGS="" - -# build_dbg -BUILD_DBG_FILE="$BUILD_FILE.dbg" -BUILD_DBG_C_ARGS="-O0 -g" -BUILD_DBG_CPP_ARGS="$BUILD_DBG_C_ARGS" -BUILD_DBG_LINKER_ARGS="" diff --git a/build_scripts/functions.sh b/build_scripts/functions.sh deleted file mode 100644 index 3ffbd40..0000000 --- a/build_scripts/functions.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -function print { - printf "$1$GRAY" -} - -function clear_dir { - print "${BLUE}clearing $1\n" - rm -rf $1 - mkdir $1 -} - -function compile { - local cmp=$1 - print "${BLUE}compiler: ${GRAY}$cmp\n" - local std=$2 - print "${BLUE}standard: ${GRAY}$std\n" - local warn=$3 - print "${BLUE}warnings: ${GRAY}$warn\n" - local args=$4 - print "${BLUE}args: ${GRAY}$args\n" - local sources=$5 - print "${BLUE}sources: ${GRAY}$sources\n" - local compilation_error=0 - - for srcfile in $sources - do ( - local object="$OBJDIR/$(basename $srcfile).o" - if ! $($cmp -std=$std $warn $args -c -o $object $srcfile) - then - print "${RED}some error happened\n" - compilation_error=1 - fi - ) & done - wait - - if [ $compilation_error != 0 ] - then - exit 1 - fi -} - -# (args, sources) -function compile_c { - print "${CYAN}-------------[compile_c]--------------\n" - compile $CMP_C $STD_C "$WARN_C" "$1" "$2" -} - -# (args, sources) -function compile_cpp { - print "${CYAN}------------[compile_cpp]-------------\n" - compile $CMP_CPP $STD_CPP "$WARN_CPP" "$1" "$2" -} - -# (args, outfile) -function link { - print "${CYAN}----------------[link]----------------\n" - local args=$1 - print "${BLUE}args: ${GRAY}$args\n" - local outfile=$OUTDIR/$2 - print "${BLUE}outfile: ${GRAY}$outfile\n" - local objects="$(find $OBJDIR -name *.o) -$(find $OBJDIR -name *.a)" - print "${BLUE}objects: ${GRAY}$objects\n" - if $CMP_CPP $args -o $outfile $(echo $objects | tr '\n' ' ') - then - print "${GREEN}file $CYAN$outfile ${GREEN}created\n" - rm -rf $OBJDIR - else - print "${RED}some error happened\n" - exit 1 - fi -} diff --git a/build_scripts/init.sh b/build_scripts/init.sh deleted file mode 100644 index 25119b6..0000000 --- a/build_scripts/init.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -tabs 4 - -source build_scripts/colors.sh -source build_scripts/functions.sh - -if [ ! -f ".config" ]; then - print "${YELLOW}./.config doesn't exist\n" - cp build_scripts/default.config.sh .config - print "${YELLOW}default config created\n" - while true; do - print "${WHITE}continue? (y/n) " - read answ - case $answ in - [Yy] ) break;; - [Nn] ) exit;; - * ) print "${RED}incorrect answer\n";; - esac - done -fi -source .config diff --git a/build_scripts/pre_build.sh b/build_scripts/pre_build.sh deleted file mode 100644 index 34e65d4..0000000 --- a/build_scripts/pre_build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -source build_scripts/init.sh diff --git a/cbuild b/cbuild new file mode 160000 index 0000000..3152566 --- /dev/null +++ b/cbuild @@ -0,0 +1 @@ +Subproject commit 315256694e1564200213b388170384cede255838 diff --git a/build_scripts/build_configurations/build.sh b/tasks/build.sh similarity index 100% rename from build_scripts/build_configurations/build.sh rename to tasks/build.sh diff --git a/build_scripts/build_configurations/build_dbg.sh b/tasks/build_dbg.sh similarity index 100% rename from build_scripts/build_configurations/build_dbg.sh rename to tasks/build_dbg.sh