From 881764061a019e9484970e530cb437a892f99007 Mon Sep 17 00:00:00 2001 From: timerix Date: Fri, 9 Sep 2022 20:38:21 +0600 Subject: [PATCH] clear_dir moved to init.sh --- default_tasks/build_exec.sh | 2 -- default_tasks/build_exec_dbg.sh | 2 -- default_tasks/build_shared_lib.sh | 2 -- default_tasks/build_shared_lib_dbg.sh | 2 -- default_tasks/build_static_lib.sh | 2 -- default_tasks/build_static_lib_dbg.sh | 2 -- init.sh | 3 +++ 7 files changed, 3 insertions(+), 12 deletions(-) diff --git a/default_tasks/build_exec.sh b/default_tasks/build_exec.sh index f3170d2..69945a6 100644 --- a/default_tasks/build_exec.sh +++ b/default_tasks/build_exec.sh @@ -3,8 +3,6 @@ source cbuild/init.sh print "${CYAN}=============[build_exec]=============\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_EXEC_C_ARGS" "$SRC_C $TESTS_C" compile_cpp "$BUILD_EXEC_CPP_ARGS" "$SRC_CPP $TESTS_CPP" link "$BUILD_EXEC_CPP_ARGS $BUILD_EXEC_LINKER_ARGS" "$EXEC_FILE" diff --git a/default_tasks/build_exec_dbg.sh b/default_tasks/build_exec_dbg.sh index 025c3ec..ac123de 100644 --- a/default_tasks/build_exec_dbg.sh +++ b/default_tasks/build_exec_dbg.sh @@ -3,8 +3,6 @@ source cbuild/init.sh print "${CYAN}===========[build_exec_dbg]===========\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_EXEC_DBG_C_ARGS" "$SRC_C $TESTS_C" compile_cpp "$BUILD_EXEC_DBG_CPP_ARGS" "$SRC_CPP $TESTS_CPP" link "$BUILD_EXEC_DBG_CPP_ARGS $BUILD_EXEC_DBG_LINKER_ARGS" "$EXEC_FILE" diff --git a/default_tasks/build_shared_lib.sh b/default_tasks/build_shared_lib.sh index c533413..8f8ab75 100644 --- a/default_tasks/build_shared_lib.sh +++ b/default_tasks/build_shared_lib.sh @@ -3,8 +3,6 @@ source cbuild/init.sh print "${CYAN}==========[build_shared_lib]==========\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_SHARED_LIB_C_ARGS" "$SRC_C" compile_cpp "$BUILD_SHARED_LIB_CPP_ARGS" "$SRC_CPP" link "$BUILD_SHARED_LIB_CPP_ARGS $BUILD_SHARED_LIB_LINKER_ARGS" "$SHARED_LIB_FILE" diff --git a/default_tasks/build_shared_lib_dbg.sh b/default_tasks/build_shared_lib_dbg.sh index cba8c66..1b05a2b 100644 --- a/default_tasks/build_shared_lib_dbg.sh +++ b/default_tasks/build_shared_lib_dbg.sh @@ -3,8 +3,6 @@ source cbuild/init.sh print "${CYAN}========[build_shared_lib_dbg]========\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_SHARED_LIB_DBG_C_ARGS" "$SRC_C" compile_cpp "$BUILD_SHARED_LIB_DBG_CPP_ARGS" "$SRC_CPP" link "$BUILD_SHARED_LIB_DBG_CPP_ARGS $BUILD_SHARED_LIB_DBG_LINKER_ARGS" "$SHARED_LIB_FILE" diff --git a/default_tasks/build_static_lib.sh b/default_tasks/build_static_lib.sh index 8aa9675..225ea63 100644 --- a/default_tasks/build_static_lib.sh +++ b/default_tasks/build_static_lib.sh @@ -3,8 +3,6 @@ source cbuild/init.sh print "${CYAN}==========[build_static_lib]==========\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_STATIC_LIB_C_ARGS" "$SRC_C" compile_cpp "$BUILD_STATIC_LIB_CPP_ARGS" "$SRC_CPP" pack_static_lib "$STATIC_LIB_FILE" diff --git a/default_tasks/build_static_lib_dbg.sh b/default_tasks/build_static_lib_dbg.sh index 3d4cee9..433c0ff 100644 --- a/default_tasks/build_static_lib_dbg.sh +++ b/default_tasks/build_static_lib_dbg.sh @@ -3,8 +3,6 @@ source cbuild/init.sh print "${CYAN}==========[build_static_lib_dbg]==========\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_STATIC_LIB_DBG_C_ARGS" "$SRC_C" compile_cpp "$BUILD_STATIC_LIB_DBG_CPP_ARGS" "$SRC_CPP" pack_static_lib "$STATIC_LIB_FILE" diff --git a/init.sh b/init.sh index 6ef7007..b2c9921 100644 --- a/init.sh +++ b/init.sh @@ -19,6 +19,9 @@ fi source .config +clear_dir $OBJDIR +clear_dir $OUTDIR + #pre_build if [ -f "$PRE_BUILD_SCRIPT" ]; then print "${BLUE}executing $PRE_BUILD_SCRIPT"