From 8eb305b5cf5b053f4a9e01f68e67484a529ce013 Mon Sep 17 00:00:00 2001 From: timerix Date: Fri, 9 Sep 2022 22:18:09 +0600 Subject: [PATCH] cbuild --- Makefile | 31 ++++++++++++++++++++----------- cbuild | 2 +- tasks/pre_build.sh | 7 +++++++ 3 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 tasks/pre_build.sh diff --git a/Makefile b/Makefile index e08aed8..c61ed41 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,24 @@ -###### Building tasks ####### -build: - @build_scripts/build_configurations/build.sh +###### Build cbuild/default_tasks ####### +build_exec: + @cbuild/call_task.sh build_exec +build_exec_dbg: + @cbuild/call_task.sh build_exec_dbg -build_dbg: - @build_scripts/build_configurations/build_dbg.sh +build_shared_lib: + @cbuild/call_task.sh build_shared_lib +build_shared_lib_dbg: + @cbuild/call_task.sh build_shared_lib_dbg -###### Testing tasks ####### -test: build - @build_scripts/build_configurations/test.sh +build_static_lib: + @cbuild/call_task.sh build_static_lib +build_static_lib_dbg: + @cbuild/call_task.sh build_static_lib_dbg -test_valgrind: build_dbg - @build_scripts/build_configurations/test_valgrind.sh +###### Launch cbuild/default_tasks ####### +exec: build_exec + @cbuild/call_task.sh exec -all: build +valgrind: build_exec_dbg + @cbuild/call_task.sh valgrind + +all: build_exec diff --git a/cbuild b/cbuild index 3152566..ff04da5 160000 --- a/cbuild +++ b/cbuild @@ -1 +1 @@ -Subproject commit 315256694e1564200213b388170384cede255838 +Subproject commit ff04da5c198cea82a7948eb882e3cc96c7b5686c diff --git a/tasks/pre_build.sh b/tasks/pre_build.sh new file mode 100644 index 0000000..c116b74 --- /dev/null +++ b/tasks/pre_build.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cd kerep +make $KEREP_BUILD_TARGET +cp bin/kerep.a ../obj/ +printf "${GREEN}copied ${CYAN}kerep.a\n" +cd .. \ No newline at end of file