Commit c5bf6f22 authored by hrchilds's avatar hrchilds

Update from December 19, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@782 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5fcdf848
......@@ -14,7 +14,7 @@ shell prompt.
Library Version Description For More Information
======= ======= =========== ====================
Mesa 5.0 3-D Graphics Library http://www.mesa3d.org/
Python 2.1.2 Scripting Language http://www.python.org
Python 2.5 Scripting Language http://www.python.org
Qt 3.3.2 GUI Toolkit http://www.trolltech.com
Silo 4.5.1 File I/O library http://www.llnl.gov/bdiv/meshtv
VTK 5.0.0b Visualization Toolkit http://www.kitware.com
......@@ -728,16 +728,7 @@ directions listed below to build Python. If you have any problems building
or installing Python, read the README file in the Python distribution for more
information.
Note that instructions for building 2 different versions of Python are given
here because versions of VisIt built using xlc (7.0.0.2 or later) can have
threading problems that lead to crashes of the CLI when Python 2.1.2 is used.
For that reason, if you are building on AIX using a newer version of xlc,
download the Python 2.4.2 source code from http://www.python.org and use
it to build VisIt. VisIt will eventually be upgraded to use Python 2.4.2 or
later on all platforms.
Building Python 2.1.2
Building Python 2.5
======================
On itanium (ia64) systems, the -fPIC flag is needed. On opteron systems,
......@@ -758,12 +749,25 @@ as described above but -64 is added to OPT and LDFLAGS. For example:
env OPT="-64 -O2" LDFLAGS="-64" ./configure --prefix=$VISITDIR/python/$VISITARCH
When you need to specify a C compiler other than the default gcc compiler
that Python's configure process will detect, you should also specify a
compatible C++ compiler so you can build C++ Python extensions. You can
specify compilers using the following example command lines:
env CXX=CC ./configure --with-gcc=cc --with-cxx=CC --prefix=$VISITDIR/python/$VISITARCH # irix
env CXX=xlC ./configure --with-gcc=xlc --with-cxx=xlC --prefix=$VISITDIR/python/$VISITARCH # aix
On AIX systems, you may want to build using the vendor xlc compiler in 64 bit mode.
Use the following command line to do so:
env CXX=xlC ./configure --with-gcc="xlc -q64 -O2" --with-cxx="xlC -q64 -O2" --disable-ipv6 AR="ar -X64" --prefix=$VISITDIR/python/$VISITARCH
#
# Build and install it in the visit directory under the python directory.
#
gunzip Python-2.1.2.tar.gz
tar xf Python-2.1.2.tar
cd Python-2.1.2
gunzip Python-2.5.tgz
tar xf Python-2.5.tar
cd Python-2.5
./configure --prefix=$VISITDIR/python/$VISITARCH
make
make install
......@@ -773,51 +777,21 @@ make install
#
mkdir tmpdir
cd tmpdir
ar -x ../libpython2.1.a
ar -x ../libpython2.5.a
# Use the appropriate command based on the operating system on which
# you are creating the shared library.
g++ -Wl,-G -shared -o ../libpython2.1.so *.o # aix
g++ -shared -o ../libpython2.1.so *.o # irix
CC -shared -o ../libpython2.1.so *.o # irix
CC -64 -shared -o ../libpython2.1.so *.o # irix 64
g++ -shared -o ../libpython2.1.so *.o # linux
g++ -m64 -shared -o ../libpython2.1.so *.o # opteron
g++ -Wl,-G -o ../libpython2.1.so *.o # solaris
g++ -Wl,-expect_unresolved -Wl,'*' -shared -o ../libpython2.1.so *.o # tru64
xlc -qmkshrobj -o ../libpython2.5.so ../libpython2.5.a -lm # aix / xlc
g++ -Wl,-G -shared -o ../libpython2.5.so *.o # aix / gcc
g++ -shared -o ../libpython2.5.so *.o # irix
CC -shared -o ../libpython2.5.so *.o # irix
CC -64 -shared -o ../libpython2.5.so *.o # irix 64
g++ -shared -o ../libpython2.5.so *.o # linux
g++ -m64 -shared -o ../libpython2.5.so *.o # opteron
g++ -Wl,-G -o ../libpython2.5.so *.o # solaris
g++ -Wl,-expect_unresolved -Wl,'*' -shared -o ../libpython2.5.so *.o # tru64
cd ..
rm -rf tmpdir
cp libpython2.1.so $VISITDIR/python/$VISITARCH/lib/python2.1/config/libpython2.1.so
cd ..
Building Python 2.4.2 (AIX instructions)
=========================================
tar zxvf Python-2.4.2.tar.gz
cd Python-2.4.2
#
# Make changes to setup.py
# Comment out lines 469-475, 727-735, 960, 1066
# Save the changes and exit your editor
#
#
# Configure and build Python
#
./configure --with-gcc="xlc_r -q64 -O2" --with-cxx="xlC_r -q64 -O2" --disable-ipv6 AR="ar -X64" --prefix=$VISITDIR/python/$VISITARCH
make
make install
#
# Create a shared library version of the python library.
#
xlc -qmkshrobj -o libpython2.4.so libpython2.4.a -lm
#
# Install the shared library version of the python library.
#
cp libpython2.4.so $VISITDIR/python/$VISITARCH/lib/python2.4/config/libpython2.4.so
cp libpython2.5.so $VISITDIR/python/$VISITARCH/lib/python2.5/config/libpython2.5.so
cd ..
......
......@@ -149,6 +149,9 @@
# Brad Whitlock, Tue Mar 21 14:27:38 PST 2006
# I made it build libsim.
#
# Brad Whitlock, Wed Nov 22 11:41:54 PDT 2006
# I added a top level visitmodule target.
#
##############################################################################
@SET_MAKE@
......@@ -200,3 +203,6 @@ message:
maintainer-clean: distclean
-$(RM) ${DISTCLEAN_FILES}
-$(RM) configure include/config.h.in
visitmodule:
do (cd visitpy && $(MAKE) $@) || exit 1; done
......@@ -40,7 +40,7 @@
# You must have:
# Qt qt-x11-free-3.3.2.tar.gz
# Mesa Mesa-5.0-mangled.tar
# Python Python-2.1.2.tar
# Python Python-2.5.tgz
# VTK vtk-5.0.0b.tar
# CMake cmake-2.2.3.tar
# Silo silo060605.sh
......@@ -69,6 +69,9 @@
# "visit-arch" string involved undefined variable, which caused problems
# on some platforms.
#
# Brad Whitlock, Fri Dec 15 11:51:40 PDT 2006
# Added support for Python 2.5.
#
# *****************************************************************************
......@@ -121,8 +124,8 @@ export MESA_VERSION="5.0"
export MESA_DIR="Mesa-5.0" # The directory contained in the tarball
export MESA_TARGET="linux"
export PYTHON_FILE="Python-2.1.2.tar"
export PYTHON_VERSION="2.1.2"
export PYTHON_FILE="Python-2.5.tgz"
export PYTHON_VERSION="2.5"
export QT_FILE="qt-x11-free-3.3.2.tar"
export QT_VERSION="3.3.2"
......@@ -604,21 +607,10 @@ function build_vtk
function build_python
{
#
# Unzip the file, provided a gzipped file exists.
#
if [[ -f ${PYTHON_FILE}.gz ]] ; then
gunzip ${PYTHON_FILE}.gz
if [[ $? != 0 ]] ; then
echo "Unable to unzip ${PYTHON_FILE}.gz. Corrupted file or out of space on device?"
return 1
fi
fi
#
# Untar the file.
#
tar xf ${PYTHON_FILE}
tar zxf ${PYTHON_FILE}
if [[ $? != 0 ]] ; then
echo "Unable to untar $PYTHON_FILE. Corrupted file or out of space on device?"
return 1
......@@ -627,10 +619,10 @@ function build_python
#
# Call configure
#
PYTHON_DIR=${PYTHON_FILE%.tar}
PYTHON_DIR=${PYTHON_FILE%.tgz}
cd ${PYTHON_DIR}
echo "Invoking command to build Python"
env OPT="$C_OPT_FLAGS" ./configure --prefix=$VISITDIR/python/$VISITARCH
echo "Invoking command to build Python: env OPT=\"$C_OPT_FLAGS\" CXX=\"$CPP_COMPILER\" CC=\"$C_COMPILER\" ./configure --prefix=$VISITDIR/python/$VISITARCH"
env OPT="$C_OPT_FLAGS" CXX="$CPP_COMPILER" CC="$C_COMPILER" ./configure --prefix=$VISITDIR/python/$VISITARCH
if [[ $? != 0 ]] ; then
echo "Python configure failed. Giving up"
return 1
......@@ -656,11 +648,11 @@ function build_python
echo "Creating shared library"
mkdir tmpdir
cd tmpdir
ar -x ../libpython2.1.a
g++ -shared -o ../libpython2.1.so *.o
ar -x ../libpython$PYTHON_VERSION.a
$C_COMPILER $C_OPT_FLAGS -shared -o ../libpython$PYTHON_VERSION.so *.o
cd ..
rm -rf tmpdir
cp libpython2.1.so $VISITDIR/python/$VISITARCH/lib/python2.1/config/libpython2.1.so
cp libpython$PYTHON_VERSION.so $VISITDIR/python/$VISITARCH/lib/python$PYTHON_VERSION/config/
cd ..
echo "Done with Python"
}
......
......@@ -9,6 +9,10 @@
# Usage:
# visit-build-open -d <distribution>
#
# Modifications:
# Brad Whitlock, Fri Dec 15 09:51:55 PDT 2006
# Added --enable-visitmodule for some platforms.
#
#-----------------------------------------------------------------------
test=no
......@@ -203,7 +207,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ..
......@@ -253,7 +257,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-visitmodule >> ../buildlog 2>&1
cd databases/Fluent
sed "s/\\\$(CXXFLAGSORIG)/-D_LARGEFILE64_SOURCE -Wall -Wno-sign-compare -Wno-deprecated/" Makefile > Makefile+;rm Makefile;mv Makefile+ Makefile
cd ../..
......@@ -306,7 +310,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.irix6.tar.gz ..
......@@ -456,7 +460,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ..
......@@ -506,7 +510,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CC=icc CXX=icpc CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env CC=icc CXX=icpc CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -compiler icc >> ../buildlog 2>&1
mv visit\$ver2.linux-icc.tar.gz ..
......@@ -556,7 +560,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux-ia64.tar.gz ..
......@@ -606,7 +610,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -switch ib >> ../buildlog 2>&1
mv visit\$ver2.linux-x86_64-ib.tar.gz ..
......@@ -656,7 +660,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make -j 6 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux-x86_64.tar.gz ..
......
......@@ -62,11 +62,16 @@ DatabasePluginManager *DatabasePluginManager::instance=0;
// Creation: August 22, 2002
//
// Modifications:
// Brad Whitlock, Wed Nov 22 16:31:59 PST 2006
// I made it call SetPluginDir since it's no longer done in the base
// class's constructor.
//
// ****************************************************************************
DatabasePluginManager::DatabasePluginManager() : PluginManager("database")
{
// Make it use VISITPLUGINDIR.
SetPluginDir(0);
}
// ****************************************************************************
......
......@@ -100,15 +100,20 @@ OperatorPluginManager::~OperatorPluginManager()
// Jeremy Meredith, Wed Jan 16 09:47:44 PST 2002
// Added parallel flag.
//
// Brad Whitlock, Wed Nov 22 16:23:24 PST 2006
// I added the pluginDir flag so applications can tell the plugin
// manager where to look directly without environment vars.
//
// ****************************************************************************
void
OperatorPluginManager::Initialize(const PluginCategory pluginCategory,
bool parallel)
bool parallel, const char *pluginDir)
{
Instance();
instance->category = pluginCategory;
instance->parallel = parallel;
instance->SetPluginDir(pluginDir);
instance->ReadPluginInfo();
}
......
......@@ -105,7 +105,9 @@ class PLUGIN_API OperatorPluginManager : public PluginManager
public:
virtual ~OperatorPluginManager();
static void Initialize(const PluginCategory, bool=false);
static void Initialize(const PluginCategory pluginCategory,
bool parallel=false,
const char *pluginDir = 0);
static OperatorPluginManager *Instance();
virtual void ReloadPlugins();
......
......@@ -92,6 +92,7 @@ PlotPluginManager::~PlotPluginManager()
// Arguments:
// pluginCategory: either GUI, Viewer, or Engine
// parallel : true if need parallel libraries
// pluginDir : Allows us to pass in the plugin dir that we want to use.
//
// Programmer: Jeremy Meredith
// Creation: September 26, 2001
......@@ -100,15 +101,19 @@ PlotPluginManager::~PlotPluginManager()
// Jeremy Meredith, Wed Jan 16 09:47:44 PST 2002
// Added parallel flag.
//
// Brad Whitlock, Wed Nov 22 16:29:46 PST 2006
// Added pluginDir.
//
// ****************************************************************************
void
PlotPluginManager::Initialize(const PluginCategory pluginCategory,
bool parallel)
bool parallel, const char *pluginDir)
{
Instance();
instance->category = pluginCategory;
instance->parallel = parallel;
instance->SetPluginDir(pluginDir);
instance->ReadPluginInfo();
}
......
......@@ -98,6 +98,9 @@ class ScriptingPlotPluginInfo;
// purpose (which really is unrelated to FreeCommonPluginInfo and
// GetCommonPluginInfo).
//
// Brad Whitlock, Wed Nov 22 16:30:48 PST 2006
// Added const char * argument to Initialize function.
//
// ****************************************************************************
class PLUGIN_API PlotPluginManager : public PluginManager
......@@ -105,7 +108,8 @@ class PLUGIN_API PlotPluginManager : public PluginManager
public:
virtual ~PlotPluginManager();
static void Initialize(const PluginCategory, bool=false);
static void Initialize(const PluginCategory,
bool=false, const char * = 0);
static PlotPluginManager *Instance();
virtual void ReloadPlugins();
......
......@@ -89,6 +89,9 @@ using std::sort;
// Jeremy Meredith, Tue Feb 8 08:40:57 PST 2005
// Added initialization of pluginInitErrors.
//
// Brad Whitlock, Wed Nov 22 16:26:20 PST 2006
// I removed the call to SetPluginDir.
//
// ****************************************************************************
PluginManager::PluginManager(const string &mgr)
......@@ -99,7 +102,6 @@ PluginManager::PluginManager(const string &mgr)
category = no_category;
handle = 0;
pluginError = new char[MAX_PLUGINERROR];
SetPluginDir();
}
// ****************************************************************************
......@@ -1279,27 +1281,37 @@ void *dlsym(void *handle, const char *symbol)
// parsing algorithm for UNIX directories is inadequate for Windows
// directory names.
//
// Brad Whitlock, Wed Nov 22 16:25:19 PST 2006
// I made it possible to pass in the plugin directory. If it does not
// get passed in (the default) then we use VISITPLUGINDIR.
//
// ****************************************************************************
void
PluginManager::SetPluginDir()
PluginManager::SetPluginDir(const char *PluginDir)
{
// Get the plugin directory from the environment.
char *plugindir = getenv("VISITPLUGINDIR");
if (!plugindir)
const char *plugindir = 0;
if(PluginDir == 0)
{
plugindir = getenv("VISITPLUGINDIR");
if (!plugindir)
{
#if defined(_WIN32)
plugindir = "C:\\VisItWindows\\bin";
plugindir = "C:\\VisItWindows\\bin";
#else
EXCEPTION1(VisItException,
EXCEPTION1(VisItException,
"The environment variable VISITPLUGINDIR must be defined.");
#endif
}
}
else
plugindir = PluginDir;
#if defined(_WIN32)
pluginDirs.push_back(string(plugindir) + SLASH_STRING + managerName + "s");
#else
char *c = plugindir;
const char *c = plugindir;
while (*c)
{
string dir;
......
......@@ -81,6 +81,9 @@
// for PluginSymbol to not print an error if requested to be
// silent about such things.
//
// Brad Whitlock, Wed Nov 22 16:26:54 PST 2006
// I added an argument to SetPluginDir.
//
// ****************************************************************************
class PLUGIN_API PluginManager
......@@ -98,10 +101,6 @@ class PLUGIN_API PluginManager
public:
virtual ~PluginManager();
static void Initialize(const std::string &managerName,
const PluginCategory,
bool=false);
void DisablePlugin(const std::string&);
void EnablePlugin(const std::string&);
bool PluginEnabled(const std::string&);
......@@ -131,7 +130,7 @@ class PLUGIN_API PluginManager
protected:
PluginManager(const std::string&);
void ReadPluginInfo();
void SetPluginDir();
void SetPluginDir(const char *);
void ReadPluginDir(std::vector<
std::pair<std::string,
std::string> > &);
......
......@@ -1618,7 +1618,7 @@ bool ColorAttribute::SetByName(const char *const colorName)
// Creation: July 13, 2006
// **************************************************************************
const char *const ColorAttribute::GetByName() const
const char *ColorAttribute::GetByName() const
{
for (int i = 0; i < numNamedColors; i++)
{
......
......@@ -1160,7 +1160,7 @@ bool ColorAttribute::SetByName(const char *const colorName)
}
Function: GetByName
Declaration: const char *const GetByName() const;
Declaration: const char *GetByName() const;
Definition:
// **************************************************************************
// Method: ColorAttribute::GetName
......@@ -1171,7 +1171,7 @@ Definition:
// Creation: July 13, 2006
// **************************************************************************
const char *const ColorAttribute::GetByName() const
const char *ColorAttribute::GetByName() const
{
for (int i = 0; i < numNamedColors; i++)
{
......
......@@ -110,7 +110,7 @@ public:
int Alpha() const;
void SetRgba2(double c[4]);
bool SetByName(const char *const colorName);
const char *const GetByName() const;
const char *GetByName() const;
private:
unsigned char color[4];
};
......
......@@ -23,7 +23,7 @@ QT_LIB=$VISITHOME/qt/3.3.2/ARCH/lib
## Specify the location of the python include files and libraries.
##
PYDIR=$VISITHOME/python/ARCH
PYVERSION=python2.1
PYVERSION=python2.5
##
## Database reader plugin support libraries
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_rhel3_gcc_3.2.3
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/linux_rhel3_gcc_3.2.3
PYVERSION=python2.5
##
## Turn off warnings for deprecated features.
......
......@@ -39,8 +39,8 @@ fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_5_xlc_32
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/aix_5_xlc_32
PYVERSION=python2.5
##
## Turn on dynamic cast code.
......
......@@ -39,8 +39,8 @@ fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_5_xlc_32
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/aix_5_xlc_32
PYVERSION=python2.5
##
## Turn on dynamic cast code.
......
......@@ -39,8 +39,8 @@ fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_5_xlc_32
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/aix_5_xlc_32
PYVERSION=python2.5
##
## Turn on dynamic cast code.
......
......@@ -39,8 +39,8 @@ fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_5_xlc_32
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/aix_5_xlc_32
PYVERSION=python2.5
##
## Turn on dynamic cast code.
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_rhel3_gcc_3.2.3
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/linux_rhel3_gcc_3.2.3
PYVERSION=python2.5
##
## Turn off warnings for deprecated features.
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_rhel3_gcc_3.2.3
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/linux_rhel3_gcc_3.2.3
PYVERSION=python2.5
##
## Turn off warnings for deprecated features.
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.5
##
## Add parallel arguments.
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.5
##
## Add parallel arguments.
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.5
##
## Add parallel arguments.
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/chaos_3_x86_64_ib_gcc_3.4.4
PYVERSION=python2.5
##
## Add parallel arguments.
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_rhel3_gcc_3.2.3
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/linux_rhel3_gcc_3.2.3
PYVERSION=python2.5
##
## Turn off warnings for deprecated features.
......
......@@ -39,8 +39,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_redhat7_gcc_3.2.3
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/linux_redhat7_gcc_3.2.3
PYVERSION=python2.5
##
## Database reader plugin support libraries
......
......@@ -33,8 +33,8 @@ fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_rhel3_gcc_3.2.3
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/linux_rhel3_gcc_3.2.3
PYVERSION=python2.5
##
## Turn off warnings for deprecated features.
......
......@@ -39,8 +39,8 @@ fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_5_xlc_32
PYVERSION=python2.1
PYDIR=$VISITHOME/python/2.5/aix_5_xlc_32
PYVERSION=python2.5
##
## Turn on dynamic cast code.
......