diff --git a/.gitignore b/.gitignore index c35f56d..dfb62a9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,4 @@ obj/ .editorconfig *.user *.vcxproj.filters -.config -deps/kerep.a \ No newline at end of file +.config \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5ae58c5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "kerep"] + path = kerep + url = https://github.com/Timerix22/kerep.git diff --git a/build_scripts/build_configurations/build.sh b/build_scripts/build_configurations/build.sh index 342a577..b55c2d7 100644 --- a/build_scripts/build_configurations/build.sh +++ b/build_scripts/build_configurations/build.sh @@ -1,11 +1,8 @@ #!/bin/bash -source build_scripts/init.sh +source build_scripts/pre_build.sh print "${CYAN}===============[build]================\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_C_ARGS" "$SRC_C" compile_cpp "$BUILD_CPP_ARGS" "$SRC_CPP" -ar x deps/* --output=obj link "$BUILD_CPP_ARGS $BUILD_LINKER_ARGS" "$BUILD_FILE" diff --git a/build_scripts/build_configurations/build_dbg.sh b/build_scripts/build_configurations/build_dbg.sh index c177223..7a2ace8 100644 --- a/build_scripts/build_configurations/build_dbg.sh +++ b/build_scripts/build_configurations/build_dbg.sh @@ -1,10 +1,8 @@ #!/bin/bash -source build_scripts/init.sh +source build_scripts/pre_build.sh print "${CYAN}=============[build_dbg]==============\n" -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" compile_c "$BUILD_DBG_C_ARGS" "$SRC_C" compile_cpp "$BUILD_DBG_CPP_ARGS" "$SRC_CPP" link "$BUILD_DBG_CPP_ARGS $BUILD_DBG_LINKER_ARGS" "$BUILD_FILE" diff --git a/build_scripts/build_configurations/test_valgrind.sh b/build_scripts/build_configurations/test_valgrind.sh index 7d159d0..6b65334 100644 --- a/build_scripts/build_configurations/test_valgrind.sh +++ b/build_scripts/build_configurations/test_valgrind.sh @@ -5,5 +5,5 @@ source build_scripts/init.sh print "${CYAN}===========[test_valgrind]============\n" cd $OUTDIR valgrind $VALGRIND_ARGS ./$BUILD_DBG_FILE -cat "valgrind.log" +cat valgrind.log cd .. diff --git a/build_scripts/build_deps.sh b/build_scripts/build_deps.sh index 2931273..0a7c42a 100644 --- a/build_scripts/build_deps.sh +++ b/build_scripts/build_deps.sh @@ -2,22 +2,12 @@ source build_scripts/colors.sh printf "${CYAN}=============[build_deps]=============\n" -mkdir -p deps -cd ../kerep/ +cd kerep if [ ! -f "bin/kerep.a" ]; then - printf "${YELLOW}../kerep/bin/kerep.a doesn't exist\n" - while true; do - printf "${WHITE}build it from source? (y/n) " - read answ - case $answ in - [Yy] ) break;; - [Nn] ) exit;; - * ) printf "${RED}incorrect answer\n";; - esac - done + printf "${YELLOW}kerep/bin/kerep.a doesn't exist\n" make build_static_lib fi -cp bin/kerep.a ../cobek/deps/ -printf "${GREEN} copied ${CYAN}kerep.a\n" -cd ../cobek +cp bin/kerep.a ../obj/ +printf "${GREEN}copied ${CYAN}kerep.a\n" +cd .. diff --git a/build_scripts/functions.sh b/build_scripts/functions.sh index 0e09cc3..3ffbd40 100644 --- a/build_scripts/functions.sh +++ b/build_scripts/functions.sh @@ -59,7 +59,8 @@ function link { print "${BLUE}args: ${GRAY}$args\n" local outfile=$OUTDIR/$2 print "${BLUE}outfile: ${GRAY}$outfile\n" - local objects="$(find $OBJDIR -name *.o)" + local objects="$(find $OBJDIR -name *.o) +$(find $OBJDIR -name *.a)" print "${BLUE}objects: ${GRAY}$objects\n" if $CMP_CPP $args -o $outfile $(echo $objects | tr '\n' ' ') then diff --git a/build_scripts/init.sh b/build_scripts/init.sh index 8584019..25119b6 100644 --- a/build_scripts/init.sh +++ b/build_scripts/init.sh @@ -1,6 +1,5 @@ #!/bin/bash -reset tabs 4 source build_scripts/colors.sh @@ -21,5 +20,3 @@ if [ ! -f ".config" ]; then done fi source .config - -bash build_scripts/build_deps.sh diff --git a/build_scripts/pre_build.sh b/build_scripts/pre_build.sh new file mode 100644 index 0000000..40bdfeb --- /dev/null +++ b/build_scripts/pre_build.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +source build_scripts/init.sh + +clear_dir "$OUTDIR" +clear_dir "$OBJDIR" +bash build_scripts/build_deps.sh \ No newline at end of file