Changeset 1458

Timestamp:

03/14/18 15:56:53 (7 years ago)

Author:

oabramkina

Message:

Few corrections related to compilation options --use_extern_boost and --use_extern_blitz.

Location:

XIOS

Files:

• dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.path (modified) (1 diff)
• dev/XIOS_DEV_CMIP6/make_xios (modified) (3 diffs)
• trunk/arch/arch-XC30_Cray.path (modified) (1 diff)
• trunk/make_xios (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.path

@@ -11 +11 @@
 HDF5_LIB=""
 
-BOOST_INCDIR="-I $BOOST_INCDIR"
-BOOST_LIBDIR="-L $BOOST_LIBDIR"
+BOOST_INCDIR="-I$BOOST_INCDIR"
+BOOST_LIBDIR="-L$BOOST_LIBDIR"
 BOOST_LIB=""
 
-BLITZ_INCDIR="-I $BLITZ_INCDIR"
-BLITZ_LIBDIR="-L $BLITZ_LIBDIR"
+BLITZ_INCDIR="-I$BLITZ_INCDIR"
+BLITZ_LIBDIR="-L$BLITZ_LIBDIR"
 BLITZ_LIB=""
 

XIOS/dev/XIOS_DEV_CMIP6/make_xios

@@ -64 +64 @@
     echo -e "- uncompress archives ..."         
     for tarname in `ls $install_dir/tools/archive/*.tar.gz` ; do
+        if  ( [[ ${tarname} == "${install_dir}/tools/archive/boost.tar.gz" ]] && [[ "$use_extern_boost" == "true" ]] ) || ( [[ ${tarname} == "${install_dir}/tools/archive/blitz.tar.gz" ]] && [[ "$use_extern_blitz" == "true" ]] )
+        then
+                continue
+        fi
         gunzip -f "$tarname"
         tar -xf ${tarname%.gz}
@@ -179 +183 @@
 if [[ "$use_extern_boost" == "true" ]]
 then
+   rm -r $PWD/extern/boost
    ln -s $PWD/.void_dir $PWD/extern/boost
 else
@@ -189 +194 @@
 if [[ "$use_extern_blitz" == "true" ]]
 then
+   rm -r $PWD/extern/blitz
    ln -s $PWD/.void_dir $PWD/extern/blitz
 else

XIOS/trunk/arch/arch-XC30_Cray.path

@@ -11 +11 @@
 HDF5_LIB=""
 
-BOOST_INCDIR="-I $BOOST_INCDIR"
-BOOST_LIBDIR="-L $BOOST_LIBDIR"
+BOOST_INCDIR="-I$BOOST_INCDIR"
+BOOST_LIBDIR="-L$BOOST_LIBDIR"
 BOOST_LIB=""
 
-BLITZ_INCDIR="-I $BLITZ_INCDIR"
-BLITZ_LIBDIR="-L $BLITZ_LIBDIR"
+BLITZ_INCDIR="-I$BLITZ_INCDIR"
+BLITZ_LIBDIR="-L$BLITZ_LIBDIR"
 BLITZ_LIB=""
 

XIOS/trunk/make_xios

@@ -64 +64 @@
     echo -e "- uncompress archives ..."         
     for tarname in `ls $install_dir/tools/archive/*.tar.gz` ; do
+        if  ( [[ ${tarname} == "${install_dir}/tools/archive/boost.tar.gz" ]] && [[ "$use_extern_boost" == "true" ]] ) || ( [[ ${tarname} == "${install_dir}/tools/archive/blitz.tar.gz" ]] && [[ "$use_extern_blitz" == "true" ]] )
+        then
+                continue
+        fi
         gunzip -f "$tarname"
         tar -xf ${tarname%.gz}
@@ -179 +183 @@
 if [[ "$use_extern_boost" == "true" ]]
 then
+   rm -r $PWD/extern/boost
    ln -s $PWD/.void_dir $PWD/extern/boost
 else
@@ -189 +194 @@
 if [[ "$use_extern_blitz" == "true" ]]
 then
+   rm -r $PWD/extern/blitz
    ln -s $PWD/.void_dir $PWD/extern/blitz
 else