.gitattributes

@@ -1,2 +0,0 @@
-# git add --renormalize .
-*.sh text eol=lf

CBUILD_VERSION

@@ -1 +1 @@
-2.3.2
+2.1.4

CHANGELOG.md

@@ -1,78 +1,35 @@
-## 2.3.2
-+ fixed symlink creation in `OBJDIR/static_libs`
-
-## 2.3.1
-+ user config loads before project config
-
-## 2.3.0
-+ **CONFIG:** Added new file `./project.config.user.default`.
-+ **CONFIG:** Changed `cbuild/default_tasks` to `@cbuild/default_tasks`.
-+ **CONFIG:** Updated `gprof` task. 
-+ Changed `include` function: replaced prefix `cbuild/` with `@cbuild/`.
-+ Moved most scripts to `include/`.
-+ Renamed default config to `./project.config.default`.
-+ Added functions:
-    + `file_copy_default_if_not_present()`
-    + `replace_var_value_in_script()`
-+ Added task scripts:
-    + `strip_exec.sh` - enabled in default config in task `build_exec`
-
-## 2.2.4
-+ *default config*: C standard changed to C99
-+ *default config*: enabled more warnings
-+ added file `default_vscode/c_cpp_properties.json`
-+ fixed copying of `default_vscode` files
-
-## 2.2.3
-+ removed `\r` characters from `detect_os.sh`
-
-## 2.2.2
-+ `bootstrap.sh` can show help for cbuild installations again
-+ copy dependency out files only if they are newer or don't exist
-
-## 2.2.1
-+ updated `bootsrap.sh` to 1.0.2
-
-## 2.2.0
-+ **config**: removed slash after `--fullpath-after` in `VALGRIND_ARGS`
-+ **config**: removed `CONFIG_VERSION` variable
-+ **config**: added `LINKER_LIBS` variable
-+ added `detect_arch` function and `ARCH` global variable
-+ added [default vscode launch config](./default_vscode/)
-+ refactored `sed` calls to not use `-i` argument because it caused errors on NTFS
-
-## v2.1.4
+# v2.1.4
 + added `-Wl,-rpath` argument generation in `link()`. It forces ld to link to local shared library in `OUTDIR`
 
-## v2.1.3
+# v2.1.3
 + added `DEP_OTHER_OUT_FILES` to dependency configs
 + if `PRESERVE_OUT_DIRECTORY_STRUCTURE=true` then `DEP_DYNAMIC_OUT_FILES` and `DEP_OTHER_OUT_FILES` are copied to `OUTDIR` preserving directory structure (example_dir/lib1.so -> $OUTDIR/example_dir/lib1.so)
 
-## v2.1.2
+# v2.1.2
 + changed compile_c and compile_cpp functions
 + bootstrap now can print help and list of installed versions 
 
-## v2.1.1
+# v2.1.1
 + **config**: removed `TESTS_C` and `TESTS_CPP` compilation
 
-## v2.1.0
+# v2.1.0
 + **config**: no more `current.config` and `default.config`, just `project.config`
 + improved version checking
 + `setup.sh` now installs each minor version in separate dicectory
 + added `bootstrap.sh` which automaticly selects cbuild version specified in project config 
 
-## v2.0.2
+# v2.0.2
 + new dependency resolution system (see **config** and `example_dependency_configs`)
 + **config**: changed description of `OBJDIR`
 + **config**: added task `rebuild_dependencies`
 + added variable `TASK_ARGS` which can be used in task scripts
 
-## v2.0.1
+# v2.0.1
 + updated `.gitignore`
 + **config**: added `pwd` call to `valgrind` task
 + **config**: added `""` empty task check
 
-## 2.0.0
+# 2.0.0
 + updated setup.sh to do system-wide installation
 + deleted makefile (call `./cbuild.sh` or installed `cbuild`)
 + added command line arguments: 
@@ -85,7 +42,7 @@
 + `init.sh` became `config.sh` with function `load_config`
 + moved color variables and print functions to `myprint.sh`
 
-## v1.7.0
+# v1.7.0
 + added function `resolve_dependencies` to `link`
 + added variables `DEPS_BASEDIR` and `DEPS` to config
 + added script `rebuild_dep.sh` which can be called through `Makefile`
@@ -94,7 +51,7 @@
 + added task `no_task` which is been set in `init.sh` when `TASK` is empty
 + now `STATIC_LIB_FILE` starts with "lib"
 
-## v1.6.0
+# v1.6.0
 + `build_profile` task was split to `profile` and `gprof`
 + added task `sanitize`
 + default C++ standard set to `c++11`
