Changeset 9680


Ignore:
Timestamp:
2018-05-29T16:39:07+02:00 (2 years ago)
Author:
nicolasmartin
Message:

Modifcation of makenemo and Fmake_config.sh to handle EXPREF & EXP00

File:
1 edited

Legend:

Unmodified
Added
Removed
  • utils/build/makenemo

    r9673 r9680  
    106106list_key='0'; chk_key='1' 
    107107list_add_key=''; list_del_key=''; 
    108 conf_file='ref_cfgs.txt' 
     108conf_file=ref_cfgs.txt 
    109109#- 
    110110#- FCM and functions location --- 
     
    225225   ## Remote cfg 
    226226   if   [ -n "${RMT_CONF}" ]; then 
    227       conf_file='rmt_cfgs.txt' ; CONFIG_DIR=${MAIN_DIR}/tests; 
     227      conf_file=rmt_cfgs.txt; CONFIG_DIR=${MAIN_DIR}/tests; 
     228 
     229      if [[ ! $( grep ${RMT_CONF} ${CONFIG_DIR}/${conf_file} ) ]]; then 
     230            echo -e "\033[0;31m\nThe reference configuration ('-r'), demonstration case ('-a') or " 
     231            echo -e "remote configuration ('-u') selected is not available!!!" 
     232            echo -e "Check if you use the good option and the available items in txt files\033[0m" 
     233            ${COMPIL_DIR}/Flist_cfgs.sh 
     234            exit 2 
     235      fi 
    228236 
    229237      ## Little tricky this one 
     
    236244   ## Demo case 
    237245   elif [ -n "${DEMO_CONF}" ]; then 
    238       conf_file='demo_cfgs.txt'; CONFIG_DIR=${MAIN_DIR}/tests; TML_CONF=${DEMO_CONF} 
     246      conf_file=demo_cfgs.txt; CONFIG_DIR=${MAIN_DIR}/tests; TML_CONF=${DEMO_CONF} 
    239247   fi 
    240248 
     
    249257   exit 2 
    250258 
    251 ## Update sub-comps if needed 
    252 elif [ -z "${NEM_SUBDIR}" ]; then 
    253    ## First check working cfgs file 
    254     
    255    if [ -f ${CONFIG_DIR}/work_cfgs.txt ]; then 
    256       NEM_SUBDIR=$(    grep "${TML_CONF} " ${CONFIG_DIR}/work_cfgs.txt | awk '{$1 = ""; print $0}' ) 
    257    fi 
    258  
    259    ## Then versioned cfg files 
     259else 
     260 
     261   if [[ -f ${CONFIG_DIR}/work_cfgs.txt && $( grep "${TML_CONF} " ${CONFIG_DIR}/work_cfgs.txt ) ]]; then 
     262      conf_file=work_cfgs.txt 
     263   fi 
     264 
     265   [ -z "${NEW_CONF}" ] && NEW_CONF=${TML_CONF} 
     266 
     267   ## Update sub-comps if needed 
    260268   if [ -z "${NEM_SUBDIR}" ]; then 
    261       NEM_SUBDIR=$( grep "${TML_CONF} " ${CONFIG_DIR}/${conf_file}  | awk '{$1 = ""; print $0}' ) 
    262    fi 
    263  
    264    [[ -z "${NEW_CONF}" || "${TML_CONF}" == "${NEW_CONF}" ]] && NEW_CONF=${TML_CONF}'_WK' 
     269         NEM_SUBDIR=$( grep "${TML_CONF} " ${CONFIG_DIR}/${conf_file}  | awk '{$1 = ""; print $0}' ) 
     270   fi 
    265271 
    266272fi 
Note: See TracChangeset for help on using the changeset viewer.