From 7eb8000a67ae6150ae09ae462f08e9923572c9b7 Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Thu, 13 Oct 2016 16:34:23 +0200
Subject: [PATCH] Juan 13/10/2016:configure; add VER_OASIS in VERSION_XYZ &
correct test/detar oasis/toy files
---
src/configure | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/configure b/src/configure
index 7da5929de..46eb7a523 100755
--- a/src/configure
+++ b/src/configure
@@ -10,7 +10,8 @@ then
#
export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-3}
export VERSION_BUG=${VERSION_BUG:-0}
-export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}}
+export VER_OASIS=${VER_OASIS:-""}
+export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}}
export VERSION_DATE=${VERSION_DATE:-"23/06/2016"}
export VERSION_CDF=${VERSION_CDF:-"4.1.3"}
export VERSION_HDF=${VERSION_HDF:-"1.8.9"}
@@ -18,7 +19,10 @@ export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.13.1"}
export MNH_INT=${MNH_INT:-"4"}
export LFI_INT=${LFI_INT:-8}
export MNH_IOCDF4=${MNH_IOCDF4:-1}
-export VER_OASIS=${VER_OASIS:-NO}
+
+export VERSION_OASIS=${VERSION_OASIS:-"mct_v3"}
+export VERSION_TOY=${VERSION_TOY:-"v1-0"}
+
#
export NEED_TOOLS=YES
#
@@ -420,7 +424,7 @@ fi
# Install OASIS if VER_OASIS=OASISAUTO
#
if [ "x${VER_OASIS}" == "xOASISAUTO" ] ; then
-( cd $LOCAL/src/LIB ; [ ! -d oasis3-mct ] && tar xvfz oasis3-mct_v3.tar.gz ; [ ! -d toy ] && tar xvfz toy_v1-0.tar.gz )
+( cd $LOCAL/src/LIB ; [ ! -d oasis3-${VERSION_OASIS} ] && tar xvfz oasis3-${VERSION_OASIS}.tar.gz ; [ ! -d toy_${VERSION_TOY} ] && tar xvfz toy_${VERSION_TOY}.tar.gz )
fi
#
# Install GRIBAPI
--
GitLab