@@ -103,7 +60,7 @@
 + added function `try_delete_dir_or_file` for `clean` task
 + dead code removal in `build_exec` and `build_static_lib`
 
-## v1.5.0
+# v1.5.0
 + added task `clean`
 + added task `exec_dbg`
 + added task `build_profile`

bootstrap.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-CBUILD_BOOTSTRAP_VERSION=1.0.3
+CBUILD_BOOTSTRAP_VERSION=1.0.1
 set -eo pipefail
 
 function version_parse {
@@ -34,14 +34,13 @@ function print_version_list {
     dir_global="/usr/local/share/cbuild"
     files=""
     if [ -d "$dir_local" ]; then
-        files+=$(find "$dir_local" -maxdepth 2 -name 'CBUILD_VERSION')
+        files+="$(find $dir_local -name 'CBUILD_VERSION')"
     fi
     if [ -d "$dir_global" ]; then
-        files+=$(find "$dir_global" -maxdepth 2 -name 'CBUILD_VERSION')
+        files+="$(find $dir_global -name 'CBUILD_VERSION')"
     fi
     for f in $files; do
-        cat $f
-        echo "  at $(dirname $f)"
+        cat $f | sed '$a\'
     done | sort -V
 }
 
@@ -69,9 +68,6 @@ do
     case "${args[i]}" in
         '-v' | '--version')
             echo "cbuild-bootstrap v$CBUILD_BOOTSTRAP_VERSION"
-            echo "list of installed cbuild versions:"
-            print_version_list
-            exit 0
             ;;
         '-h' | '--help')
             print_help
@@ -80,6 +76,10 @@ do
             i=$((i+1))
             project_config_path="${args[i]}"
             ;;
+        '--list-versions')
+            print_version_list
+            exit 0
+            ;;
         *)
             ;;
     esac
@@ -93,9 +93,9 @@ if [ -z "$CBUILD_VERSION" ]; then
     else
         echo "project config not found"
         echo "list of installed cbuild versions:"
-        print_version_list
-        # cut installation directories from list
-        versions=$(print_version_list | cut -d ' ' -f 1)
+        versions=$(print_version_list)
+
+        echo "$versions"
         latest_version=$(echo "$versions" | tail -n 1)
         echo "select version (default=$latest_version):"
         read -r CBUILD_VERSION
@@ -120,6 +120,5 @@ if [ -f "$LOG_FILE" ]; then
         -e 's/\[[0-9]m//g' \
         -e 's/  H  //g' \
         -e 's/\[3gH  //g' \
-        "$LOG_FILE" > "$LOG_FILE.clean"
-    mv "$LOG_FILE.clean" "$LOG_FILE"
+        -i "$LOG_FILE"
 fi

cbuild.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-INSTALLED_CBUILD_VERSION=2.3.2
+INSTALLED_CBUILD_VERSION=2.1.4
 
 # set \t size to 4 spaces
 tabs 4
