diff --git a/CBUILD_VERSION b/CBUILD_VERSION index 7c32728..8f9174b 100644 --- a/CBUILD_VERSION +++ b/CBUILD_VERSION @@ -1 +1 @@ -2.1.1 \ No newline at end of file +2.1.2 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 227cbf6..d68c43a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ +# v2.1.2 ++ changed compile_c and compile_cpp functions ++ bootstrap now can print help and list of installed versions + # v2.1.1 -+ removed `TESTS_C` and `TESTS_CPP` ++ **config**: removed `TESTS_C` and `TESTS_CPP` compilation # v2.1.0 + **config**: no more `current.config` and `default.config`, just `project.config` diff --git a/cbuild.sh b/cbuild.sh index 3a9ddee..3813ddb 100644 --- a/cbuild.sh +++ b/cbuild.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -INSTALLED_CBUILD_VERSION=2.1.1 +INSTALLED_CBUILD_VERSION=2.1.2 # set \t size to 4 spaces tabs 4 diff --git a/default.config b/default.config index 8814f69..e7d871f 100644 --- a/default.config +++ b/default.config @@ -1,5 +1,5 @@ #!/usr/bin/env bash -CBUILD_VERSION=2.1.1 +CBUILD_VERSION=2.1.2 CONFIG_VERSION=1 PROJECT="%PROJECT_NAME%" diff --git a/functions.sh b/functions.sh index cebc5df..a095246 100755 --- a/functions.sh +++ b/functions.sh @@ -86,13 +86,17 @@ function build_dependency { cp -rv $DEP_DYNAMIC_OUT_FILES "$proj_root_dir/$OUTDIR" # symlink each file to $OBJDIR/dynamic_libs for file in $DEP_DYNAMIC_OUT_FILES; do - ln -sfv $(realpath $file) "$proj_root_dir/$OBJDIR/dynamic_libs" + # doesnt return error if called not like this + f=$(realpath $file) + ln -sfv $f "$proj_root_dir/$OBJDIR/dynamic_libs" done fi if [ ! -z "$DEP_STATIC_OUT_FILES" ]; then # symlink each file to $OBJDIR/static_libs for file in $DEP_STATIC_OUT_FILES; do - ln -sfv $(realpath $file) "$proj_root_dir/$OBJDIR/static_libs" + # doesnt return error if called not like this + f=$(realpath $file) + ln -sfv $f "$proj_root_dir/$OBJDIR/static_libs" done fi @@ -204,7 +208,7 @@ function link { 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" + local dynamic_libs_args="-L. -Wl,-Bdynamic" for lib in $dynamic_libs; do dynamic_libs_args="$dynamic_libs_args -l:$lib" done diff --git a/setup.sh b/setup.sh index 20f7137..085b67f 100644 --- a/setup.sh +++ b/setup.sh @@ -4,7 +4,7 @@ # exit on errors set -xeo pipefail -CBUILD_VERSION=2.1.1 +CBUILD_VERSION=2.1.2 function version_parse { local value="$1"