Commit 55298726 authored by hrchilds's avatar hrchilds

Update from July 23, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@41 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3731ff2d
...@@ -184,6 +184,19 @@ cd VTK ...@@ -184,6 +184,19 @@ cd VTK
# #
../CMake-1.4.7/Source/cmake ../CMake-1.4.7/Source/cmake
#
# On linux systems you will want to avoid using runtime type identification
# (rtti) to achieve maximum portability among different versions of linux.
# Ideally this would be done by editing CMakeCache.txt, adding "-fno-rtti"
# to the CMAKE_CXX_FLAGS string and running cmake, but alas, this doesn't
# work. The work around is to do the following:
# env CXXFLAGS="-fno-rtti" ../CMake-1.4.7/Source/cmake
#
# This indirectly turns off rtti, because VTK_NO_ANSI_STRING_STREAM is set
# to 1. This causes vtkOStrStreamWrapper.cxx to use <strstream> instead
# of <sstream>, which requires rtti.
#
# #
# On tru64 systems using g++ 3.0.4, several files in the Imaging directory # On tru64 systems using g++ 3.0.4, several files in the Imaging directory
# will not compile because of an internal compiler error. You will need to # will not compile because of an internal compiler error. You will need to
......
...@@ -446,6 +446,7 @@ switch ($os) ...@@ -446,6 +446,7 @@ switch ($os)
breaksw breaksw
endsw endsw
set verdir = distribution/visit/$Version
set bindir = distribution/visit/$Version/$visitbindir/bin set bindir = distribution/visit/$Version/$visitbindir/bin
set libdir = distribution/visit/$Version/$visitbindir/lib set libdir = distribution/visit/$Version/$visitbindir/lib
set incdir = distribution/visit/$Version/$visitbindir/include set incdir = distribution/visit/$Version/$visitbindir/include
...@@ -609,10 +610,10 @@ endif ...@@ -609,10 +610,10 @@ endif
# #
# Copy the configuration files. # Copy the configuration files.
# #
mkdir $VisItDir/.visit mkdir $verdir/.visit
cp clearcase_bin/visit-config-closed $VisItDir/.visit cp $VisItDir/clearcase_bin/visit-config-closed $verdir/.visit
cp clearcase_bin/visit-config-open $VisItDir/.visit cp $VisItDir/clearcase_bin/visit-config-open $verdir/.visit
ln -s visit-config-open $VisItDir/.visit/config ln -s visit-config-open $verdir/.visit/config
# #
# Strip the executables and shared libraries. # Strip the executables and shared libraries.
......
...@@ -139,7 +139,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 ...@@ -139,7 +139,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist cd $dist
ver=\`cat VERSION\` ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\` ver2=\`echo \$ver | tr "." "_"\`
./configure >> ../buildlog 2>&1 env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1
make -j 4 >> ../buildlog 2>&1 make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz .. mv visit\$ver2.linux.tar.gz ..
...@@ -177,6 +177,7 @@ cd $dist ...@@ -177,6 +177,7 @@ cd $dist
ver=\`cat VERSION\` ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\` ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1 env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1
make -j 4 >> ../buildlog 2>&1
env PARALLEL=4 make -P >> ../buildlog 2>&1 env PARALLEL=4 make -P >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.irix6.tar.gz .. mv visit\$ver2.irix6.tar.gz ..
...@@ -325,7 +326,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 ...@@ -325,7 +326,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist cd $dist
ver=\`cat VERSION\` ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\` ver2=\`echo \$ver | tr "." "_"\`
./configure --enable-parallel >> ../buildlog 2>&1 env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
make -j 3 >> ../buildlog 2>&1 make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz .. mv visit\$ver2.linux.tar.gz ..
......
...@@ -169,10 +169,15 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 ...@@ -169,10 +169,15 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist cd $dist
ver=\`cat VERSION\` ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\` ver2=\`echo \$ver | tr "." "_"\`
./configure >> ../buildlog 2>&1 env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1
make -j 2 >> ../buildlog 2>&1 make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz .. mv visit\$ver2.linux.tar.gz ..
make distclean >> ../buildlog 2>&1
env CXXFLAGS="-O2 -DFAKE_EXCEPTIONS" ./configure >> ../buildlog 2>&1
make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ../visit\$ver2.linux_suse.tar.gz
cd .. cd ..
rm -f resultlog rm -f resultlog
echo " build of visit on kickit" > resultlog 2>&1 echo " build of visit on kickit" > resultlog 2>&1
......
...@@ -144,9 +144,6 @@ while ($config == prompt) ...@@ -144,9 +144,6 @@ while ($config == prompt)
breaksw breaksw
endsw endsw
end end
echo "config=$config"
exit (1)
if ($config != none && $config != open && $config != closed) then if ($config != none && $config != open && $config != closed) then
echo "Illegal configuration option, choices are none, open and closed." echo "Illegal configuration option, choices are none, open and closed."
...@@ -236,11 +233,11 @@ cp distribution/visit/data/* $dir/data ...@@ -236,11 +233,11 @@ cp distribution/visit/data/* $dir/data
# #
# Set the link for the configuration file. # Set the link for the configuration file.
# #
rm -f $dir/.visit/config rm -f $dir/$version+/.visit/config
if ($config == open) then if ($config == open) then
ln -s visit-config-open $dir/.visit/config ln -s visit-config-open $dir/$version+/.visit/config
else if ($config == closed) then else if ($config == closed) then
ln -s visit-config-closed $dir/.visit/config ln -s visit-config-closed $dir/$version+/.visit/config
endif endif
# #
......
...@@ -197,6 +197,7 @@ then ...@@ -197,6 +197,7 @@ then
if [ $test = no ] if [ $test = no ]
then then
scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux.tar.gz . scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux.tar.gz .
scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux_suse.tar.gz .
scp visit$ver2.linux.tar.gz kickit: scp visit$ver2.linux.tar.gz kickit:
scp visit-install kickit: scp visit-install kickit:
scp kickit kickit:kickit_install scp kickit kickit:kickit_install
......
...@@ -17,7 +17,11 @@ ...@@ -17,7 +17,11 @@
// Must be re-added // Must be re-added
//#include <arch.h> //#include <arch.h>
#ifdef FAKE_EXCEPTIONS
#define VISIT_THROW_NOTHING
#else
#define VISIT_THROW_NOTHING throw() #define VISIT_THROW_NOTHING throw()
#endif
// **************************************************************************** // ****************************************************************************
// Class: VisItException // Class: VisItException
...@@ -55,9 +59,12 @@ ...@@ -55,9 +59,12 @@
// I fixed a bug in the fake exceptions' TRY statement that could let // I fixed a bug in the fake exceptions' TRY statement that could let
// nested TRY's rethrow a previously caught exception. // nested TRY's rethrow a previously caught exception.
// //
// Eric Brugger, Wed Jul 23 13:46:05 PDT 2003
// No longer inherit from exception.
//
// **************************************************************************** // ****************************************************************************
class MISC_API VisItException : public std::exception class MISC_API VisItException
{ {
public: public:
VisItException(); VisItException();
......
...@@ -157,12 +157,24 @@ PluginManager::PluginLoaded(const string &id) ...@@ -157,12 +157,24 @@ PluginManager::PluginLoaded(const string &id)
// Programmer: Jeremy Meredith // Programmer: Jeremy Meredith
// Creation: September 26, 2001 // Creation: September 26, 2001
// //
// Modfications:
// Brad Whitlock, Thu Jul 17 09:56:19 PDT 2003
// Prevented case where a bad id could add itself to the allindexmap.
//
// **************************************************************************** // ****************************************************************************
string string
PluginManager::GetPluginName(const string &id) PluginManager::GetPluginName(const string &id)
{ {
return names[allindexmap[id]]; string retval;
if(allindexmap.find(id) != allindexmap.end())
{
int index = allindexmap[id];
if(index < names.size())
retval = names[index];
}
return retval;
} }
// **************************************************************************** // ****************************************************************************
...@@ -177,12 +189,24 @@ PluginManager::GetPluginName(const string &id) ...@@ -177,12 +189,24 @@ PluginManager::GetPluginName(const string &id)
// Programmer: Jeremy Meredith // Programmer: Jeremy Meredith
// Creation: September 26, 2001 // Creation: September 26, 2001
// //
// Modifications:
// Brad Whitlock, Thu Jul 17 09:56:19 PDT 2003
// Prevented case where a bad id could add itself to the allindexmap.
//
// **************************************************************************** // ****************************************************************************
string string
PluginManager::GetPluginVersion(const string &id) PluginManager::GetPluginVersion(const string &id)
{ {
return versions[allindexmap[id]]; string retval;
if(allindexmap.find(id) != allindexmap.end())
{
int index = allindexmap[id];
if(index < versions.size())
retval = versions[index];
}
return retval;
} }
// **************************************************************************** // ****************************************************************************
...@@ -281,12 +305,21 @@ PluginManager::GetEnabledID(int index) const ...@@ -281,12 +305,21 @@ PluginManager::GetEnabledID(int index) const
// Programmer: Jeremy Meredith // Programmer: Jeremy Meredith
// Creation: June 17, 2003 // Creation: June 17, 2003
// //
// Modifications:
// Brad Whitlock, Thu Jul 17 09:51:19 PDT 2003
// Added a check to prevent the case where a bad id could add itself to
// the map.
//
// **************************************************************************** // ****************************************************************************
int int
PluginManager::GetEnabledIndex(const std::string &id) PluginManager::GetEnabledIndex(const std::string &id)
{ {
return loadedindexmap[id]; int retval = -1;
if(loadedindexmap.find(id) != loadedindexmap.end())
retval = loadedindexmap[id];
return retval;
} }
// **************************************************************************** // ****************************************************************************
...@@ -301,12 +334,22 @@ PluginManager::GetEnabledIndex(const std::string &id) ...@@ -301,12 +334,22 @@ PluginManager::GetEnabledIndex(const std::string &id)
// Programmer: Jeremy Meredith // Programmer: Jeremy Meredith
// Creation: September 26, 2001 // Creation: September 26, 2001
// //
// Modifications:
// Brad Whitlock, Thu Jul 17 09:51:19 PDT 2003
// Added a check to prevent the case where a bad id could add itself to
// the map.
//
// **************************************************************************** // ****************************************************************************
void void
PluginManager::DisablePlugin(const string &id) PluginManager::DisablePlugin(const string &id)
{ {
enabled[allindexmap[id]] = false; if(allindexmap.find(id) != allindexmap.end())
{
int index = allindexmap[id];
if(index < enabled.size())
enabled[index] = false;
}
} }
// **************************************************************************** // ****************************************************************************
...@@ -321,12 +364,22 @@ PluginManager::DisablePlugin(const string &id) ...@@ -321,12 +364,22 @@ PluginManager::DisablePlugin(const string &id)
// Programmer: Jeremy Meredith // Programmer: Jeremy Meredith
// Creation: September 26, 2001 // Creation: September 26, 2001
// //
// Modifications:
// Brad Whitlock, Thu Jul 17 09:51:19 PDT 2003
// Added a check to prevent the case where a bad id could add itself to
// the map.
//
// **************************************************************************** // ****************************************************************************
void void
PluginManager::EnablePlugin(const string &id) PluginManager::EnablePlugin(const string &id)
{ {
enabled[allindexmap[id]] = true; if(allindexmap.find(id) != allindexmap.end())
{
int index = allindexmap[id];
if(index < enabled.size())
enabled[index] = true;
}
} }
// **************************************************************************** // ****************************************************************************
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -31,7 +31,7 @@ AnimationAttributes::AnimationAttributes() : AttributeSubject("bi") ...@@ -31,7 +31,7 @@ AnimationAttributes::AnimationAttributes() : AttributeSubject("bi")
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -54,7 +54,7 @@ AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) : Attri ...@@ -54,7 +54,7 @@ AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) : Attri
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -74,7 +74,7 @@ AnimationAttributes::~AnimationAttributes() ...@@ -74,7 +74,7 @@ AnimationAttributes::~AnimationAttributes()
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -98,7 +98,7 @@ AnimationAttributes::operator = (const AnimationAttributes &obj) ...@@ -98,7 +98,7 @@ AnimationAttributes::operator = (const AnimationAttributes &obj)
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -121,7 +121,7 @@ AnimationAttributes::operator == (const AnimationAttributes &obj) const ...@@ -121,7 +121,7 @@ AnimationAttributes::operator == (const AnimationAttributes &obj) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -142,7 +142,7 @@ AnimationAttributes::operator != (const AnimationAttributes &obj) const ...@@ -142,7 +142,7 @@ AnimationAttributes::operator != (const AnimationAttributes &obj) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -163,7 +163,7 @@ AnimationAttributes::TypeName() const ...@@ -163,7 +163,7 @@ AnimationAttributes::TypeName() const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -191,7 +191,7 @@ AnimationAttributes::CopyAttributes(const AttributeGroup *atts) ...@@ -191,7 +191,7 @@ AnimationAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Tue Jun 3 17:47:27 PST 2003 // Creation: Wed Jul 23 11:29:25 PDT 2003
// //
// Modifications: // Modifications:
// //
...@@ -208,6 +208,33 @@ AnimationAttributes::CreateCompatible(const std::string &tname) const ...@@ -208,6 +208,33 @@ AnimationAttributes::CreateCompatible(const std::string &tname) const
return retval; return retval;
} }
// ****************************************************************************
// Method: AnimationAttributes::NewInstance
//
// Purpose:
// NewInstance method for the AnimationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:29:25 PDT 2003
//
// Modifications:
//
// ****************************************************************************
AttributeSubject *
AnimationAttributes::NewInstance(bool copy) const
{
AttributeSubject *retval = 0;
if(copy)
retval = new AnimationAttributes(*this);
else
retval = new AnimationAttributes;
return retval;
}
// **************************************************************************** // ****************************************************************************
// Method: AnimationAttributes::SelectAll // Method: AnimationAttributes::SelectAll