v2.2.1

CBUILD_VERSION

@@ -0,0 +1 @@
+2.2.1

CHANGELOG.md

@@ -1,24 +1,46 @@
-# v2.1.1
-+ removed `TESTS_C` and `TESTS_CPP`
+## 2.2.1
++ updated `bootsrap.sh` to 1.0.2
 
-# v2.1.0
+## 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
++ added `-Wl,-rpath` argument generation in `link()`. It forces ld to link to local shared library in `OUTDIR`
+
+## 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
++ changed compile_c and compile_cpp functions
++ bootstrap now can print help and list of installed versions 
+
+## v2.1.1
++ **config**: removed `TESTS_C` and `TESTS_CPP` compilation
+
+## 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: 
@@ -31,7 +53,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`
@@ -40,7 +62,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`
@@ -49,7 +71,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`

README.md

@@ -1,23 +1,31 @@
 # cbuild
-My C/C++ build system written in bash.
+My C/C++ build system written in sh.
 
 
 ## Installation
-```bash
-git clone https://timerix.ddns.net:3322/cbuild.git
+```sh
+git clone https://timerix.ddns.net:3322/Timerix/cbuild.git
 cd cbuild
 sudo ./setup.sh 
 ```
+Can be installed to `~/.local/` if you have no root rights.
+- ```sh
+  ./setup.sh --local
+  ```
+- Then add `~/.local/bin` to `PATH` in your shell config.
 
 ## Usage
 1. Initialize cbuild project in some directory:
-    ```bash
+    ```sh
     cd some_project
     cbuild --new-project
     ```
-
-2. Edit `default.config`.
+2. Edit `project.config`.
 3. Call some tasks:
-    ```bash
+    ```sh
     cbuild build_exec_dbg exec
     ```
+P.S. See help
+```sh
+cbuild -h
+```

bootstrap.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-CBUILD_BOOTSTRAP_VERSION=1.0.0
+CBUILD_BOOTSTRAP_VERSION=1.0.2
 set -eo pipefail
 
 function version_parse {
@@ -29,29 +29,57 @@ function exec_script_line {
     eval "$line_str"
 }
 
+function print_version_list {
+    dir_local="$HOME/.local/share/cbuild"
+    dir_global="/usr/local/share/cbuild"
+    files=""
+    if [ -d "$dir_local" ]; then
+        files+=$(find "$dir_local" -maxdepth 2 -name 'CBUILD_VERSION')
+    fi
+    if [ -d "$dir_global" ]; then
+        files+=$(find "$dir_global" -maxdepth 2 -name 'CBUILD_VERSION')
+    fi
+    for f in $files; do
+        cat $f
+        echo "  at $(dirname $f)"
+    done | sort -V
+}
+
+function print_help {
+    echo "cbuild-bootstrap v$CBUILD_BOOTSTRAP_VERSION"
+    echo "Script that launches a specific cbuild version selected by user or defined in a project config."
+    echo "Usage: cbuild [OPTIONS]"
+    echo "Options:"
+    echo "    -h, --help         Show this message"
+    echo "    -v, --version      Shows version"
+    echo "    -c, --config FILE  Set project config file path (default=./project.config)"
+    echo "    --list-versions    Shows list of installed cbuild versions"
+}
+
 # parse command line arguments
 project_config_path="./project.config"
 args=($@)
 args_count=${#args[@]}
 i=0
-
-function get_next_arg {
-    i=$((i+1))
-    safeprint "${args[i]}"
-}
-
+if [ $args_count -eq 0 ]; then
+    print_help
+fi
 while [ $i -lt $args_count ]
 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
+            exit 0
             ;;
         '-c' | '--config')
-            project_config_path="$(get_next_arg)"
-            ;;
-        '-n' | '--new-project')
-            echo "enter project cbuild version (example: 2.1.0)"
-            read -r CBUILD_VERSION
+            i=$((i+1))
+            project_config_path="${args[i]}"
             ;;
         *)
             ;;
@@ -59,9 +87,21 @@ do
     i=$((i+1))
 done
 
-# read version from project config if not specified
 if [ -z "$CBUILD_VERSION" ]; then
