From b896da85e7ca047d25e0d8a388b59e8a2450c719 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Sun, 18 Jun 2023 03:41:10 +0200 Subject: [PATCH] Harmonize build_oai color output --- cmake_targets/build_oai | 7 +++---- cmake_targets/tools/build_helper | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai index 63bc83845d..b1debfbf7d 100755 --- a/cmake_targets/build_oai +++ b/cmake_targets/build_oai @@ -448,11 +448,11 @@ function main() { # 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 clean_all_files - echo_info "Erased all previously producted files" + echo "Erased all previously producted files" fi dlog=$OPENAIR_DIR/cmake_targets/log @@ -512,11 +512,10 @@ function main() { # for historical reasons we build in a subdirectory cmake_targets/XYZ/build, # e.g., cmake_targets/ran_build/build, hence the ../../.. CMAKE_CMD="$CMAKE_CMD ../../.." - echo_info "running $CMAKE_CMD" + echo_info "Running \"$CMAKE_CMD\"" eval $CMAKE_CMD if [[ "$execlist" != "" ]]; then - echo_info "Compiling $execlist..." compilations $BUILD_DIR all.txt $execlist fi diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 52ae420081..9d1e03dec4 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -222,6 +222,7 @@ compilations() { shift 1 local targets=$@ 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" set +e {