v2.2.4

.gitattributes

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

CBUILD_VERSION

@@ -1 +1 @@
-2.2.0
+2.2.4

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2.2.4
++ **default config**: C standard changed to C99
++ **default config**: enabled more warnings
+
+## 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

bootstrap.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-CBUILD_BOOTSTRAP_VERSION=1.0.1
+CBUILD_BOOTSTRAP_VERSION=1.0.3
 set -eo pipefail
 
 function version_parse {
@@ -34,13 +34,14 @@ function print_version_list {
     dir_global="/usr/local/share/cbuild"
     files=""
     if [ -d "$dir_local" ]; then
-        files+="$(find $dir_local -name 'CBUILD_VERSION')"
+        files+=$(find "$dir_local" -maxdepth 2 -name 'CBUILD_VERSION')
     fi
     if [ -d "$dir_global" ]; then
-        files+="$(find $dir_global -name 'CBUILD_VERSION')"
+        files+=$(find "$dir_global" -maxdepth 2 -name 'CBUILD_VERSION')
     fi
     for f in $files; do
-        cat $f | sed '$a\'
+        cat $f
+        echo "  at $(dirname $f)"
     done | sort -V
 }
 
@@ -68,6 +69,9 @@ 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
@@ -76,10 +80,6 @@ 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:"
-        versions=$(print_version_list)
-
-        echo "$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

cbuild.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-INSTALLED_CBUILD_VERSION=2.2.0
+INSTALLED_CBUILD_VERSION=2.2.4
 
 # set \t size to 4 spaces
 tabs 4

default.config

@@ -1,13 +1,22 @@
 #!/usr/bin/env bash
-CBUILD_VERSION=2.2.0
+CBUILD_VERSION=2.2.4
 
 PROJECT="%PROJECT_NAME%"
 CMP_C="gcc"
 CMP_CPP="g++"
-STD_C="c11"
+STD_C="c99"
 STD_CPP="c++11"
-WARN_C="-Wall -Wno-discarded-qualifiers -Wextra -Wno-unused-parameter"
-WARN_CPP="-Wall -Wextra -Wno-unused-parameter"
+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"
 SRC_C="$(find src -name '*.c')"
 SRC_CPP="$(find src -name '*.cpp')"
 
@@ -26,20 +35,22 @@ OBJDIR="obj"
 OUTDIR="bin"
 STATIC_LIB_FILE="lib$PROJECT.a"
 
+# example: "-I./dependencies/include/SDL2"
+INCLUDE=""
+
 # OS-specific options
 case "$OS" in
     WINDOWS)
         EXEC_FILE="$PROJECT.exe"
         SHARED_LIB_FILE="$PROJECT.dll"
-        # example: "-I./dependencies/include/SDL2"
-        INCLUDE=""
+        INCLUDE="$INCLUDE "
         # example: "-lSDL2 -lSDL2_image"
         LINKER_LIBS=""
         ;;
     LINUX)
         EXEC_FILE="$PROJECT"
         SHARED_LIB_FILE="$PROJECT.so"
-        INCLUDE=""
+        INCLUDE="$INCLUDE "
         LINKER_LIBS=""
         ;;
     *)

example_dependency_configs/libexample1.config

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-DEP_WORKING_DIR='depencencies/libexample1'
+DEP_WORKING_DIR='dependencies/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='depencencies/libexample2'
+DEP_WORKING_DIR='dependencies/libexample2'
 DEP_PRE_BUILD_COMMAND=''
 DEP_POST_BUILD_COMMAND=''
 DEP_CLEAN_COMMAND='make clean'

functions.sh

@@ -90,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 "$file" "$proj_root_dir/$OUTDIR/$file"
+                cp -v -u --preserve=timestamps "$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/"
+                cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/"
                 ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/"
             fi
         done
@@ -104,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 "$file" "$proj_root_dir/$OUTDIR/$file"
+                cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/$file"
             else
-                cp -v "$file" "$proj_root_dir/$OUTDIR/"
+                cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/"
             fi
         done
     fi