+    if [ -f "$project_config_path" ]; then
+        # read version from project config
         exec_script_line "$project_config_path" 2
+    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)
+        latest_version=$(echo "$versions" | tail -n 1)
+        echo "select version (default=$latest_version):"
+        read -r CBUILD_VERSION
+        [ -z "$CBUILD_VERSION" ] && CBUILD_VERSION=$latest_version
+    fi
 fi
 
 version_parse "$CBUILD_VERSION"
@@ -81,5 +121,6 @@ if [ -f "$LOG_FILE" ]; then
         -e 's/\[[0-9]m//g' \
         -e 's/  H  //g' \
         -e 's/\[3gH  //g' \
-        -i "$LOG_FILE"
+        "$LOG_FILE" > "$LOG_FILE.clean"
+    mv "$LOG_FILE.clean" "$LOG_FILE"
 fi

cbuild.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-INSTALLED_CBUILD_VERSION=2.1.1
+INSTALLED_CBUILD_VERSION=2.2.1
 
 # set \t size to 4 spaces
 tabs 4
@@ -47,11 +47,12 @@ include "cbuild/config.sh"
 function print_help {
     myprint "cbuild v$INSTALLED_CBUILD_VERSION"
     myprint "C/C++ project build system written in bash."
-    myprint "Usage: cbuild [OPTIONS] [TASK]"
+    myprint "Usage: cbuild [OPTIONS] [TASKS]"
+    myprint "Options:"
     myprint "    -h, --help               Show this message"
     myprint "    -v, --version            Shows version"
-    myprint "    -n, --new-project  [PROJ_DIR]  Initialize new cbuild project directory (default=./)"
     myprint "    -c, --config FILE        Set project config file path (default=./project.config)"
+    myprint "    -n, --new-project [DIR]  Initialize new cbuild project directory (default=./)"
 }
 
 # parse command line arguments
@@ -62,13 +63,9 @@ selected_tasks_array=()
 i=0
 if [ $args_count -eq 0 ]; then
     print_help
+    exit 1
 fi
 
-function get_next_arg {
-    i=$((i+1))
-    safeprint "${args[i]}"
-}
-
 while [ $i -lt $args_count ]
 do
     case "${args[i]}" in
@@ -81,24 +78,41 @@ do
             exit 0
             ;;
         '-c' | '--config')
-            project_config_path="$(get_next_arg)"
+            i=$((i+1))
+            project_config_path="${args[i]}"
             ;;
         '-n' | '--new-project')
-            new_project_dir="$(get_next_arg)"
+            i=$((i+1))
+            new_project_dir="${args[i]}"
             if [ -z "$new_project_dir" ]; then
                 new_project_dir="."
+            else
+                mkdir -p "$new_project_dir"
             fi
-            if ask_yn "create default cbuild project config?"; then
+
+            # create project config
             project_config_path="$new_project_dir/project.config"
-                cp "$CBUILD_INSTALL_DIR/default.config" "$project_config_path"
+            cp "$CBUILD_INSTALL_DIR/default.config" "$project_config_path.temp"
             myprint "Enter project name: "
             read -r project_name
-                sed -i "s,\%PROJECT_NAME\%,$project_name,g" "$project_config_path"
+            sed "s,\%PROJECT_NAME\%,$project_name,g" \
+                "$project_config_path.temp" > "$project_config_path"
+            rm "$project_config_path.temp"
             myprint "${GREEN}created config at '$project_config_path'"
-            fi
+
             if ask_yn "Copy default .gitignore?"; then
-                cp "$CBUILD_INSTALL_DIR/.gitignore" "$new_project_dir/"
+                cp -v "$CBUILD_INSTALL_DIR/.gitignore" "$new_project_dir/"
             fi
+
+            if ask_yn "Copy default .vscode launch tasks?"; then
+                new_project_vscode_dir="$new_project_dir/.vscode"
+                mkdir -p "$new_project_vscode_dir"
+                cp -vr "$CBUILD_INSTALL_DIR/default_vscode/"* "$new_project_vscode_dir/"
+                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"
+            fi
+
             exit 0
             ;;
         *)

config.sh

