Commit 32978f62 authored by hkrishna's avatar hkrishna
Browse files

adding hdf5 support to build_visit, modified build_visit to use curl, wget, or...

adding hdf5 support to build_visit, modified build_visit to use curl, wget, or svn to get support files

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16588 18c085ea-50e0-402c-830e-de6fd14e8384
parent be3a3d21
...@@ -55,23 +55,66 @@ bv_PATH=`dirname $0` ...@@ -55,23 +55,66 @@ bv_PATH=`dirname $0`
bv_PREFIX=$bv_PATH/bv_support/ bv_PREFIX=$bv_PATH/bv_support/
#check same directory as build_visit
if [ ! -d $bv_PREFIX ]; then if [ ! -d $bv_PREFIX ]; then
#check current directory #check current directory
bv_PREFIX=$PWD/bv_support/ bv_PREFIX=$PWD/bv_support/
if [ ! -d $bv_PREFIX ]; then if [ ! -d $bv_PREFIX ]; then
echo "bv_support does not exist, fetching..."
tmp=`which svn` for choice in `echo "curl wget svn"`
do
echo "Trying to fetch support files using: $choice"
#if choice successful then exit, else try next..
webaddr="http://portal.nersc.gov/svn/visit/trunk/src/svn_bin/bv_support/"
tmp_choice=`which $choice`
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "svn support not available, no ability to fetch support files" continue
exit 2
fi fi
#checkout the support directory if [[ $choice == "curl" ]]; then
#svn co svn+ssh://$SVN_NERSC_NAME@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/src/svn_bin/bv_support bv_support tmp_curl=`curl -s ${webaddr}/|grep sh|grep li|sed s/.*bv_/bv_/g | sed -e s/\.sh.*/\.sh/g | sed -e s/.*href\=\"//g;`
svn co http://portal.nersc.gov/svn/visit/trunk/src/svn_bin/bv_support bv_support
if [ $? != 0 ]; then
continue
fi
mkdir -p bv_support_tmp
is_successful=1
#fetch each file..
for curl_files in `echo $tmp_curl`
do
curl -s ${webaddr}/${curl_files} -o bv_support_tmp/$curl_files
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "download of support files failed. Please contact visit-users mailing list for help. Quitting" is_successful=0
break
fi fi
done
#if not successful cleanup and try next option..
if [ $is_successful == 0 ]; then
rm -fR bv_support_tmp
else
mv bv_support_tmp bv_support
fi
elif [[ $choice == "wget" ]]; then
wget -r -nH --cut-dirs=5 --no-parent --reject="index.html" -q ${webaddr}
else
svn co ${webaddr} bv_support
fi
if [ ! -d $bv_PREFIX ]; then
echo "$choice failed to retrieve support files"
else
echo "Success. downloaded support, continuing"
break
fi
done
fi
if [ ! -d $bv_PREFIX ]; then
echo "Failed to detect or fetch support files, please contact visit-users mailing list with error. Quitting..."
exit 2
fi fi
fi fi
......
...@@ -130,7 +130,9 @@ function build_mxml ...@@ -130,7 +130,9 @@ function build_mxml
function bv_mxml_build function bv_mxml_build
{ {
echo "mxml not build directly" if [[ "$DO_MXML" == "yes" ]] ; then
echo "MXML build currently handled by ADIOS.."
fi
} }
function bv_mxml_graphical function bv_mxml_graphical
......
...@@ -83,6 +83,8 @@ function bv_visus_dry_run ...@@ -83,6 +83,8 @@ function bv_visus_dry_run
function bv_visus_build function bv_visus_build
{ {
echo "visus does not build" if [[ "$DO_VISUS" == "yes" ]] ; then
echo "Build support not available for visus.."
fi
} }
...@@ -8,6 +8,10 @@ function bv_xdmf_enable ...@@ -8,6 +8,10 @@ function bv_xdmf_enable
{ {
DO_XDMF="yes" DO_XDMF="yes"
ON_XDMF="on" ON_XDMF="on"
#xdmf is dependent on HDF5
DO_HDF5="yes"
ON_HDF5="on"
} }
function bv_xdmf_disable function bv_xdmf_disable
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment