Commit 0c16752d authored by hrchilds's avatar hrchilds
Browse files

Merge RC to trunk, picking up build_visit Ubuntu fix and VCell compile error.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16012 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4d9c9c7e
......@@ -2299,7 +2299,9 @@ void avtVCellMTMDFileFormat::substituteVisitFunctionSyntax(avtDatabaseMetaData *
ss << "_" << SPECIAL_XYZT[i] << "_";
SPECIAL_XYZT[i] = ss.str();
}
vcellExpr->substituteInPlace(& VCell::Expression(RESERVE_XYZT[i]),& VCell::Expression(SPECIAL_XYZT[i]));
VCell::Expression reserveExp(RESERVE_XYZT[i]);
VCell::Expression specialExp(SPECIAL_XYZT[i]);
vcellExpr->substituteInPlace(& reserveExp,& specialExp);
}
//Convert VCell function syntax to Visit
......
......@@ -462,6 +462,10 @@
#
# Mark C. Miller, Fri Aug 12 09:59:09 PDT 2011
# Removed defintion and use of $darwin_szip in build_hdf5
#
# Hank Childs, Mon Aug 29 11:07:26 PDT 2011
# More tricks for Ubuntu.
#
# *****************************************************************************
......@@ -8954,10 +8958,13 @@ function build_hostconf
# Patch for Ubuntu 11.04
#
if test -d "/usr/lib/x86_64-linux-gnu" ; then
rm -f $HOSTCONF.tmp
cat $HOSTCONF | sed "s/\/usr\/lib/\/usr\/lib\/x86_64-linux-gnu/" > $HOSTCONF.tmp
rm $HOSTCONF
mv $HOSTCONF.tmp $HOSTCONF
numLibs=$(ls -1 /usr/lib/x86_64-linux-gnu | wc -l)
if (( $numLibs > 10 )) ; then
rm -f $HOSTCONF.tmp
cat $HOSTCONF | sed "s/\/usr\/lib/\/usr\/lib\/x86_64-linux-gnu/" > $HOSTCONF.tmp
rm $HOSTCONF
mv $HOSTCONF.tmp $HOSTCONF
fi
fi
cd "$START_DIR"
......
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