v2.1.2
This commit is contained in:
parent
0b5eed8b4c
commit
144b333b60
@ -1 +1 @@
|
|||||||
2.1.1
|
2.1.2
|
||||||
@ -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
|
# v2.1.1
|
||||||
+ removed `TESTS_C` and `TESTS_CPP`
|
+ **config**: removed `TESTS_C` and `TESTS_CPP` compilation
|
||||||
|
|
||||||
# v2.1.0
|
# v2.1.0
|
||||||
+ **config**: no more `current.config` and `default.config`, just `project.config`
|
+ **config**: no more `current.config` and `default.config`, just `project.config`
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
INSTALLED_CBUILD_VERSION=2.1.1
|
INSTALLED_CBUILD_VERSION=2.1.2
|
||||||
|
|
||||||
# set \t size to 4 spaces
|
# set \t size to 4 spaces
|
||||||
tabs 4
|
tabs 4
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
CBUILD_VERSION=2.1.1
|
CBUILD_VERSION=2.1.2
|
||||||
CONFIG_VERSION=1
|
CONFIG_VERSION=1
|
||||||
|
|
||||||
PROJECT="%PROJECT_NAME%"
|
PROJECT="%PROJECT_NAME%"
|
||||||
|
|||||||
10
functions.sh
10
functions.sh
@ -86,13 +86,17 @@ function build_dependency {
|
|||||||
cp -rv $DEP_DYNAMIC_OUT_FILES "$proj_root_dir/$OUTDIR"
|
cp -rv $DEP_DYNAMIC_OUT_FILES "$proj_root_dir/$OUTDIR"
|
||||||
# symlink each file to $OBJDIR/dynamic_libs
|
# symlink each file to $OBJDIR/dynamic_libs
|
||||||
for file in $DEP_DYNAMIC_OUT_FILES; do
|
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
|
done
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$DEP_STATIC_OUT_FILES" ]; then
|
if [ ! -z "$DEP_STATIC_OUT_FILES" ]; then
|
||||||
# symlink each file to $OBJDIR/static_libs
|
# symlink each file to $OBJDIR/static_libs
|
||||||
for file in $DEP_STATIC_OUT_FILES; do
|
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
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -204,7 +208,7 @@ function link {
|
|||||||
|
|
||||||
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. -Wl,-Bdynamic"
|
||||||
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
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user