@@ -9,7 +9,7 @@ function load_config {
     TASK="$2"
     local quiet=$3
 
-    myprint "${BLUE}loading config '$(realpath $project_config_path)'"
+    myprint "${BLUE}loading config ${WHITE}'$(realpath $project_config_path)'"
 
     if [ -z "$project_config_path" ]; then
         error "config path is null"
@@ -19,6 +19,7 @@ function load_config {
     fi
 
     OS=$(detect_os)
+    ARCH=$(detect_arch)
     myprint_quiet $quiet "${GREEN}detected OS: $OS"
 
     # getting version of cbuild installation

default.config

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-CBUILD_VERSION=2.1.1
-CONFIG_VERSION=1
+CBUILD_VERSION=2.2.1
 
 PROJECT="%PROJECT_NAME%"
 CMP_C="gcc"
@@ -32,13 +31,16 @@ case "$OS" in
     WINDOWS)
         EXEC_FILE="$PROJECT.exe"
         SHARED_LIB_FILE="$PROJECT.dll"
-        # example: "-I./"
+        # example: "-I./dependencies/include/SDL2"
         INCLUDE=""
+        # example: "-lSDL2 -lSDL2_image"
+        LINKER_LIBS=""
         ;;
     LINUX)
         EXEC_FILE="$PROJECT"
         SHARED_LIB_FILE="$PROJECT.so"
         INCLUDE=""
+        LINKER_LIBS=""
         ;;
     *)
         error "operating system $OS has no configuration variants"
@@ -57,7 +59,7 @@ 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_ARGS="$CPP_ARGS $LINKER_LIBS"
         PRE_TASK_SCRIPT=
         TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
         POST_TASK_SCRIPT=
@@ -66,7 +68,7 @@ case "$TASK" in
     build_exec_dbg)
         C_ARGS="-O0 -g3"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS"
+        LINKER_ARGS="$CPP_ARGS $LINKER_LIBS"
         PRE_TASK_SCRIPT=
         TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
         POST_TASK_SCRIPT=
@@ -75,7 +77,7 @@ case "$TASK" in
     build_shared_lib)
         C_ARGS="-O2 -fpic -flto -shared"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS -Wl,-soname,$SHARED_LIB_FILE"
+        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=
@@ -84,7 +86,7 @@ case "$TASK" in
     build_shared_lib_dbg)
         C_ARGS="-O0 -g3 -fpic -shared"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_ARGS -Wl,-soname,$SHARED_LIB_FILE"
+        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=
@@ -111,7 +113,7 @@ case "$TASK" in
         ;;
     # 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" 
+        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
@@ -125,7 +127,7 @@ 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_ARGS="$CPP_ARGS $LINKER_LIBS"
         PRE_TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
         TASK_SCRIPT=cbuild/default_tasks/profile.sh
         POST_TASK_SCRIPT=
@@ -138,7 +140,7 @@ 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 -pg"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_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=
@@ -152,7 +154,7 @@ 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_ARGS="$CPP_ARGS $LINKER_LIBS"
         PRE_TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
         TASK_SCRIPT=cbuild/default_tasks/callgrind.sh
         POST_TASK_SCRIPT=
@@ -162,7 +164,7 @@ case "$TASK" in
         OUTDIR="$OUTDIR/sanitize"
         C_ARGS="-O0 -g3 -fsanitize=undefined,address"
         CPP_ARGS="$C_ARGS"
-        LINKER_ARGS="$CPP_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=

default_tasks/build_exec.sh

@@ -15,6 +15,6 @@ else
     done
 fi
 
-compile_c "$C_ARGS" "$SRC_C"
-compile_cpp "$CPP_ARGS" "$SRC_CPP"
+[ ! -z "$SRC_C" ] && compile_c "$CMP_C" "$STD_C" "$WARN_C" "$C_ARGS" "$INCLUDE" "$SRC_C"
+[ ! -z "$SRC_CPP" ] && compile_cpp "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$CPP_ARGS" "$INCLUDE" "$SRC_CPP"
 link "$LINKER_ARGS" "$EXEC_FILE"

default_tasks/build_shared_lib.sh

@@ -2,6 +2,6 @@
 
 # delete old objects
 clean_dir "$OBJDIR/objects"