@@ -33,19 +33,19 @@ fi
 
 function include {
     local script_path="$1"
-    if [[ "$script_path" == @cbuild/* ]]; then
-        script_path="$CBUILD_INSTALL_DIR/$(echo $script_path | sed 's,^@cbuild/,,')"
+    if [[ "$script_path" == cbuild/* ]]; then
+        script_path="$CBUILD_INSTALL_DIR/$(echo $script_path | sed 's,^cbuild/,,')"
     fi
     # echp "including script $script_path"
     . "$script_path"
 }
 
-include "@cbuild/include/myprint.sh"
-include "@cbuild/include/functions.sh"
-include "@cbuild/include/config.sh"
+include "cbuild/myprint.sh"
+include "cbuild/functions.sh"
+include "cbuild/config.sh"
 
 function print_help {
-    myprint "${GRAY}cbuild v$INSTALLED_CBUILD_VERSION"
+    myprint "cbuild v$INSTALLED_CBUILD_VERSION"
     myprint "C/C++ project build system written in bash."
     myprint "Usage: cbuild [OPTIONS] [TASKS]"
     myprint "Options:"
@@ -74,7 +74,7 @@ do
             exit 0
             ;;
         '-v' | '--version')
-            myprint "${GRAY}cbuild v$INSTALLED_CBUILD_VERSION"
+            myprint "cbuild v$INSTALLED_CBUILD_VERSION"
             exit 0
             ;;
         '-c' | '--config')
@@ -89,36 +89,17 @@ do
             else
                 mkdir -p "$new_project_dir"
             fi
-
-            # create project config
+            if ask_yn "create default cbuild project config?"; then
                 project_config_path="$new_project_dir/project.config"
-            cp "$CBUILD_INSTALL_DIR/project.config.default" "$project_config_path.temp"
-            myprint "${WHITE}Enter project name: "
+                cp "$CBUILD_INSTALL_DIR/default.config" "$project_config_path"
+                myprint "Enter project name: "
                 read -r project_name
-            sed "s,\%PROJECT_NAME\%,$project_name,g" \
-                "$project_config_path.temp" > "$project_config_path"
-            rm "$project_config_path.temp"
-            myprint "${GREEN}Created '$project_config_path'"
-            # create project user default config
-            project_user_config_path="$new_project_dir/project.config.user.default"
-            cp "$CBUILD_INSTALL_DIR/project.config.user.default" "$project_user_config_path"
-            myprint "${GREEN}Created '$project_user_config_path'"
-
-            if ask_yn "${WHITE}Copy default .gitignore?"; then
-                cp -v "$CBUILD_INSTALL_DIR/.gitignore" "$new_project_dir/"
+                sed -i "s,\%PROJECT_NAME\%,$project_name,g" "$project_config_path"
+                myprint "${GREEN}created config at '$project_config_path'"
             fi
-
-            if ask_yn "${WHITE}Copy default .vscode launch tasks?"; then
-                new_project_vscode_dir="$new_project_dir/.vscode"
-                mkdir -pv "$new_project_vscode_dir"
-                for vscode_dir_f in $(find "$CBUILD_INSTALL_DIR/default_vscode/" -type f); do
-                    cp -vr "$vscode_dir_f" "$new_project_vscode_dir/"
-                done
-                sed "s,\%PROJECT_NAME\%,$project_name,g" \
-                    "$new_project_vscode_dir/launch.json" > "$new_project_vscode_dir/launch.json.temp"
-                mv "$new_project_vscode_dir/launch.json.temp" "$new_project_vscode_dir/launch.json"
+            if ask_yn "Copy default .gitignore?"; then
+                cp "$CBUILD_INSTALL_DIR/.gitignore" "$new_project_dir/"
             fi
-
             exit 0
             ;;
         *)
@@ -137,17 +118,15 @@ function call_task {
     load_config "$project_config_path" "$task" true
 
     if [ ! -z "$PRE_TASK_SCRIPT" ]; then
-        myprint "${BLUE}executing ${WHITE}'$PRE_TASK_SCRIPT'"
+        myprint "${BLUE}executing ${WHITE}$TASK_SCRIPT"
         include "$PRE_TASK_SCRIPT"
     fi
 
-    if [ ! -z "$TASK_SCRIPT" ]; then
-        myprint "${BLUE}executing ${WHITE}'$TASK_SCRIPT'"
+    myprint "${BLUE}executing ${WHITE}$TASK_SCRIPT"
     include "$TASK_SCRIPT"
-    fi
 
     if [ ! -z "$POST_TASK_SCRIPT" ]; then
-        myprint "${BLUE}executing ${WHITE}'$POST_TASK_SCRIPT'"
+        myprint "${BLUE}executing ${WHITE}$POST_TASK_SCRIPT"
         include "$POST_TASK_SCRIPT"
     fi
 }

config.sh

@@ -1,36 +1,24 @@
 #!/usr/bin/env bash
 
-include "@cbuild/include/myprint.sh"
-include "@cbuild/include/functions.sh"
-include "@cbuild/include/detect_os.sh"
+include cbuild/myprint.sh
+include cbuild/functions.sh
+include cbuild/detect_os.sh
 
 function load_config {
-    local proj_conf_file="$1"
+    local project_config_path="$1"
     TASK="$2"
-    #true or false
     local quiet=$3
 
-    if [ -z "$proj_conf_file" ]; then
+    myprint "${BLUE}loading config ${WHITE}'$(realpath $project_config_path)'"
+
+    if [ -z "$project_config_path" ]; then
         error "config path is null"
     fi
-    if [ ! -f "$proj_conf_file" ]; then
-        error "${YELLOW}$proj_conf_file doesn't exist"
+    if [ ! -f "$project_config_path" ]; then
+        error "${YELLOW}$project_config_path doesn't exist"
     fi
 
-    # load project user config
-    local proj_conf_user_file="$proj_conf_file.user"
-    file_copy_default_if_not_present "$proj_conf_user_file" "$proj_conf_user_file.default"
-    myprint "${BLUE}loading ${WHITE}'$proj_conf_user_file'"
-    # throw error on undefined variable usage
-    set -u
-    include "$proj_conf_user_file"
-    # don't throw error on undefined variable usage
-    set +u
-
-    myprint "${BLUE}loading ${WHITE}'$proj_conf_file'"
-
     OS=$(detect_os)
-    ARCH=$(detect_arch)
     myprint_quiet $quiet "${GREEN}detected OS: $OS"
 
     # getting version of cbuild installation
@@ -42,9 +30,9 @@ function load_config {
     [ -z "$TASK" ] && TASK="no_task"
 
     # getting cbuild version from config (CBUILD_VERSION declaration is at line 2)
-    exec_script_line "$proj_conf_file" 2 $quiet
+    exec_script_line "$project_config_path" 2 $quiet
 
-    myprint_quiet $quiet "${WHITE}'${proj_conf_file}' cbuild version: ${CYAN}$CBUILD_VERSION"
+    myprint_quiet $quiet "${WHITE}${project_config_path} cbuild version: ${CYAN}$CBUILD_VERSION"
     myprint_quiet $quiet "${WHITE}installed cbuild version: ${CYAN}$INSTALLED_CBUILD_VERSION"
 
     # checking versions
@@ -58,8 +46,9 @@ function load_config {
         myprint "${YELLOW}Install it to get latest bugfixes."
     fi
 
+    # throw error on undefined variable usage
     set -u
-    include "$proj_conf_file"
+    include "$project_config_path"
 
     mkdir -p "$OUTDIR"
     mkdir -p "$OBJDIR/objects"
@@ -67,7 +56,8 @@ function load_config {
     mkdir -p "$OBJDIR/dynamic_libs"
     mkdir -p "$OBJDIR/profile"
 
+    # dont thorw error on undefined variable
     set +u
 
-    myprint_quiet $quiet "${GREEN}config loading completed"
+    myprint_quiet $quiet "${GREEN}loaded cbuild config"
 }

default.config

@@ -1,28 +1,20 @@
 #!/usr/bin/env bash
-CBUILD_VERSION=2.3.2
+CBUILD_VERSION=2.1.4
+CONFIG_VERSION=1
 
 PROJECT="%PROJECT_NAME%"
 CMP_C="gcc"
 CMP_CPP="g++"
-STD_C="c99"
+STD_C="c11"
 STD_CPP="c++11"
-WARN_C="-Wall -Wextra
-    -Wduplicated-branches
-    -Wduplicated-cond
-    -Wformat=2
-    -Wmissing-include-dirs
-    -Wshadow
-    -Werror=return-type
-    -Werror=pointer-arith
-    -Werror=init-self
-    -Werror=incompatible-pointer-types"
-WARN_CPP="$WARN_C"
+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')"
 
 # Directory with dependency configs.
 # See cbuild/example_dependency_configs
-DEPENDENCY_CONFIGS_DIR='dependencies'
+DEPENDENCY_CONFIGS_DIR='.'
 # List of dependency config files in DEPENDENCY_CONFIGS_DIR separated by space.
 ENABLED_DEPENDENCIES=''
 
@@ -33,25 +25,20 @@ ENABLED_DEPENDENCIES=''
 #  └── profile/      - gcc *.gcda profiling info files
 OBJDIR="obj"
 OUTDIR="bin"
-STATIC_LIB_FILE="$PROJECT.a"
-
-# example: "-I./include -I$DEPENDENCIES_DIR/libexample"
-INCLUDE=""
+STATIC_LIB_FILE="lib$PROJECT.a"
 
 # OS-specific options
 case "$OS" in
     WINDOWS)
         EXEC_FILE="$PROJECT.exe"
         SHARED_LIB_FILE="$PROJECT.dll"
-        INCLUDE="$INCLUDE "
-        # example: "-lSDL2 -lSDL2_image"
-        LINKER_LIBS=""
+        # example: "-I./"
+        INCLUDE=""
         ;;
     LINUX)
         EXEC_FILE="$PROJECT"
         SHARED_LIB_FILE="$PROJECT.so"
-        INCLUDE="$INCLUDE "
-        LINKER_LIBS=""
+        INCLUDE=""
         ;;
     *)
         error "operating system $OS has no configuration variants"
@@ -70,62 +57,62 @@ case "$TASK" in
         # -fdata-sections -ffunction-sections -Wl,--gc-sections  removes unused code
         C_ARGS="-O2 -flto=auto -fuse-linker-plugin -fprofile-use -fprofile-prefix-path=$(realpath $OBJDIR)/objects -fdata-sections -ffunction-sections -Wl,--gc-sections"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS"
-        PRE_TASK_SCRIPT=""
-        TASK_SCRIPT="@cbuild/default_tasks/build_exec.sh"
-        POST_TASK_SCRIPT="@cbuild/default_tasks/strip_exec.sh"
+        LINKER_ARGS="$CPP_ARGS"
+        PRE_TASK_SCRIPT=
+        TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
+        POST_TASK_SCRIPT=
         ;;
     # creates executable with debug info and no optimizations
     build_exec_dbg)
         C_ARGS="-O0 -g3"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS"
-        PRE_TASK_SCRIPT=""
-        TASK_SCRIPT="@cbuild/default_tasks/build_exec.sh"
-        POST_TASK_SCRIPT=""
+        LINKER_ARGS="$CPP_ARGS"
+        PRE_TASK_SCRIPT=
+        TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
+        POST_TASK_SCRIPT=
         ;;
     # creates shared library
     build_shared_lib)
         C_ARGS="-O2 -fpic -flto -shared"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS -Wl,-soname,$SHARED_LIB_FILE"
-        PRE_TASK_SCRIPT=""
-        TASK_SCRIPT="@cbuild/default_tasks/build_shared_lib.sh"
-        POST_TASK_SCRIPT=""
+        LINKER_ARGS="$CPP_ARGS -Wl,-soname,$SHARED_LIB_FILE"
+        PRE_TASK_SCRIPT=
+        TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh
+        POST_TASK_SCRIPT=
         ;;
     # creates shared library with debug symbols and no optimizations
     build_shared_lib_dbg)
         C_ARGS="-O0 -g3 -fpic -shared"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS -Wl,-soname,$SHARED_LIB_FILE"
-        PRE_TASK_SCRIPT=""
-        TASK_SCRIPT="@cbuild/default_tasks/build_shared_lib.sh"
-        POST_TASK_SCRIPT=""
+        LINKER_ARGS="$CPP_ARGS -Wl,-soname,$SHARED_LIB_FILE"
+        PRE_TASK_SCRIPT=
+        TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh
+        POST_TASK_SCRIPT=
         ;;
     # creates static library
     build_static_lib)
         C_ARGS="-O2 -fpic -fdata-sections -ffunction-sections"
         CPP_ARGS="$C_ARGS"
-        PRE_TASK_SCRIPT=""
-        TASK_SCRIPT="@cbuild/default_tasks/build_static_lib.sh"
-        POST_TASK_SCRIPT=""
+        PRE_TASK_SCRIPT=
+        TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh
+        POST_TASK_SCRIPT=
         ;;
     # creates static library with debug symbols and no optimizations
     build_static_lib_dbg)
         C_ARGS="-O0 -g3"
         CPP_ARGS="$C_ARGS"
-        PRE_TASK_SCRIPT=""
-        TASK_SCRIPT="@cbuild/default_tasks/build_static_lib.sh"
-        POST_TASK_SCRIPT=""
+        PRE_TASK_SCRIPT=
+        TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh
+        POST_TASK_SCRIPT=
         ;;
     # executes $EXEC_FILE
     exec)
-        TASK_SCRIPT="@cbuild/default_tasks/exec.sh"
+        TASK_SCRIPT=cbuild/default_tasks/exec.sh
         ;;
     # executes $EXEC_FILE with valgrind memory checker
     valgrind)  
         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"
+        TASK_SCRIPT=cbuild/default_tasks/valgrind.sh
         ;;
     # generates profiling info
     profile)
@@ -138,26 +125,23 @@ case "$TASK" in
         # -fprofile-prefix-path sets path where profiling info about objects will be saved
         C_ARGS="-O2 -flto=auto -fuse-linker-plugin -fprofile-generate -fprofile-prefix-path=$(realpath $OBJDIR)/objects"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS"
-        PRE_TASK_SCRIPT="@cbuild/default_tasks/build_exec.sh"
-        TASK_SCRIPT="@cbuild/default_tasks/profile.sh"
-        POST_TASK_SCRIPT=""
+        LINKER_ARGS="$CPP_ARGS"
+        PRE_TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
+        TASK_SCRIPT=cbuild/default_tasks/profile.sh
+        POST_TASK_SCRIPT=
         ;;
     # 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)
         OUTDIR="$OUTDIR/gprof"
-        # arguments that emit some call counter code and disable optimizations to see function names
-        # https://github.com/msys2/MINGW-packages/issues/8503#issuecomment-1365475205
-        C_ARGS="-O0 -g -pg -no-pie -fno-omit-frame-pointer
-            -fno-inline-functions -fno-inline-functions-called-once 
-            -fno-optimize-sibling-calls -fopenmp"
+        # -pg adds code to executable, that generates file containing function call info (gmon.out)
+        C_ARGS="-O2 -flto=auto -fuse-linker-plugin -pg"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS"
-        PRE_TASK_SCRIPT="@cbuild/default_tasks/build_exec.sh"
-        TASK_SCRIPT="@cbuild/default_tasks/gprof.sh"
-        POST_TASK_SCRIPT=""
+        LINKER_ARGS="$CPP_ARGS"
+        PRE_TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
+        TASK_SCRIPT=cbuild/default_tasks/gprof.sh
+        POST_TASK_SCRIPT=
         ;;
     # compiles program and runs it with callgrind (part of valgrind)
     # uses gprof2dot python script to generate function call tree (pip install gprof2dot)
@@ -168,30 +152,30 @@ case "$TASK" in
         # -pg adds code to executable, that generates file containing function call info (gmon.out)
         C_ARGS="-O2 -flto=auto -fuse-linker-plugin"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS"
-        PRE_TASK_SCRIPT="@cbuild/default_tasks/build_exec.sh"
-        TASK_SCRIPT="@cbuild/default_tasks/callgrind.sh"
-        POST_TASK_SCRIPT=""
+        LINKER_ARGS="$CPP_ARGS"
+        PRE_TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
+        TASK_SCRIPT=cbuild/default_tasks/callgrind.sh
+        POST_TASK_SCRIPT=
         ;;
     # compiles executable with sanitizers and executes it to find errors and warnings
     sanitize)
         OUTDIR="$OUTDIR/sanitize"
         C_ARGS="-O0 -g3 -fsanitize=undefined,address"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS"
-        PRE_TASK_SCRIPT="@cbuild/default_tasks/build_exec.sh"
-        TASK_SCRIPT="@cbuild/default_tasks/exec.sh"
-        POST_TASK_SCRIPT=""
+        LINKER_ARGS="$CPP_ARGS"
+        PRE_TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
+        TASK_SCRIPT=cbuild/default_tasks/exec.sh
+        POST_TASK_SCRIPT=
         ;;
     # rebuilds specified dependencies
     # EXAMPLE: `cbuild rebuild_dependencies=libexample1,fonts`
     # 'all' can be specified to rebuild all dependencies
     rebuild_dependencies)
-        TASK_SCRIPT="@cbuild/default_tasks/rebuild_dependencies.sh"
+        TASK_SCRIPT=cbuild/default_tasks/rebuild_dependencies.sh
         ;;
     # deletes generated files
     clean)
-        TASK_SCRIPT="@cbuild/default_tasks/clean.sh"
+        TASK_SCRIPT=cbuild/default_tasks/clean.sh
         ;;
     # nothing to do
     "" | no_task)

default_tasks/strip_exec.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-exe_path="$OUTDIR/$EXEC_FILE"
-myprint "${BLUE}stripping symbols from ${WHITE}$exe_path"
-strip -s "$exe_path"

default_vscode/.gitignore

@@ -1 +0,0 @@
-settings.json

default_vscode/c_cpp_properties.json

@@ -1,14 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "all",
-            "defines": [],
-            "includePath": [
-                // "include",
-                "${default}"
-            ],
-            "cStandard": "c99"
-        }
-    ],
-    "version": 4
-}

default_vscode/launch.json

@@ -1,29 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "gdb_debug",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/bin/%PROJECT_NAME%",
-            "windows": { "program": "${workspaceFolder}/bin/%PROJECT_NAME%.exe" },
-            "preLaunchTask": "build_exec_dbg",
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/bin",
-            "externalConsole": false,
-            "internalConsoleOptions": "neverOpen",
-            "MIMode": "gdb",
-            "miDebuggerPath": "gdb",
-            "setupCommands": [
-                {
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                },
-                {
-                    "text": "-gdb-set disassembly-flavor intel",
-                    "ignoreFailures": true
-                }
-            ]
-        }
-    ]
-}

default_vscode/tasks.json

@@ -1,31 +0,0 @@
-
-{
-    "version": "2.0.0",
-    "tasks": [
-      {
-        "label": "build_exec_dbg",
-        "detail": "build project with debug symbols",
-        "type": "cppbuild",
-        "command": "bash",
-        "args": [
-            "-c", 
-            "cbuild build_exec_dbg"
-        ],
-        "options": {
-          "cwd": "${workspaceFolder}"
-        },
-        "problemMatcher": ["$gcc"],
-        "group": {
-          "kind": "build"
-        },
-        "presentation": {
-          "echo": true,
-          "reveal": "always",
-          "focus": true,
-          "panel": "shared",
-          "showReuseMessage": false,
-          "clear": true
-        }
-      }
-    ]
-  }

detect_os.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+include "cbuild/myprint.sh"
+
+function detect_os {
+    local uname_rezult="$(uname -o)"
+    # myprint "uname rezult: '$uname_rezult'"
+    case "$uname_rezult" in
+        Msys | Cygwin | MS/Windows)
+            safeprint WINDOWS
+            ;;
+        Linux | GNU/Linux | Android)
+            safeprint LINUX
+            ;;
+        FreeBSD)
+            safeprint FREEBSD
+            ;;
+        Darwin)
+            safeprint MACOS
+            ;;
+        *)
+            error "unknown operating system: $uname_rezult"
+            ;;
+    esac
+}

example_dependency_configs/libexample1.config

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-DEP_WORKING_DIR='dependencies/libexample1'
+DEP_WORKING_DIR='depencencies/libexample1'
 DEP_PRE_BUILD_COMMAND=''
 DEP_BUILD_COMMAND='make libexample1.a'
 DEP_POST_BUILD_COMMAND=''

example_dependency_configs/libexample2.config

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-DEP_WORKING_DIR='dependencies/libexample2'
+DEP_WORKING_DIR='depencencies/libexample2'
 DEP_PRE_BUILD_COMMAND=''
 DEP_POST_BUILD_COMMAND=''
 DEP_CLEAN_COMMAND='make clean'

functions.sh

@@ -1,13 +1,11 @@
 #!/usr/bin/env bash
 
-include "@cbuild/include/myprint.sh"
+include "cbuild/myprint.sh"
 
 function exec_script_line {
     local script="$1"
     local line_num="$2"
-    #true or false
     local quiet=$3
-
     myprint_quiet $quiet "${BLUE}reading line $line_num from $script"
     local line_str="$(sed $line_num'!d' $script)"
     if [ -z "$line_str" ]; then
@@ -17,28 +15,16 @@ function exec_script_line {
     eval "$line_str"
 }
 
-function replace_var_value_in_script(){
-    local script="$1"
-    local var_name="$2"
-    local new_value="$3"
-    
-    myprint "${BLUE}setting $var_name to ${CYAN}'$new_value' in '$script'"
-    cp "$script" "$script.tmp"
-    sed "s,$var_name=\".*\",$var_name=\"$new_value\",g" \
-        "$script.tmp" > "$script"
-    rm "$script.tmp"
-}
-
 function clean_dir {
     local dir="$1"
-	myprint "${BLUE}cleaning ${WHITE}'$dir'"
+	myprint "${WHITE}cleaning $dir"
     rm -rf "$dir"
     mkdir "$dir"
 }
 
 function delete_dir {
     local dir="$1"
-	myprint "${BLUE}deleting ${WHITE}'$dir'"
+	myprint "${WHITE}deleting $dir"
     rm -rf "$dir"
 }
 
@@ -46,16 +32,7 @@ function try_delete_dir_or_file {
     local path="$1"
     if [ -f "$path" ] || [ -d "$path" ]; then
         rm -rf "$path"
-        myprint "${BLUE}deleting ${WHITE}'$path'"
-    fi
-}
-
-file_copy_default_if_not_present(){
-    local file="$1"
-    local file_default="$2"
-    if [ ! -f "$file" ]; then
-        myprint "${YELLOW}creating default ${WHITE}'$file'"
-        cp -r "$file_default" "$file"
+        myprint "${WHITE}deleting $path"
     fi
 }
 
@@ -68,18 +45,18 @@ function exec_command {
 }
 
 function load_dependency_config {
-    local dep_conf_file="$1"
-    myprint "${BLUE}loading dependency config ${WHITE}'${dep_conf_file}'"
-    include "$dep_conf_file"
+    local dependency_config_file="$1"
+    myprint "${BLUE}loading dependency config ${WHITE}${dependency_config_file}${BLUE}"
+    include "$dependency_config_file"
 }
 
 # builds a dependency when $dep_out_files dont exist or rebuild task is executed
 function build_dependency {
     # path to *.config file
-    local dep_conf_file="$1"
+    local dependency_config_file="$1"
     # true or false
     local force_build="$2"
-    load_dependency_config "$dep_conf_file"
+    load_dependency_config "$dependency_config_file"
 
     local proj_root_dir="$(pwd)"
     myprint "${BLUE}entering dependency directory '${DEP_WORKING_DIR}'"
@@ -113,10 +90,10 @@ function build_dependency {
             if [ "$PRESERVE_OUT_DIRECTORY_STRUCTURE" = true ] && [ "$file_dir" != '.' ]; then
                 mkdir -p "$proj_root_dir/$OUTDIR/$file_dir"
                 mkdir -p "$proj_root_dir/$OBJDIR/dynamic_libs/$file_dir"
-                cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/$file"
+                cp -v "$file" "$proj_root_dir/$OUTDIR/$file"
                 ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/$file"
             else
-                cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/"
+                cp -v "$file" "$proj_root_dir/$OUTDIR/"
                 ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/"
             fi
         done
@@ -127,9 +104,9 @@ function build_dependency {
             if [ "$PRESERVE_OUT_DIRECTORY_STRUCTURE" = true ]; then
                 file_dir=$(dirname $file)
                 mkdir -p "$proj_root_dir/$OUTDIR/$file_dir"
-                cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/$file"
+                cp -v "$file" "$proj_root_dir/$OUTDIR/$file"
             else
-                cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/"
+                cp -v "$file" "$proj_root_dir/$OUTDIR/"
             fi
         done
     fi
@@ -137,8 +114,8 @@ function build_dependency {
         # creates symbolic link to each file in $OBJDIR/static_libs
         for file in $DEP_STATIC_OUT_FILES; do
             # doesnt return error if called not like this
-            real_file=$(realpath $file)
-            ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/static_libs/"
+            f=$(realpath $file)
+            ln -sfv $f "$proj_root_dir/$OBJDIR/static_libs"
         done
     fi
     
@@ -233,9 +210,7 @@ function pack_static_lib {
     fi
 
     local command="ar rcs $OUTDIR/$outfile  $objects"
-    print_hline "${GRAY}" "─"
-    myprint "${GRAY}$command"
-    print_hline "${GRAY}" "─"
+    myprint "$command"
     if $command
     then
         myprint "${GREEN}file $CYAN$outfile ${GREEN}created"
@@ -270,9 +245,7 @@ function link {
     done
 
     local command="$CMP_CPP $objects $static_libs $args $dynamic_libs_args -o $OUTDIR/$outfile"
-    print_hline "${GRAY}" "─"
-    myprint "${GRAY}$command"
-    print_hline "${GRAY}" "─"
+    myprint "$command"
     if $command
     then
         myprint "${GREEN}file $CYAN$outfile ${GREEN}created"

include/detect_os.sh

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-include "@cbuild/include/myprint.sh"
-
-function detect_os {
-    local uname_result="$(uname -o)"
-    case "$uname_result" in
-        Msys | Cygwin | MS/Windows)
-            safeprint WINDOWS
-            ;;
-        Linux | GNU/Linux | Android)
-            safeprint LINUX
-            ;;
-        FreeBSD)
-            safeprint FREEBSD
-            ;;
-        Darwin)
-            safeprint MACOS
-            ;;
-        *)
-            error "unknown operating system: $uname_result"
-            ;;
-    esac
-}
-
-function detect_arch {
-    local uname_result="$(uname -m)"
-    case "$uname_result" in
-        arm | arm32 | armhf | aarch32)
-            safeprint arm32
-            ;;
-        arm64 | aarch64 | aarch64_be | armv8b | armv8l)
-            safeprint arm64
-            ;;
-        x86 | i386 | i486 | i686)
-            safeprint x86
-            ;;
-        x64 | x86_64 | amd64)
-            safeprint x64
-            ;;
-        *)
-            error "unknown CPU architecture: $uname_result"
-            ;;
-    esac
-}

myprint.sh

@@ -18,11 +18,10 @@ function safeprint {
 
 # prints text with special characters and resets color
 function myprint {
-    printf "$@${GRAY}\n"
+    printf "${GRAY}$@${GRAY}\n"
 }
 
 function myprint_quiet {
-    #true or false
     local quiet=$1
     local text="$2"
     if [ "$quiet" != true ]; then

project.config.user.default

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# Project user config is ignored by git.
-# Here you can add variables that users might want to change
-# on their local machine, without commiting to the repository.
-
-# Directory where you install dependencies.
-# Do not confuse with DEPENDENCY_CONFIGS_DIR
-# Example:
-#    libexample source code is at `../libexample`, and dependency config
-#    that specifies how to build this lib is at `dependencies/libexample.config`
-DEPENDENCIES_DIR=".."

setup.sh

@@ -66,12 +66,9 @@ if [ -f "$bootstrap_install_path" ]; then
     local_bootstrap_version_int=$(echo $local_bootstrap_version | sed 's/\.//g')
     
     if [[ $local_bootstrap_version_int > $installed_bootstrap_version_int ]]; then
-        echo "Found outdated bootstrap.sh in '$CBUILD_INSTALL_DIR', updating"
         ln -sf "$(realpath $CBUILD_INSTALL_DIR/bootstrap.sh)" -T "$bootstrap_install_path"
     fi
 else
-    echo "Not found bootstrap.sh in '$CBUILD_INSTALL_DIR', installing"
     ln -sf "$(realpath $CBUILD_INSTALL_DIR/bootstrap.sh)" -T "$bootstrap_install_path"
 fi
-echo "Link bootstrap.sh to $CBUILD_BIN_DIR"
 ln -sf "$(realpath $bootstrap_install_path)" -T "$CBUILD_BIN_DIR/cbuild"