Changeset 9765 for utils

Timestamp:

2018-06-07T19:15:39+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Cosmetic changes to makenemo

File:

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

utils/build/makenemo

@@ -119 +119 @@
 Usage:
 ------
-./makenemo -[adru] ... -m ... [-h] [-[dejntv] ...] [{list_key,clean,clean_config}] [{add_key,del_key} ...]
-
-The previous build is reused by default if no given options
-
-Mandatory: 'all' to list available arguments by option
-   -a   Demonstration case            (./tests)
+./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
 
 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)
+   -h   Print this help
    -j   Number of processes to compile (0: no build)
    -n   Name for new configuration
@@ -139 +141 @@
 
 Examples:
-   ¤ Configuration build
-        Creation       : ./makenemo -[adru] ... -m ... [...]
-        Duplication    : ./makenemo -r      ... -n ... [...]
+   ¤ Configuration creation
+        Build          : ./makenemo -[aru] ... [...]
+        Duplication    : ./makenemo -n ...  -[aru] ... [...]
    ¤ Configuration management
         List CPP keys  : ./makenemo [...] list_key
@@ -147 +149 @@
         Fresh start    : ./makenemo [...] clean
         Erasure        : ./makenemo [...] clean_config
-
 EOF
             exit 0       ;;
@@ -259 +260 @@
 else
 
+   ## Reuse a working cfg  
    if [[ -f ${CONFIG_DIR}/work_cfgs.txt && $( grep "${TML_CONF} " ${CONFIG_DIR}/work_cfgs.txt ) ]]; then
       conf_file=work_cfgs.txt
    fi
 
+   ## If new cfg exists, work in it
    [ -z "${NEW_CONF}" ] && NEW_CONF=${TML_CONF}
 
@@ -380 +383 @@
       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
@@ -385 +389 @@
       rm -rf ${NEMO_TDIR}/${NEW_CONF}/SHORT
       rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK
-      rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/nemo
-      rm -f ${COMPIL_DIR}/*history ${COMPIL_DIR}/*fcm ${COMPIL_DIR}/*txt
+      rm -f  ${COMPIL_DIR}/*history ${COMPIL_DIR}/*fcm ${COMPIL_DIR}/*txt
       echo "cleaning ${NEW_CONF} AGRIFLIB, BLD, LONG, NEMOFILES, REPRO_*, SHORT, WORK"
    fi