kerep added as submodule

This commit is contained in:
timerix 2022-08-16 20:23:22 +06:00
parent 62963e6666
commit fda9226e0d
9 changed files with 21 additions and 29 deletions

3
.gitignore vendored
View File

@ -10,5 +10,4 @@ obj/
.editorconfig
*.user
*.vcxproj.filters
.config
deps/kerep.a
.config

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "kerep"]
path = kerep
url = https://github.com/Timerix22/kerep.git

View File

@ -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"

View File

@ -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"

View File

@ -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 ..

View File

@ -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 ..

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,7 @@
#!/bin/bash
source build_scripts/init.sh
clear_dir "$OUTDIR"
clear_dir "$OBJDIR"
bash build_scripts/build_deps.sh