Compare commits
5 Commits
2.3.2
...
7e7d05cfdc
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e7d05cfdc | |||
| 2bbabeb9ee | |||
| b6ade8c31a | |||
| 6a556572b4 | |||
| 3ad7685b88 |
@@ -1 +1 @@
|
|||||||
2.3.2
|
2.3.4
|
||||||
@@ -1,3 +1,10 @@
|
|||||||
|
## 2.3.4
|
||||||
|
+ fixed failing if `./project.user.config.default` do not exist
|
||||||
|
+ fixed `WARN_CPP`
|
||||||
|
|
||||||
|
## 2.3.3
|
||||||
|
+ now all default build dasks delete out file before building new one
|
||||||
|
|
||||||
## 2.3.2
|
## 2.3.2
|
||||||
+ fixed symlink creation in `OBJDIR/static_libs`
|
+ fixed symlink creation in `OBJDIR/static_libs`
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
INSTALLED_CBUILD_VERSION=2.3.2
|
INSTALLED_CBUILD_VERSION=2.3.4
|
||||||
|
|
||||||
# set \t size to 4 spaces
|
# set \t size to 4 spaces
|
||||||
tabs 4
|
tabs 4
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
# delete old objects
|
# delete old objects
|
||||||
clean_dir "$OBJDIR/objects"
|
clean_dir "$OBJDIR/objects"
|
||||||
|
rm -f "$EXEC_FILE"
|
||||||
|
|
||||||
# copy profiling info
|
# copy profiling info
|
||||||
prof_files=$(find "$OBJDIR/profile/" -name '*.gcda')
|
prof_files=$(find "$OBJDIR/profile/" -name '*.gcda')
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
# delete old objects
|
# delete old objects
|
||||||
clean_dir "$OBJDIR/objects"
|
clean_dir "$OBJDIR/objects"
|
||||||
|
rm -f "$SHARED_LIB_FILE"
|
||||||
|
|
||||||
[ ! -z "$SRC_C" ] && compile_c "$CMP_C" "$STD_C" "$WARN_C" "$C_ARGS" "$INCLUDE" "$SRC_C"
|
[ ! -z "$SRC_C" ] && compile_c "$CMP_C" "$STD_C" "$WARN_C" "$C_ARGS" "$INCLUDE" "$SRC_C"
|
||||||
[ ! -z "$SRC_CPP" ] && compile_cpp "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$CPP_ARGS" "$INCLUDE" "$SRC_CPP"
|
[ ! -z "$SRC_CPP" ] && compile_cpp "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$CPP_ARGS" "$INCLUDE" "$SRC_CPP"
|
||||||
link "$LINKER_ARGS" "$SHARED_LIB_FILE"
|
link "$LINKER_ARGS" "$SHARED_LIB_FILE"
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
# delete old objects
|
# delete old objects
|
||||||
clean_dir "$OBJDIR/objects"
|
clean_dir "$OBJDIR/objects"
|
||||||
|
rm -f "$STATIC_LIB_FILE"
|
||||||
|
|
||||||
[ ! -z "$SRC_C" ] && compile_c "$CMP_C" "$STD_C" "$WARN_C" "$C_ARGS" "$INCLUDE" "$SRC_C"
|
[ ! -z "$SRC_C" ] && compile_c "$CMP_C" "$STD_C" "$WARN_C" "$C_ARGS" "$INCLUDE" "$SRC_C"
|
||||||
[ ! -z "$SRC_CPP" ] && compile_cpp "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$CPP_ARGS" "$INCLUDE" "$SRC_CPP"
|
[ ! -z "$SRC_CPP" ] && compile_cpp "$CMP_CPP" "$STD_CPP" "$WARN_CPP" "$CPP_ARGS" "$INCLUDE" "$SRC_CPP"
|
||||||
pack_static_lib "$STATIC_LIB_FILE"
|
pack_static_lib "$STATIC_LIB_FILE"
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
// "include",
|
// "include",
|
||||||
"${default}"
|
"${default}"
|
||||||
],
|
],
|
||||||
"cStandard": "c99"
|
"cStandard": "c99",
|
||||||
|
"cppStandard": "c++11",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"version": 4
|
"version": 4
|
||||||
|
|||||||
@@ -19,13 +19,15 @@ function load_config {
|
|||||||
|
|
||||||
# load project user config
|
# load project user config
|
||||||
local proj_conf_user_file="$proj_conf_file.user"
|
local proj_conf_user_file="$proj_conf_file.user"
|
||||||
file_copy_default_if_not_present "$proj_conf_user_file" "$proj_conf_user_file.default"
|
if [ -f "$proj_conf_user_file.default" ]; then
|
||||||
myprint "${BLUE}loading ${WHITE}'$proj_conf_user_file'"
|
file_copy_default_if_not_present "$proj_conf_user_file" "$proj_conf_user_file.default"
|
||||||
# throw error on undefined variable usage
|
myprint "${BLUE}loading ${WHITE}'$proj_conf_user_file'"
|
||||||
set -u
|
# throw error on undefined variable usage
|
||||||
include "$proj_conf_user_file"
|
set -u
|
||||||
# don't throw error on undefined variable usage
|
include "$proj_conf_user_file"
|
||||||
set +u
|
# don't throw error on undefined variable usage
|
||||||
|
set +u
|
||||||
|
fi
|
||||||
|
|
||||||
myprint "${BLUE}loading ${WHITE}'$proj_conf_file'"
|
myprint "${BLUE}loading ${WHITE}'$proj_conf_file'"
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
CBUILD_VERSION=2.3.2
|
CBUILD_VERSION=2.3.4
|
||||||
|
|
||||||
PROJECT="%PROJECT_NAME%"
|
PROJECT="%PROJECT_NAME%"
|
||||||
CMP_C="gcc"
|
CMP_C="gcc"
|
||||||
CMP_CPP="g++"
|
CMP_CPP="g++"
|
||||||
STD_C="c99"
|
STD_C="c99"
|
||||||
STD_CPP="c++11"
|
STD_CPP="c++11"
|
||||||
WARN_C="-Wall -Wextra
|
WARN_COMMON="-Wall -Wextra
|
||||||
-Wduplicated-branches
|
-Wduplicated-branches
|
||||||
-Wduplicated-cond
|
-Wduplicated-cond
|
||||||
-Wformat=2
|
-Wformat=2
|
||||||
@@ -14,9 +14,10 @@ WARN_C="-Wall -Wextra
|
|||||||
-Wshadow
|
-Wshadow
|
||||||
-Werror=return-type
|
-Werror=return-type
|
||||||
-Werror=pointer-arith
|
-Werror=pointer-arith
|
||||||
-Werror=init-self
|
-Werror=init-self"
|
||||||
|
WARN_C="$WARN_COMMON
|
||||||
-Werror=incompatible-pointer-types"
|
-Werror=incompatible-pointer-types"
|
||||||
WARN_CPP="$WARN_C"
|
WARN_CPP="$WARN_COMMON"
|
||||||
SRC_C="$(find src -name '*.c')"
|
SRC_C="$(find src -name '*.c')"
|
||||||
SRC_CPP="$(find src -name '*.cpp')"
|
SRC_CPP="$(find src -name '*.cpp')"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user