Changeset 9651 for utils/build/mk/Flist_archfile.sh

Timestamp:

2018-05-28T08:47:14+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Reorganisation plan for NEMO repository: add missing modifications from previous commit

File:

• utils/build/mk/Flist_archfile.sh (modified) (1 diff)

utils/build/mk/Flist_archfile.sh

@@ -56 +56 @@
 #-
 
-if [ -n "$2" ]; then
-shift
-fi
+archfile_loop() {
 
-echo "Available compilers for -m option :"
-for file in  $(ls ${MAIN_DIR}/arch | grep "fcm$" )
-do
-zvar1=${file#arch-}
-zvar2=$(head -1 ${MAIN_DIR}/arch/$file)
-#echo "${zvar1%.fcm} : ${zvar2#\#}"
-printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"
+   for file in $( ls $1/*.fcm ); do
+      zvar1=$( basename $file | sed 's/arch-\(.*\).fcm/\1/' )
+      zvar2=$( head -1  $file | tr -d '#'                   )
+      printf "%-30s %-s\n" ${zvar1} "${zvar2}"
+   done
+
+}
+
+echo -e "\n  ¤ Generic computing architectures"
+
+archfile_loop ${MAIN_DIR}/arch
+
+for dir in $( ls ${MAIN_DIR}/arch | grep -v "fcm$" ); do
+   echo -e "\n  ¤ Specific HPC architectures for "${dir}
+   archfile_loop ${MAIN_DIR}/arch/$dir
 done
 
-
-if [ "$1" == "all" ]; then
-   for dir  in  $(ls ${MAIN_DIR}/arch | grep -v "fcm$" )
-   do 
-      echo "Available compilers at ${dir} :"
-      for file in  $(ls ${MAIN_DIR}/arch/${dir} | grep "fcm$" )
-      do
-      zvar1=${file#arch-}
-      zvar2=$(head -1 ${MAIN_DIR}/arch/${dir}/$file)
-      #echo "${zvar1%.fcm} : ${zvar2#\#}"
-      printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"
-      done
-   done
-elif [ -d ${MAIN_DIR}/arch/${1} ]; then
-      echo "Available compilers at $1 :"
-      for file in  $(ls ${MAIN_DIR}/arch/$1 | grep "fcm$" )
-      do
-      zvar1=${file#arch-}
-      zvar2=$(head -1 ${MAIN_DIR}/arch/${1}/$file)
-      #echo "${zvar1%.fcm} : ${zvar2#\#}"
-      printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"
-      done
-else
-      echo "Available consortium member sub-directories :"
-      for dir  in  $(ls ${MAIN_DIR}/arch | grep -v "fcm$" )
-      do
-         echo ${dir}
-      done
-      echo "use \"makenemo -h all\" or \"makenemo -m help\" to see compilers available in member's sub-directories"
-fi
+echo