From 9c4959d51ebd99adea0079a4c97ae823a10228dc Mon Sep 17 00:00:00 2001 From: Timerix Date: Sat, 20 Jul 2024 23:05:44 +0300 Subject: [PATCH] removed TESTS_C and TESTS_CPP --- CHANGELOG.md | 3 +++ cbuild.sh | 2 +- default.config | 8 +++----- default_tasks/build_exec.sh | 4 ++-- setup.sh | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2efa5b..227cbf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# v2.1.1 ++ removed `TESTS_C` and `TESTS_CPP` + # v2.1.0 + **config**: no more `current.config` and `default.config`, just `project.config` + improved version checking diff --git a/cbuild.sh b/cbuild.sh index c5ab7dc..b1275af 100644 --- a/cbuild.sh +++ b/cbuild.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -INSTALLED_CBUILD_VERSION=2.1.0 +INSTALLED_CBUILD_VERSION=2.1.1 # set \t size to 4 spaces tabs 4 diff --git a/default.config b/default.config index d1f4c12..ad4340c 100644 --- a/default.config +++ b/default.config @@ -1,5 +1,5 @@ #!/usr/bin/env bash -CBUILD_VERSION=2.1.0 +CBUILD_VERSION=2.1.1 CONFIG_VERSION=1 PROJECT="%PROJECT_NAME%" @@ -9,10 +9,8 @@ STD_C="c11" STD_CPP="c++11" WARN_C="-Wall -Wno-discarded-qualifiers -Wextra -Wno-unused-parameter" WARN_CPP="-Wall -Wextra -Wno-unused-parameter" -SRC_C="$( find src -name '*.c')" -SRC_CPP="$( find src -name '*.cpp')" -TESTS_C="$( find tests -name '*.c')" -TESTS_CPP="$(find tests -name '*.cpp')" +SRC_C="$(find src -name '*.c')" +SRC_CPP="$(find src -name '*.cpp')" # Directory with dependency configs. # See cbuild/example_dependency_configs diff --git a/default_tasks/build_exec.sh b/default_tasks/build_exec.sh index 321d5fa..1242057 100755 --- a/default_tasks/build_exec.sh +++ b/default_tasks/build_exec.sh @@ -15,6 +15,6 @@ else done fi -compile_c "$C_ARGS" "$SRC_C $TESTS_C" -compile_cpp "$CPP_ARGS" "$SRC_CPP $TESTS_CPP" +compile_c "$C_ARGS" "$SRC_C" +compile_cpp "$CPP_ARGS" "$SRC_CPP" link "$LINKER_ARGS" "$EXEC_FILE" diff --git a/setup.sh b/setup.sh index b2a0d64..20f7137 100644 --- a/setup.sh +++ b/setup.sh @@ -4,7 +4,7 @@ # exit on errors set -xeo pipefail -CBUILD_VERSION=2.1.0 +CBUILD_VERSION=2.1.1 function version_parse { local value="$1"