Timerix/cbuild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

changed compile_c and compile_cpp functions

Browse Source
This commit is contained in:
Timerix 2024-07-21 01:55:55 +03:00
parent 91dfc8bc74
commit c5f8f6ee09
4 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default_tasks/build_exec.sh
View File

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

4
default_tasks/build_shared_lib.sh
View File

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

4
default_tasks/build_static_lib.sh
View File

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

38
functions.sh
View File

@ -116,16 +116,16 @@ function compile {
print_hline "${BLUE}" "─" print_hline "${BLUE}" "─"
local cmp="$1" local cmp="$1"
myprint "${BLUE}compiler: ${GRAY}$cmp"
local std="$2" local std="$2"
myprint "${BLUE}standard: ${GRAY}$std"
local warn="$3" local warn="$3"
myprint "${BLUE}warnings: ${GRAY}$warn"
local args="$4" local args="$4"
myprint "${BLUE}args: ${GRAY}$args"
local include="$5" local include="$5"
myprint "${BLUE}include dirs: ${GRAY}$include"
local sources="$6" 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" myprint "${BLUE}sources: ${GRAY}$sources"
for srcfile in $sources for srcfile in $sources
do ( do (
@ -141,14 +141,26 @@ function compile {
# (args, sources) # (args, sources)
function compile_c { 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" 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) # (args, sources)
function compile_cpp { 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" 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) # (outfile)
@ -156,8 +168,13 @@ function pack_static_lib {
print_header "${CYAN}" "─" "$PROJECT/$TASK/pack_static_lib" print_header "${CYAN}" "─" "$PROJECT/$TASK/pack_static_lib"
local outfile="$1" local outfile="$1"
myprint "${BLUE}outfile: ${GRAY}$outfile" 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" myprint "${BLUE}objects: ${GRAY}$objects"
if [ -z "$objects" ]; then
error "no compiled objects found"
fi
local command="ar rcs $OUTDIR/$outfile $objects" local command="ar rcs $OUTDIR/$outfile $objects"
myprint "$command" myprint "$command"
if $command if $command
@ -174,16 +191,23 @@ function link {
local outfile="$2" local outfile="$2"
myprint "${BLUE}args: ${GRAY}$args" myprint "${BLUE}args: ${GRAY}$args"
myprint "${BLUE}outfile: ${GRAY}$outfile" 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" 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' ' ')" local static_libs="$(find $OBJDIR/static_libs -type f,l | tr '\n' ' ')"
myprint "${BLUE}static libraries: ${GRAY}$static_libs" 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' ' ')"
myprint "${BLUE}dynamic libraries: ${GRAY}$dynamic_libs" myprint "${BLUE}dynamic libraries: ${GRAY}$dynamic_libs"
local dynamic_libs_args="-L $OBJDIR/dynamic_libs" local dynamic_libs_args="-L $OBJDIR/dynamic_libs"
for lib in $dynamic_libs; do for lib in $dynamic_libs; do
dynamic_libs_args="$dynamic_libs_args -l:$lib" dynamic_libs_args="$dynamic_libs_args -l:$lib"
done done
local command="$CMP_CPP $objects $static_libs $args $dynamic_libs_args -o $OUTDIR/$outfile" local command="$CMP_CPP $objects $static_libs $args $dynamic_libs_args -o $OUTDIR/$outfile"
myprint "$command" myprint "$command"
if $command if $command