From 52c2d2f85568bc6e50a795b0beacce5789e16ebb Mon Sep 17 00:00:00 2001 From: timerix Date: Tue, 7 Feb 2023 12:55:30 +0600 Subject: [PATCH] cbuild update --- cbuild | 2 +- default.config | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/cbuild b/cbuild index 47808ee..15a9661 160000 --- a/cbuild +++ b/cbuild @@ -1 +1 @@ -Subproject commit 47808ee989c85b6d011851dbec24c39580b55cbb +Subproject commit 15a9661c467facf65b2155eab3fad1ecf5f0c945 diff --git a/default.config b/default.config index 23c2c06..3719daa 100644 --- a/default.config +++ b/default.config @@ -1,5 +1,5 @@ #!/bin/bash -CBUILD_VERSION=3 +CBUILD_VERSION=4 CONFIG_VERSION=4 PROJECT=kerep @@ -26,7 +26,7 @@ case $TASK in CPP_ARGS="$C_ARGS" LINKER_ARGS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT= POST_TASK_SCRIPT= ;; build_exec_dbg) @@ -34,7 +34,7 @@ case $TASK in CPP_ARGS="$C_ARGS" LINKER_ARGS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT= POST_TASK_SCRIPT= ;; build_shared_lib) @@ -42,7 +42,7 @@ case $TASK in CPP_ARGS="$C_ARGS" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT= POST_TASK_SCRIPT= ;; build_shared_lib_dbg) @@ -50,21 +50,21 @@ case $TASK in CPP_ARGS="$C_ARGS" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT= POST_TASK_SCRIPT= ;; build_static_lib) C_ARGS="-O2 -fpic" CPP_ARGS="$C_ARGS" TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT= POST_TASK_SCRIPT= ;; build_static_lib_dbg) C_ARGS="-O0 -g" CPP_ARGS="$C_ARGS" TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh + PRE_TASK_SCRIPT= POST_TASK_SCRIPT= ;; exec) @@ -75,3 +75,14 @@ case $TASK in TASK_SCRIPT=cbuild/default_tasks/valgrind.sh ;; esac + +case $OS in + WINDOWS) + ;; + LINUX) + ;; + *) + printf "${RED}operating system $OS has no configuration variants\n" + exit 1 + ;; +esac