Changeset 294 for modipsl/trunk/util/ins_make

Timestamp:

03/31/08 11:59:44 (16 years ago)

Author:

bellier

Message:

JB:

• updated ins_make to avoid conflicts with target names
• enhanced the help of ins_make
• updated AA_make.gdef

File:

• modipsl/trunk/util/ins_make (modified) (4 diffs)

modipsl/trunk/util/ins_make

@@ -6 +6 @@
 function ins_make_Usage
 {
-echo "
+typeset -L13 h_n; typeset v0 v1 v2 v3 v4 v5 v6 v7;
+print - "
 ins_make install the Makefile in the directories
 
@@ -26 +27 @@
   ins_make -t sx8brodie
 "
+print - "Supported targets :\n"
+[[ ! -f "${MKTG}" ]] && { print - "? (${MKTG} unreachable)\n"; exit 3; }
+while read v1 v2 v3 v4 v5 v6 v7
+  do
+    [[ -n "${v1}" && "${v1}${v3}" = '#-Q-#-'                       && \
+       -n "${v4}" && "${v4}${v5}${v6}" = 'Globaldefinitionsfor' ]] && \
+     { h_n=${v2}; print - "${h_n} : ${v7}"; }
+  done <${MKTG}
+print - "
+Fot other targets, look in ${MKTG}.
+"
 }
 #-    dirname     and      basename
 d_n=$(dirname ${0}); b_n=$(basename ${0});
+#- File containing global definitions
+MKTG=${d_n}'/AA_make.gdef'
 #- Retrieving and validation of the options
 x_v='silencious'; x_d='normal'; x_p="??"; x_t="??"; x_m='??';
@@ -70 +84 @@
       { echo "Local_Host not supported" 1>&2; exit 1; }; }
 #-
-MKTG=${d_n}'/AA_make.gdef'
 [[ ! -f "${MKTG}" ]] && { echo "${MKTG} unreachable ..."; exit 3; }
 #-
-W_XX=$(sed -n -e "s/^#-Q-  *\(${x_t}\) .*$/\1/p" ${MKTG} | sort -u);
+W_XX=$(sed -n -e "s/^#-Q-  *\(${x_t}\)[\t ].*$/\1/p" ${MKTG} | sort -u);
 [[ '\?'"${W_XX}" != '\?'"${x_t}" ]] && \
   { echo "Target_Host  "${x_t}"  not supported" 1>&2; exit 1; }
@@ -101 +114 @@
   MKTR="${j}"'/AA_make';
   cat ${MKTL} ${MKTG} ${MKTR} > mk1.$$;
-  W_PR='#-Q- '; W_XX=${W_PR}${x_t};
-  sed -e "/^${W_XX} */ s///" -e "/^${W_PR}/d" mk1.$$ > mk2.$$;
+  W_PR='#-Q-  *'; W_XX=${W_PR}${x_t};
+  sed -e "/^${W_XX}[\t ]/ s/^${W_XX} *//" -e "/^${W_PR}/d" mk1.$$ > mk2.$$;
 #-
 # Default INTEGER and REAL precision