Changeset 984

Timestamp:

11/08/16 16:23:04 (7 years ago)

Author:

ymipsl

Message:

Add --arch_path option for make_xios.

YM

File:

• XIOS/trunk/make_xios (modified) (3 diffs)

XIOS/trunk/make_xios

@@ -9 +9 @@
 netcdf_lib="netcdf4_par"
 compil_mode="prod"
+arch_path="arch"
+arch_default_path="arch"
+arch_defined="FALSE"
+arch_path_defined="FALSE"
 
 # Traitement de la ligne de commande
@@ -35 +39 @@
          "--dev")   compil_mode="dev"   ; shift ;;
          "--debug") compil_mode="debug" ; shift ;;
-         "--arch")  arch=$2     ; shift ; shift ;;
+         "--arch")  arch=$2     ; arch_defined="TRUE"; shift ; shift ;;
+         "--arch_path")  arch_path=$2     ; arch_path_defined="TRUE"; shift ; shift ;;
          "--avail") ls arch/*.fcm | cut -d"-" -f2 | cut -d"." -f1 ; exit ;; 
          "--full")  compil_full="true"  ; shift ;;
@@ -70 +75 @@
 mkdir .void_dir
 
-if [[ !(-z $arch) ]]
-   then
-      rm -f  $install_dir/arch.path
-      rm -f  $install_dir/arch.fcm
-      rm -f  $install_dir/arch.env
-      ln -s  $install_dir/arch/arch-${arch}.path $install_dir/arch.path
-      ln -s  $install_dir/arch/arch-${arch}.fcm  $install_dir/arch.fcm
-
-      if test -f $install_dir/arch/arch-${arch}.env
-      then
-        ln -s $install_dir/arch/arch-${arch}.env arch.env
-      else
-        ln -s $install_dir/.void_file arch.env
-      fi
-
-      source $install_dir/arch.env
-      source $install_dir/arch.path
+if [[ "$arch_defined" == "TRUE" ]]
+then
+  rm -f arch.path
+  rm -f arch.fcm
+  rm -f arch.env
+
+  if test -f $arch_path/arch-${arch}.path
+  then
+    ln -s $arch_path/arch-${arch}.path arch.path
+  elif test -f $arch_default_path/arch-${arch}.path
+  then
+    ln -s $arch_default_path/arch-${arch}.path arch.path
+  fi
+        
+  if test -f $arch_path/arch-${arch}.fcm
+  then
+    ln -s $arch_path/arch-${arch}.fcm arch.fcm
+  elif test -f $arch_default_path/arch-${arch}.fcm
+  then
+    ln -s $arch_default_path/arch-${arch}.fcm arch.fcm
+  fi
+
+  if test -f $arch_path/arch-${arch}.env
+  then
+    ln -s $arch_path/arch-${arch}.env arch.env
+  elif test -f $arch_default_path/arch-${arch}.env
+  then
+    ln -s $arch_default_path/arch-${arch}.env arch.env
   else
+    ln -s .void_file arch.env
+  fi
+  source arch.env
+  source arch.path
+else
       echo "Please choose a target achitecture --> list all available architecture using make_xios --avail!"
       exit 1