cbuild.sh

@@ -64,6 +64,11 @@ if [ $args_count -eq 0 ]; then
     print_help
 fi
 
+function get_next_arg {
+    i=$((i+1))
+    safeprint "${args[i]}"
+}
+
 while [ $i -lt $args_count ]
 do
     case "${args[i]}" in
@@ -76,12 +81,10 @@ do
             exit 0
             ;;
         '-c' | '--config')
-            i=$((i+1))
-            project_config_path="${args[i]}"
+            project_config_path="$(get_next_arg)"
             ;;
         '-n' | '--new-project')
-            i=$((i+1))
-            new_project_dir="${args[i]}"
+            new_project_dir="$(get_next_arg)"
             if [ -z "$new_project_dir" ]; then
                 new_project_dir="."
             fi

default_tasks/build_exec.sh

@@ -15,6 +15,6 @@ else
     done
 fi
 
-[ ! -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"
+compile_c "$C_ARGS" "$SRC_C"
+compile_cpp "$CPP_ARGS" "$SRC_CPP"
 link "$LINKER_ARGS" "$EXEC_FILE"

default_tasks/build_shared_lib.sh

@@ -2,6 +2,6 @@
 
 # delete old objects
 clean_dir "$OBJDIR/objects"
-[ ! -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"
+compile_c "$C_ARGS" "$SRC_C"
+compile_cpp "$CPP_ARGS" "$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"
-[ ! -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"
+compile_c "$C_ARGS" "$SRC_C"
+compile_cpp "$CPP_ARGS" "$SRC_CPP"
 pack_static_lib "$STATIC_LIB_FILE" 

functions.sh

@@ -116,16 +116,16 @@ function compile {
     print_hline "${BLUE}" "─"
 
     local cmp="$1"
-    local std="$2"
-    local warn="$3"
-    local args="$4"
-    local include="$5"
-    local sources="$6"
     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}sources: ${GRAY}$sources"
 	for srcfile in $sources
     do (
@@ -141,26 +141,14 @@ 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" "$std" "$warn" "$args" "$include" "$sources"
+    compile "$CMP_C" "$STD_C" "$WARN_C" "$1" "$INCLUDE" "$2"
 }
 
 # (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" "$std" "$warn" "$args" "$include" "$sources"
+    compile "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$1" "$INCLUDE" "$2"
 }
 
 # (outfile)
@@ -168,13 +156,8 @@ 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' ' ')"
     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
@@ -191,23 +174,16 @@ 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' ' ')"
     myprint "${BLUE}objects: ${GRAY}$objects"
-    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' ' ')"
     myprint "${BLUE}dynamic libraries: ${GRAY}$dynamic_libs"
     local dynamic_libs_args="-L $OBJDIR/dynamic_libs"
     for lib in $dynamic_libs; do
         dynamic_libs_args="$dynamic_libs_args -l:$lib"
     done
-
     local command="$CMP_CPP $objects $static_libs $args $dynamic_libs_args -o $OUTDIR/$outfile"
     myprint "$command"
     if $command