-compile_c "$C_ARGS" "$SRC_C"
-compile_cpp "$CPP_ARGS" "$SRC_CPP"
+[ ! -z "$SRC_C" ] && compile_c "$CMP_C" "$STD_C" "$WARN_C" "$C_ARGS" "$INCLUDE" "$SRC_C"
+[ ! -z "$SRC_CPP" ] && compile_cpp "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$CPP_ARGS" "$INCLUDE" "$SRC_CPP"
 link "$LINKER_ARGS" "$SHARED_LIB_FILE"

default_tasks/build_static_lib.sh

@@ -2,6 +2,6 @@
 
 # delete old objects
 clean_dir "$OBJDIR/objects"
-compile_c "$C_ARGS" "$SRC_C"
-compile_cpp "$CPP_ARGS" "$SRC_CPP"
+[ ! -z "$SRC_C" ] && compile_c "$CMP_C" "$STD_C" "$WARN_C" "$C_ARGS" "$INCLUDE" "$SRC_C"
+[ ! -z "$SRC_CPP" ] && compile_cpp "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$CPP_ARGS" "$INCLUDE" "$SRC_CPP"
 pack_static_lib "$STATIC_LIB_FILE" 

default_vscode/.gitignore

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

default_vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    "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

@@ -0,0 +1,31 @@
+
+{
+    "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

@@ -3,9 +3,9 @@
 include "cbuild/myprint.sh"
 
 function detect_os {
-    local uname_rezult="$(uname -o)"
-    # myprint "uname rezult: '$uname_rezult'"
-    case "$uname_rezult" in
+    local uname_result="$(uname -o)"
+    # myprint "uname result: '$uname_result'"
+    case "$uname_result" in
         Msys | Cygwin | MS/Windows)
             safeprint WINDOWS
             ;;
@@ -19,7 +19,28 @@ function detect_os {
             safeprint MACOS
             ;;
         *)
-            error "unknown operating system: $uname_rezult"
+            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
 }

example_dependency_configs/libexample1.config

@@ -6,5 +6,8 @@ DEP_POST_BUILD_COMMAND=''
 DEP_CLEAN_COMMAND='make clean'
 # won't be copied to project $OUTDIR
 DEP_STATIC_OUT_FILES='libexample1.a libexample1_addon.a'
-# will be copied tp project $OUTDIR
+PRESERVE_OUT_DIRECTORY_STRUCTURE=false;
+# will be copied to project $OUTDIR
 DEP_DYNAMIC_OUT_FILES='libexample1.config.json'
+# will be copied to project $OUTDIR
+DEP_OTHER_OUT_FILES=''

example_dependency_configs/libexample2.config

@@ -4,14 +4,17 @@ DEP_PRE_BUILD_COMMAND=''
 DEP_POST_BUILD_COMMAND=''
 DEP_CLEAN_COMMAND='make clean'
 DEP_STATIC_OUT_FILES=''
+DEP_OTHER_OUT_FILES=''
 case $OS in
     WINDOWS)
-        DEP_BUILD_COMMAND='make libexample2.dll'
-        DEP_DYNAMIC_OUT_FILES='libexample2.dll'
+        DEP_BUILD_COMMAND='make libexample2.dll && mkdir -p win-x64 && mv libexample.dll win-x64'
+        DEP_DYNAMIC_OUT_FILES='win-x64/libexample2.dll'
+        PRESERVE_OUT_DIRECTORY_STRUCTURE=true # library will be copied to $OUTDIR/win-x64
         ;;
     LINUX)
-        DEP_BUILD_COMMAND='make libexample2.so'
-        DEP_DYNAMIC_OUT_FILES='libexample2.so'
+        DEP_BUILD_COMMAND='make libexample2.so && mkdir -p linux-x64 && mv libexample.so linux-x64'
+        DEP_DYNAMIC_OUT_FILES='linux-x64/libexample2.so'
+        PRESERVE_OUT_DIRECTORY_STRUCTURE=true # library will be copied to $OUTDIR/linux-x64
         ;;
     *)
         error "operating system $OS has no configuration variants"

functions.sh

