Changeset 9680 for utils

Timestamp:

2018-05-29T16:39:07+02:00 (6 years ago)

Author:

nicolasmartin

Message:

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

File:

• utils/build/makenemo (modified) (4 diffs)

utils/build/makenemo

@@ -106 +106 @@
 list_key='0'; chk_key='1'
 list_add_key=''; list_del_key='';
-conf_file='ref_cfgs.txt'
+conf_file=ref_cfgs.txt
 #-
 #- FCM and functions location ---
@@ -225 +225 @@
    ## Remote cfg
    if   [ -n "${RMT_CONF}" ]; then
-      conf_file='rmt_cfgs.txt' ; CONFIG_DIR=${MAIN_DIR}/tests;
+      conf_file=rmt_cfgs.txt; CONFIG_DIR=${MAIN_DIR}/tests;
+
+      if [[ ! $( grep ${RMT_CONF} ${CONFIG_DIR}/${conf_file} ) ]]; then
+            echo -e "\033[0;31m\nThe reference configuration ('-r'), demonstration case ('-a') or "
+            echo -e "remote configuration ('-u') selected is not available!!!"
+            echo -e "Check if you use the good option and the available items in txt files\033[0m"
+            ${COMPIL_DIR}/Flist_cfgs.sh
+            exit 2
+      fi
 
       ## Little tricky this one
@@ -236 +244 @@
    ## Demo case
    elif [ -n "${DEMO_CONF}" ]; then
-      conf_file='demo_cfgs.txt'; CONFIG_DIR=${MAIN_DIR}/tests; TML_CONF=${DEMO_CONF}
+      conf_file=demo_cfgs.txt; CONFIG_DIR=${MAIN_DIR}/tests; TML_CONF=${DEMO_CONF}
    fi
 
@@ -249 +257 @@
    exit 2
 
-## Update sub-comps if needed
-elif [ -z "${NEM_SUBDIR}" ]; then
-   ## First check working cfgs file
-   
-   if [ -f ${CONFIG_DIR}/work_cfgs.txt ]; then
-      NEM_SUBDIR=$(    grep "${TML_CONF} " ${CONFIG_DIR}/work_cfgs.txt | awk '{$1 = ""; print $0}' )
-   fi
-
-   ## Then versioned cfg files
+else
+
+   if [[ -f ${CONFIG_DIR}/work_cfgs.txt && $( grep "${TML_CONF} " ${CONFIG_DIR}/work_cfgs.txt ) ]]; then
+      conf_file=work_cfgs.txt
+   fi
+
+   [ -z "${NEW_CONF}" ] && NEW_CONF=${TML_CONF}
+
+   ## Update sub-comps if needed
    if [ -z "${NEM_SUBDIR}" ]; then
-      NEM_SUBDIR=$( grep "${TML_CONF} " ${CONFIG_DIR}/${conf_file}  | awk '{$1 = ""; print $0}' )
-   fi
-
-   [[ -z "${NEW_CONF}" || "${TML_CONF}" == "${NEW_CONF}" ]] && NEW_CONF=${TML_CONF}'_WK'
+         NEM_SUBDIR=$( grep "${TML_CONF} " ${CONFIG_DIR}/${conf_file}  | awk '{$1 = ""; print $0}' )
+   fi
 
 fi