Changeset 2143 for branches/DEV_r1879_FCM/NEMOGCM/TOOLS/maketools

Timestamp:

2010-10-04T14:49:55+02:00 (14 years ago)

Author:

rblod

Message:

Improvement of FCM branch

File:

• branches/DEV_r1879_FCM/NEMOGCM/TOOLS/maketools (modified) (9 diffs, 1 prop)

branches/DEV_r1879_FCM/NEMOGCM/TOOLS/maketools

@@ -19 +19 @@
 # ::
 #
-#  $ makenetools
+#  $ maketools
 #
 #
@@ -67 +67 @@
 #
 #
-# - rblod 2010-06-20T16:11:47Z
 #
 #   * creation
@@ -88 +87 @@
 x_m="";
 x_t="";
+x_c="";
 x_j=1;
-while getopts :hld:n:r:m:j:t: V
+while getopts :hm:n:r:j:t: V
   do
     case $V in
       (h)  echo "Usage   : "${b_n} \
-                " [-h] [-l] [-n name] [-m arch] [-j No] [-t tmpdir]";
+                " [-h] [-n name] [-m arch] [-j No] [-t tmpdir]";
            echo " -h  : help";
-           echo " -l        : list existing tools";
-           echo " -n name : tool name";
-           echo " -m arch : choose machine";
+           echo " -n name : tool name, [-n help] to list existing tools";
+           echo " -m arch : choose compiler, [-m help] to list exiting compilers";
            echo " -j No  : number of processes used to compile (0=nocompilation)";
            echo " -t dir  : remporary directory for compilation"
@@ -104 +103 @@
            echo "maketools -n NESTING" ;
            echo "";
-           echo "Defaults    : ";
+                          printf "%s\n" "Available tools :" `ls ${TOOLS_DIR}|grep -v COMPILE | grep -v maketools`;
            echo "";
+                          . ${COMPIL_DIR}/Flist_archfile.sh  ;
+           echo "";
+           echo "Default : previous tool and compiler";
            exit 0;;
       (n)  x_n=${OPTARG};;
@@ -111 +113 @@
       (j)  x_j=${OPTARG};;
       (t)  x_t=${OPTARG};;
-      (l)  echo "Available tools :"; ls ${TOOLS_DIR}|grep -v COMPILE | grep -v maketools; exit;;
       (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
            exit 2;;
@@ -119 +120 @@
   done
 shift $(($OPTIND-1));
+
+#-
+#- Get the clean option
+[[ "${#@}" -ne 0 && "${@}" != clean ]] && echo "Invalid option "$@" " && exit
+[ "${#@}" -ne 0 ] && x_c="--$@"
 
 #-
@@ -130 +136 @@
 CMP_NAM=${x_m}
 NEMO_TDIR=${x_t:-$NEMO_TDIR}
-export NEMO_TDIR=${NEMO_TDIR:-$CONFIG_DIR}
+export NEMO_TDIR=${NEMO_TDIR:-$TOOLS_DIR}
+
+#- Check if the tool or the compiler exist or list it
+[ "${NEW_CONF}" == help ] && printf "%s\n"  "Available tools :" `ls ${TOOLS_DIR}|grep -v COMPILE | grep -v maketools` && exit
+[ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh && exit
 
 #- When used for the first time, choose a compiler ---
 . ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm ${CMP_NAM} || exit
 
+#- Mak the building directory
 . ${COMPIL_DIR}/Fmake_bld.sh ${TOOLS_DIR} ${NEW_CONF} ${NEMO_TDIR} || exit
 
@@ -147 +158 @@
 cd ${NEMO_TDIR}/${NEW_CONF} || cd -
 
-fcm build --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld_tools.cfg || cd -
+fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld_tools.cfg || cd -
 for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe`
    do
@@ -162 +173 @@
 ${COMPIL_DIR}/Fclean_var.sh
 
-
 exit 0;