Commit b896da85 authored by Robert Schmidt's avatar Robert Schmidt

Harmonize build_oai color output

parent 557e3ba8
...@@ -448,11 +448,11 @@ function main() { ...@@ -448,11 +448,11 @@ function main() {
# Setting and printing OAI envs, we should check here # # Setting and printing OAI envs, we should check here #
####################################################### #######################################################
cecho "OPENAIR_DIR = $OPENAIR_DIR" $green echo "OPENAIR_DIR = $OPENAIR_DIR"
if [ "$CLEAN_ALL" = "1" ] ; then if [ "$CLEAN_ALL" = "1" ] ; then
clean_all_files clean_all_files
echo_info "Erased all previously producted files" echo "Erased all previously producted files"
fi fi
dlog=$OPENAIR_DIR/cmake_targets/log dlog=$OPENAIR_DIR/cmake_targets/log
...@@ -512,11 +512,10 @@ function main() { ...@@ -512,11 +512,10 @@ function main() {
# for historical reasons we build in a subdirectory cmake_targets/XYZ/build, # for historical reasons we build in a subdirectory cmake_targets/XYZ/build,
# e.g., cmake_targets/ran_build/build, hence the ../../.. # e.g., cmake_targets/ran_build/build, hence the ../../..
CMAKE_CMD="$CMAKE_CMD ../../.." CMAKE_CMD="$CMAKE_CMD ../../.."
echo_info "running $CMAKE_CMD" echo_info "Running \"$CMAKE_CMD\""
eval $CMAKE_CMD eval $CMAKE_CMD
if [[ "$execlist" != "" ]]; then if [[ "$execlist" != "" ]]; then
echo_info "Compiling $execlist..."
compilations $BUILD_DIR all.txt $execlist compilations $BUILD_DIR all.txt $execlist
fi fi
......
...@@ -222,6 +222,7 @@ compilations() { ...@@ -222,6 +222,7 @@ compilations() {
shift 1 shift 1
local targets=$@ local targets=$@
cd $OPENAIR_DIR/cmake_targets/$dir/build cd $OPENAIR_DIR/cmake_targets/$dir/build
cecho "Running \"$MAKE_CMD $targets\"" $green
echo_info "Log file for compilation is being written to: $dlog/$logfile" echo_info "Log file for compilation is being written to: $dlog/$logfile"
set +e set +e
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment