diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e0e5b05..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "cbuild"] - path = cbuild - url = https://timerix.ddns.net:3322/timerix/cbuild.git - branch = main diff --git a/Makefile b/Makefile deleted file mode 100644 index f225cc0..0000000 --- a/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -###################################### -###### Build tasks ####### -###################################### - -all: build_exec_dbg - -# creates executable using profiling info generated by profile -build_exec: profile - @cbuild/call_task.sh build_exec 2>&1 | tee -a make_raw.log - -# creates executable with debug info and no optimizations -build_exec_dbg: - @cbuild/call_task.sh build_exec_dbg 2>&1 | tee make_raw.log - -# creates shared library -build_shared_lib: - @cbuild/call_task.sh build_shared_lib 2>&1 | tee make_raw.log - -# creates shared library with debug symbols and no optimizations -build_shared_lib_dbg: - @cbuild/call_task.sh build_shared_lib_dbg 2>&1 | tee make_raw.log - -# creates static library -build_static_lib: - @cbuild/call_task.sh build_static_lib 2>&1 | tee make_raw.log - -# creates static library with debug symbols and no optimizations -build_static_lib_dbg: - @cbuild/call_task.sh build_static_lib_dbg 2>&1 | tee make_raw.log - -###################################### -###### Launch tasks ####### -###################################### - -# executes $EXEC_FILE -exec: build_exec - @cbuild/call_task.sh exec 2>&1 | tee -a make_raw.log - -# executes $EXEC_FILE -exec_dbg: build_exec_dbg - @cbuild/call_task.sh exec 2>&1 | tee -a make_raw.log - -# executes $EXEC_FILE with valgrind memory checker -valgrind: build_exec_dbg - @cbuild/call_task.sh valgrind 2>&1 | tee -a make_raw.log - -# generates profiling info -profile: - @cbuild/call_task.sh profile 2>&1 | tee make_raw.log - -# compiles program with -pg and runs it with gprof -# uses gprof2dot python script to generate function call tree (pip install gprof2dot) -# requires graphviz (https://www.graphviz.org/download/source/) -gprof: - @cbuild/call_task.sh gprof 2>&1 | tee make_raw.log - -# compiles program and runs it with callgrind (part of valgrind) -# uses gprof2dot python script to generate function call tree (pip install gprof2dot) -# requires graphviz (https://www.graphviz.org/download/source/) -# P.S. detailed results can be viewed in KCacheGrind -callgrind: - @cbuild/call_task.sh callgrind 2>&1 | tee make_raw.log - -# compiles executable with sanitizers and executes it to find errors and warnings -sanitize: - @cbuild/call_task.sh sanitize 2>&1 | tee make_raw.log - -###################################### -###### Other tasks ####### -###################################### - -# deletes generated files -clean: - @cbuild/call_task.sh clean 2>&1 | tee make_raw.log - -# removes all unreadable characters copied from stdio -fix_log: - sed 's/[^[:blank:][:print:]]//g' make_raw.log \ - | sed 's/\[0;[0-9][0-9]m//g' \ - | sed 's/\[0;[0-9]m//g' \ - | sed 's/\[[0-9][0-9]m//g' \ - | sed 's/\[[0-9]m//g' \ - | sed 's/ H //g' \ - | sed 's/\[3gH //g' \ - > make_fixed.log diff --git a/README.md b/README.md index f53b736..d297068 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # kerep - -My library written in C +My library written in C. +Requires [cbuild](https://timerix.ddns.net:3322/Timerix/cbuild). diff --git a/cbuild b/cbuild deleted file mode 160000 index 6d285a8..0000000 --- a/cbuild +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6d285a88d869e7710a196aaa91a162658fe0efc0 diff --git a/default.config b/default.config index 3c2656d..7cac0f5 100644 --- a/default.config +++ b/default.config @@ -1,6 +1,6 @@ #!/bin/bash -CBUILD_VERSION=7 -CONFIG_VERSION=8 +CBUILD_VERSION=2.0.1 +CONFIG_VERSION=9 PROJECT="kerep" CMP_C="gcc" @@ -115,7 +115,7 @@ case "$TASK" in ;; # executes $EXEC_FILE with valgrind memory checker valgrind) - VALGRIND_ARGS="-s --read-var-info=yes --track-origins=yes --fullpath-after=$PROJECT/ --leak-check=full --show-leak-kinds=all" + VALGRIND_ARGS="-s --read-var-info=yes --track-origins=yes --fullpath-after=$(pwd) --leak-check=full --show-leak-kinds=all" TASK_SCRIPT=cbuild/default_tasks/valgrind.sh ;; # generates profiling info @@ -176,7 +176,7 @@ case "$TASK" in TASK_SCRIPT=cbuild/default_tasks/clean.sh ;; # nothing to do - no_task) + "" | no_task) ;; # unknown task *)