Changeset 10587 for utils/build/makenemo

Timestamp:

2019-01-27T20:54:26+01:00 (4 years ago)

Author:

nicolasmartin

Message:

Modification of makenemo conception: -[rau] option is mandatory in any case even for a preceding build

File:

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

utils/build/makenemo

@@ -121 +121 @@
 ./makenemo -[aru] CONFIG -m ARCH [-[dehjntv] ...] [{list_key,clean,clean_config}] [{add_key,del_key} ...]
 
-The previous build is reused by default if no mandatory option given
-
 Mandatory:
-   -a   Academic test case            (./tests)
-   -m   Computing architecture        (./arch)
-   -r   Reference configuration       (./cfgs)
-   -u   Scripted remote configuration (./tests/rmt_cfgs.txt)
-Pass 'all' to any option to list available arguments
+   -m   Computing architecture (./arch), FCM file describing the compilation settings
+   and one of the following option (use 'all' arg to list available items)
+   -r   Reference configuration (./cfgs), proven with long-term support until the EOL of the release
+   -a   Academic test case (./tests), ready to use at the release start without guarantee or support over time
+   -u   Scripted remote configuration (see ./tests/rmt_cfgs.txt)
 
 Optional:
-   -d   Set of new sub-components (space separated list from ./src directory)
-   -e   Path for alternative patch  location (default: 'MY_SRC' in configuration folder)
+   -d   New set of sub-components (list from ./src directory)
+   -e   Path for alter patch  location (default: 'MY_SRC' in configuration folder)
    -h   Print this help
-   -j   Number of processes to compile (0: no build)
+   -j   Number of processes to compile (0: dry run with no build)
    -n   Name for new configuration
-   -s   Path for alternative source location (default: 'src' root directory)
-   -t   Path for alternative build  location (default: 'BLD' in configuration folder)
+   -s   Path for alter source location (default: 'src' root directory)
+   -t   Path for alter build  location (default: 'BLD' in configuration folder)
    -v   Level of verbosity ([0-3])
 
@@ -143 +141 @@
    ¤ Configuration creation
         Build          : ./makenemo -[aru] ... [...]
-        Duplication    : ./makenemo -n ...  -[aru] ... [...]
+        Copy           : ./makenemo -n ...  -[aru] ... [...]
    ¤ Configuration management
         List CPP keys  : ./makenemo [...] list_key
@@ -190 +188 @@
 export NEMO_DIR=${MAIN_DIR}/${x_s}
 
-[ "${CMP_NAM}" ==  'all' ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit
+[ "${CMP_NAM}" == 'all' ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit
 
 
@@ -197 +195 @@
 
       ## Reuse last configuration compiled if any (existing 'work_cfgs.txt')
-      if [[ $( find ./cfgs ./tests -name work_cfgs.txt ) ]]; then
-         CONFIG_DIR=${MAIN_DIR}/$( ls -rt */work_cfgs.txt | awk -F/ 'END{ print $1}' )
-         TML_CONF=$( tail -1 ${CONFIG_DIR}/work_cfgs.txt | awk '{ print $1 }' )
-      else
+#     if [[ $( find ./cfgs ./tests -name work_cfgs.txt ) ]]; then
+#        CONFIG_DIR=${MAIN_DIR}/$( ls -rt */work_cfgs.txt | awk -F/ 'END{ print $1}' )
+#        TML_CONF=$( tail -1 ${CONFIG_DIR}/work_cfgs.txt | awk '{ print $1 }' )
+#     else
          ## No ${REF_CONF}, ${DEMO_CONF}, ${RMT_CONF} nor ${NEM_SUBDIR} and 1st compilation => exit
-         echo -e "\033[0;33m\nNo previous build found!"
-         echo -e "\033[0;31m\nAt least a reference configuration ('-r'), a demonstration case ('-a'), "
-         echo -e "a remote configuration ('-u') or a set of NEMO sub-components ('-d') "
-         echo -e "has to be choose!!!\033[0m"
+#        echo -e "\033[0;33m\nNo previous build found!"
+         echo -e "\033[0;31m\nAt least a reference configuration ('-r'), a test case ('-a'), "
+         echo -e "a remote configuration ('-u') has to be choosen!!!\033[0m"
          ${COMPIL_DIR}/Flist_cfgs.sh
          exit 2
-      fi
+#     fi
 
 ## At least one config has been requested
 else
 
-   ## Argument 'all': list all available configurations
+   ## 'all' arg: list all available configurations
    if [[ "${REF_CONF}" == 'all' || "${DEMO_CONF}" == 'all' || "${RMT_CONF}" == 'all' ]]; then
       ${COMPIL_DIR}/Flist_cfgs.sh
       exit 2
+   ## Probably useless but who knows?
    elif [[ -n "${REF_CONF}" && -n "${DEMO_CONF}" ]]; then
       echo -e "\033[0;31m\nYou have to choose whether you work with:"
-      echo -e "  - Supported reference configurations in ./cfgs  ('-r') or"
-      echo -e "  - Unsupported demonstration cases    in ./tests ('-a')\033[0m\n"
+      echo -e "  - LTS configurations in ./cfgs  ('-r') or"
+      echo -e "  - Unsupported cases  in ./tests ('-a')\033[0m\n"
       exit 2
    fi
@@ -229 +227 @@
 
       if [[ ! $( grep ${RMT_CONF} ${CONFIG_DIR}/${conf_file} ) ]]; then
-            echo -e "\033[0;31m\nThe reference configuration ('-r'), demonstration case ('-a') or "
+            echo -e "\033[0;31m\nThe reference configuration ('-r'), test 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"
+            echo -e "Check the option used and the available items in .txt files\033[0m"
             ${COMPIL_DIR}/Flist_cfgs.sh
             exit 2
@@ -254 +252 @@
    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"
+   echo -e "Check the option used and the available items in .txt files\033[0m"
    ${COMPIL_DIR}/Flist_cfgs.sh
    exit 2
@@ -381 +379 @@
    ## add remove for clean option
    if [ ${#x_c} -ne 0 ]; then
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/AGRIFLIB
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD
-      rm -f  ${NEMO_TDIR}/${NEW_CONF}/EXP00/nemo
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/LONG
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/REPRO_*
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/SHORT
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK
-      rm -f  ${COMPIL_DIR}/*history ${COMPIL_DIR}/*fcm ${COMPIL_DIR}/*txt
-      echo "cleaning ${NEW_CONF} AGRIFLIB, BLD, LONG, NEMOFILES, REPRO_*, SHORT, WORK"
-   fi
+
+      echo 'Cleaning in '${NEW_CONF}' the building folders'
+
+      for dir in AGRIFLIB BLD EXP00 LONG NEMOFILES REPRO_* SHORT WORK; do
+         rm -rf ${NEMO_TDIR}/${NEW_CONF}/$dir
+      done
+
+      for file in cpp.history cpp.fcm full_key_list.txt; do
+         rm -f  ${COMPIL_DIR}/$file
+      done
+
+   fi
 
 fi