From 3c25e03478b98746cfb9eff52fc58817cf43eb64 Mon Sep 17 00:00:00 2001 From: timerix Date: Sun, 15 Jan 2023 21:46:30 +0600 Subject: [PATCH] updated cbuild and kerep --- cbuild | 2 +- current.config | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ default.config | 15 ++++++++++----- kerep | 2 +- 4 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 current.config diff --git a/cbuild b/cbuild index ff04da5..bad865d 160000 --- a/cbuild +++ b/cbuild @@ -1 +1 @@ -Subproject commit ff04da5c198cea82a7948eb882e3cc96c7b5686c +Subproject commit bad865d76c8daf9055d0e82fcd96b5d9c7628cce diff --git a/current.config b/current.config new file mode 100644 index 0000000..2e79383 --- /dev/null +++ b/current.config @@ -0,0 +1,52 @@ +#!/bin/bash +CBUILD_VERSION=2 +CONFIG_VER=3 + +PROJECT=cobek +CMP_C=gcc +CMP_CPP=g++ +STD_C=c11 +STD_CPP=c++17 +WARN_C="-Wall -Wno-discarded-qualifiers" +WARN_CPP="-Wall" +SRC_C="$( find src -name '*.c')" +SRC_CPP="$( find src -name '*.cpp')" +TESTS_C="$( find tests -name '*.c')" +TESTS_CPP="$(find tests -name '*.cpp')" + +OUTDIR=bin +OBJDIR=obj +EXEC_FILE=cb2c.com + + +case $TASK in + build_exec) + C_ARGS="-O2" + CPP_ARGS="$C_ARGS" + LINKER_ARGS="" + TASK_SCRIPT=cbuild/default_tasks/build_exec.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT="" + KEREP_BUILD_TASK=build_static_lib + ;; + build_exec_dbg) + C_ARGS="-O0 -g" + CPP_ARGS="$C_ARGS" + LINKER_ARGS="" + TASK_SCRIPT=cbuild/default_tasks/build_exec.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT="" + KEREP_BUILD_TASK=build_static_lib_dbg + ;; + exec) + TASK_SCRIPT=cbuild/default_tasks/exec.sh + PRE_TASK_SCRIPT="" + POST_TASK_SCRIPT="" + ;; + valgrind) + VALGRIND_ARGS="-s --log-file=valgrind.log --read-var-info=yes --track-origins=yes --fullpath-after=$PROJECT/ --leak-check=full --show-leak-kinds=all" + TASK_SCRIPT=cbuild/default_tasks/valgrind.sh + PRE_TASK_SCRIPT="" + POST_TASK_SCRIPT="" + ;; +esac diff --git a/default.config b/default.config index be34b11..2e79383 100644 --- a/default.config +++ b/default.config @@ -1,5 +1,6 @@ #!/bin/bash -CONFIG_VER=2 +CBUILD_VERSION=2 +CONFIG_VER=3 PROJECT=cobek CMP_C=gcc @@ -24,7 +25,8 @@ case $TASK in CPP_ARGS="$C_ARGS" LINKER_ARGS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_BUILD_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT="" KEREP_BUILD_TASK=build_static_lib ;; build_exec_dbg) @@ -32,16 +34,19 @@ case $TASK in CPP_ARGS="$C_ARGS" LINKER_ARGS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_BUILD_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT="" KEREP_BUILD_TASK=build_static_lib_dbg ;; exec) TASK_SCRIPT=cbuild/default_tasks/exec.sh - PRE_BUILD_SCRIPT="" + PRE_TASK_SCRIPT="" + POST_TASK_SCRIPT="" ;; valgrind) VALGRIND_ARGS="-s --log-file=valgrind.log --read-var-info=yes --track-origins=yes --fullpath-after=$PROJECT/ --leak-check=full --show-leak-kinds=all" TASK_SCRIPT=cbuild/default_tasks/valgrind.sh - PRE_BUILD_SCRIPT="" + PRE_TASK_SCRIPT="" + POST_TASK_SCRIPT="" ;; esac diff --git a/kerep b/kerep index 3c132e1..c2825a9 160000 --- a/kerep +++ b/kerep @@ -1 +1 @@ -Subproject commit 3c132e12ea67c9b9c599153a2117e8fd7573d15e +Subproject commit c2825a9540c6a265ed3401c4619dce2f578c416b