@@ -64,7 +64,7 @@ function build_dependency {
 
     local build_needed="$force_build"
     if [ "$build_needed" != true ]; then
-        for file in $DEP_STATIC_OUT_FILES $DEP_DYNAMIC_OUT_FILES; do
+        for file in $DEP_STATIC_OUT_FILES $DEP_DYNAMIC_OUT_FILES $DEP_OTHER_OUT_FILES; do
             if [ ! -f "$file" ]; then
                 myprint "${GRAY}missing file '$file'"
                 local build_needed=true
@@ -82,21 +82,55 @@ function build_dependency {
     fi
 
     if [ ! -z "$DEP_DYNAMIC_OUT_FILES" ]; then
-        # copy each file to $OUTDIR
-        cp -rv $DEP_DYNAMIC_OUT_FILES "$proj_root_dir/$OUTDIR"
-        # symlink each file to $OBJDIR/dynamic_libs
+        # copies each file to $OUTDIR and creates symbolic link in $OBJDIR/dynamic_libs
         for file in $DEP_DYNAMIC_OUT_FILES; do
-            ln -sfv $(realpath $file) "$proj_root_dir/$OBJDIR/dynamic_libs"
+            # doesnt return error if called not like this
+            real_file=$(realpath $file)
+            file_dir=$(dirname $file)
+            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 "$file" "$proj_root_dir/$OUTDIR/$file"
+                ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/$file"
+            else
+                cp -v "$file" "$proj_root_dir/$OUTDIR/"
+                ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/"
+            fi
+        done
+    fi
+    if [ ! -z "$DEP_OTHER_OUT_FILES" ]; then
+        # copies each file to $OUTDIR
+        for file in $DEP_OTHER_OUT_FILES; do
+            if [ "$PRESERVE_OUT_DIRECTORY_STRUCTURE" = true ]; then
+                file_dir=$(dirname $file)
+                mkdir -p "$proj_root_dir/$OUTDIR/$file_dir"
+                cp -v "$file" "$proj_root_dir/$OUTDIR/$file"
+            else
+                cp -v "$file" "$proj_root_dir/$OUTDIR/"
+            fi
         done
     fi
     if [ ! -z "$DEP_STATIC_OUT_FILES" ]; then
-        # symlink each file to $OBJDIR/static_libs
+        # creates symbolic link to each file in $OBJDIR/static_libs
         for file in $DEP_STATIC_OUT_FILES; do
-            ln -sfv $(realpath $file) "$proj_root_dir/$OBJDIR/static_libs"
+            # doesnt return error if called not like this
+            f=$(realpath $file)
+            ln -sfv $f "$proj_root_dir/$OBJDIR/static_libs"
         done
     fi
     
     cd "$proj_root_dir"
+
+    # unsed all dependency config variables to not mess with next dependencies
+    unset DEP_WORKING_DIR
+    unset DEP_PRE_BUILD_COMMAND
+    unset DEP_BUILD_COMMAND
+    unset DEP_POST_BUILD_COMMAND
+    unset DEP_CLEAN_COMMAND
+    unset DEP_STATIC_OUT_FILES
+    unset PRESERVE_OUT_DIRECTORY_STRUCTURE
+    unset DEP_DYNAMIC_OUT_FILES
+    unset DEP_OTHER_OUT_FILES
 }
 
 function build_dependencies {
@@ -116,16 +150,16 @@ function compile {
     print_hline "${BLUE}" "─"
 
     local cmp="$1"
-    myprint "${BLUE}compiler: ${GRAY}$cmp"
     local std="$2"
-    myprint "${BLUE}standard: ${GRAY}$std"
     local warn="$3"
-    myprint "${BLUE}warnings: ${GRAY}$warn"
     local args="$4"
-    myprint "${BLUE}args: ${GRAY}$args"
     local include="$5"
-    myprint "${BLUE}include dirs: ${GRAY}$include"
     local sources="$6"
+    myprint "${BLUE}compiler: ${GRAY}$cmp"
+    myprint "${BLUE}standard: ${GRAY}$std"
+    myprint "${BLUE}warnings: ${GRAY}$warn"
+    myprint "${BLUE}args: ${GRAY}$args"
+    myprint "${BLUE}include dirs: ${GRAY}$include"
     myprint "${BLUE}sources: ${GRAY}$sources"
 	for srcfile in $sources
     do (
@@ -141,14 +175,26 @@ function compile {
 
 # (args, sources)
 function compile_c {
+    local cmp="$1"
+    local std="$2"
+    local warn="$3"
+    local args="$4"
+    local include="$5"
+    local sources="$6"
     print_header "${CYAN}" "─" "$PROJECT/$TASK/compile_c"
-    compile "$CMP_C" "$STD_C" "$WARN_C" "$1" "$INCLUDE" "$2"
+    compile "$cmp" "$std" "$warn" "$args" "$include" "$sources"
 }
 
 # (args, sources)
 function compile_cpp {
+    local cmp="$1"
+    local std="$2"
+    local warn="$3"
+    local args="$4"
+    local include="$5"
+    local sources="$6"
     print_header "${CYAN}" "─" "$PROJECT/$TASK/compile_cpp"
-    compile "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$1" "$INCLUDE" "$2"
+    compile "$cmp" "$std" "$warn" "$args" "$include" "$sources"
 }
 
 # (outfile)
@@ -156,8 +202,13 @@ function pack_static_lib {
     print_header "${CYAN}" "─" "$PROJECT/$TASK/pack_static_lib"
     local outfile="$1"
     myprint "${BLUE}outfile: ${GRAY}$outfile"
-    local objects="$(find $OBJDIR/objects -type f,l | tr '\n' ' ')"
+    
+    local objects=$(find $OBJDIR/objects -type f,l | tr '\n' ' ')
     myprint "${BLUE}objects: ${GRAY}$objects"
+    if [ -z "$objects" ]; then
+        error "no compiled objects found"
+    fi
+
     local command="ar rcs $OUTDIR/$outfile  $objects"
     myprint "$command"
     if $command
@@ -166,6 +217,7 @@ function pack_static_lib {
     else
         error "some error happened"
     fi
+    clean_dir "$OBJDIR/objects"
 }
 
 function link {
@@ -174,16 +226,24 @@ function link {
     local outfile="$2"
     myprint "${BLUE}args: ${GRAY}$args"
     myprint "${BLUE}outfile: ${GRAY}$outfile"
-    local objects="$(find $OBJDIR/objects -type f,l | tr '\n' ' ')"
+
+    local objects=$(find $OBJDIR/objects -type f,l | tr '\n' ' ')
     myprint "${BLUE}objects: ${GRAY}$objects"
-    local static_libs="$(find $OBJDIR/static_libs -type f,l | tr '\n' ' ')"
+    if [ -z "$objects" ]; then
+        error "no compiled objects found"
+    fi
+
+    local static_libs=$(find $OBJDIR/static_libs -type f,l | tr '\n' ' ')
     myprint "${BLUE}static libraries: ${GRAY}$static_libs"
-    local dynamic_libs="$(find $OBJDIR/dynamic_libs -type f,l | tr '\n' ' ')"
+
+    local dynamic_libs=$(find $OBJDIR/dynamic_libs -type f,l | tr '\n' ' '\
+        | sed "s,$OBJDIR/dynamic_libs/,,g")
     myprint "${BLUE}dynamic libraries: ${GRAY}$dynamic_libs"
-    local dynamic_libs_args="-L $OBJDIR/dynamic_libs"
+    local dynamic_libs_args="-L./$OBJDIR/dynamic_libs -Wl,-Bdynamic"
     for lib in $dynamic_libs; do
-        dynamic_libs_args="$dynamic_libs_args -l:$lib"
+        dynamic_libs_args="$dynamic_libs_args -Wl,-rpath=$(dirname $lib) -l:$lib"
     done
+
     local command="$CMP_CPP $objects $static_libs $args $dynamic_libs_args -o $OUTDIR/$outfile"
     myprint "$command"
     if $command
@@ -192,4 +252,5 @@ function link {
     else
         error "some error happened"
     fi
+    clean_dir "$OBJDIR/objects"
 }

setup.sh

@@ -4,7 +4,7 @@
 
 # exit on errors
 set -xeo pipefail
-CBUILD_VERSION=2.1.1
+CBUILD_VERSION=$(<CBUILD_VERSION)
 
 function version_parse {
     local value="$1"