Changeset 9673


Ignore:
Timestamp:
2018-05-29T14:49:26+02:00 (2 years ago)
Author:
nicolasmartin
Message:

Bugfix for new makenemo

File:
1 edited

Legend:

Unmodified
Added
Removed
  • utils/build/makenemo

    r9669 r9673  
    194194## No ref. cfg, demo case, nor remote cfg selected 
    195195if [[ -z "${REF_CONF}" && -z "${DEMO_CONF}" && -z "${RMT_CONF}" ]]; then 
    196    conf_file='work_cfgs.txt' 
    197196 
    198197      ## Reuse last configuration compiled if any (existing 'work_cfgs.txt') 
    199198      if [[ $( find ./cfgs ./tests -name work_cfgs.txt ) ]]; then 
    200199         CONFIG_DIR=${MAIN_DIR}/$( ls -rt */work_cfgs.txt | awk -F/ 'END{ print $1}' ) 
    201          TML_CONF=$( tail -1 ${CONFIG_DIR}/${conf_file} | awk '{ print $1 }' ) 
     200         TML_CONF=$( tail -1 ${CONFIG_DIR}/work_cfgs.txt | awk '{ print $1 }' ) 
    202201      else 
    203202         ## No ${REF_CONF}, ${DEMO_CONF}, ${RMT_CONF} nor ${NEM_SUBDIR} and 1st compilation => exit 
    204          echo -e "\033[0;33m\nNo previous compilation found!" 
     203         echo -e "\033[0;33m\nNo previous build found!" 
    205204         echo -e "\033[0;31m\nAt least a reference configuration ('-r'), a demonstration case ('-a'), " 
    206205         echo -e "a remote configuration ('-u') or a set of NEMO sub-components ('-d') " 
     
    263262   fi 
    264263 
    265 fi 
    266  
    267 [[ -z "${NEW_CONF}" || "${TML_CONF}" == "${NEW_CONF}" ]] && NEW_CONF=${TML_CONF}'_WK' 
     264   [[ -z "${NEW_CONF}" || "${TML_CONF}" == "${NEW_CONF}" ]] && NEW_CONF=${TML_CONF}'_WK' 
     265 
     266fi 
     267 
    268268export NEMO_TDIR=${x_t:-$CONFIG_DIR} 
    269269 
Note: See TracChangeset for help on using the changeset viewer.