Commit 3376a0b3 authored by hrchilds's avatar hrchilds

Update from August 25, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@308 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4a641b91
This diff is collapsed.
Copyright 2000 - 2002.
Copyright 2000 - 2004.
The Regents of the University of California.
All rights reserved.
......
......@@ -911,6 +911,12 @@ class MakeMovie:
# Programmer: Brad Whitlock
# Date: Mon Jul 28 13:58:06 PST 2003
#
# Modifications:
# Brad Whitlock, Tue Aug 24 09:32:39 PDT 2004
# I set the outputToCurrentDirectory flag to true because on Windows,
# the default is to output files to a specified directory, which is not
# what we want when saving movie frames.
#
###########################################################################
def SaveImage(self, index, ext):
......@@ -929,6 +935,7 @@ class MakeMovie:
s.format = s.RGB
s.width = self.xres
s.height = self.yres
s.outputToCurrentDirectory = 1
SetSaveWindowAttributes(s)
return SaveWindow()
......
......@@ -326,6 +326,10 @@ $0 = shift @ARGV;
# I modified the setting of the LD_LIBRARY_PATH so that /usr/local/lib
# is at the end of the path instead of at the beginning.
#
# Jeremy Meredith, Wed Aug 25 09:25:41 PDT 2004
# Added help for "-timing". Added the "-env" option. Added
# "-h" and "--help" as valid arguments to priunt the help text.
#
###############################################################################
......@@ -469,6 +473,8 @@ USAGE: visit [arguments]
Debugging arguments:
-debug <level> Run with <level> levels of output logging.
<level> must be between 1 and 5.
-timing Print timings files.
-env Print environment variables only.
-dump Have streamers dump their results to files.
-gdb Run under gdb.
-gdb-gui Run the gui under gdb.
......@@ -506,7 +512,8 @@ $launchengine = "";
$debug_gdb = 0;
$debug_totalview = "";
$add_movie_args = 0;
$logging = 0;
$envonly = 0;
$logging = 0;
# Parse the arguments
@visitargs = ();
......@@ -556,7 +563,10 @@ while (scalar(@ARGV) > 0) {
elsif ($arg eq "-publicpluginsonly"){ $publiconly = 1; push @visitargs, $arg; }
elsif ($arg eq "-version") { $want_version = 1; }
elsif ($arg eq "-help") { print STDERR "$usage\n"; exit(0); }
elsif ($arg eq "-h") { print STDERR "$usage\n"; exit(0); }
elsif ($arg eq "--help") { print STDERR "$usage\n"; exit(0); }
elsif ($arg eq "-norun") { $nr = shift; push @norun, $nr; push @visitargs, "-norun", $nr; }
elsif ($arg eq "-env") { $envonly = 1; }
elsif ($arg eq "-launchengine") { if (scalar(@ARGV)>0) {$launchengine = shift;}
if ($launchengine eq "") { $launchengine="localhost"; }
elsif ($launchengine =~ /^-/) { unshift @ARGV, $launchengine; $launchengine = "localhost";}}
......@@ -1150,6 +1160,12 @@ if ($logging and $exe_name eq "mdserver")
# Run it!
# -----------------------------------------------------------------------------
if ($envonly)
{
PrintEnvironment();
exit(0);
}
@visitcmd = ("$visitbindir/$exe_name", @visitargs);
$printonly = grep(/^$exe_name$/, @norun) unless ($debug_totalview);
......@@ -1500,7 +1516,23 @@ sub RunComponent {
}
sub PrintEnvironment {
if (grep(/csh/, "$ENV{SHELL}"))
if ($envonly)
{
print STDERR <<"EOF"
LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}
LD_LIBRARY32_PATH=$ENV{LD_LIBRARY32_PATH}
LD_LIBRARYN32_PATH=$ENV{LD_LIBRARYN32_PATH}
LD_LIBRARY64_PATH=$ENV{LD_LIBRARY64_PATH}
LIBPATH=$ENV{LIBPATH}
VISITHOME=$ENV{VISITHOME}
VISITHELPHOME=$ENV{VISITHELPHOME}
VISITPLUGINDIR=$ENV{VISITPLUGINDIR}
PYTHONHOME=$ENV{PYTHONHOME}
TRAP_FPE=$ENV{TRAP_FPE}
MESA_GLX_FX=$ENV{MESA_GLX_FX}
EOF
}
elsif (grep(/csh/, "$ENV{SHELL}"))
{
print STDERR <<"EOF"
Be sure to set your environment variables:
......
......@@ -367,6 +367,9 @@ ReadKey(const char *key, char **keyval)
* found. In that case, it now tries to look up VISITDEVDIR. Finally,
* if that is not found then it resorts to using
*
* Brad Whitlock, Mon Aug 16 09:22:53 PDT 2004
* Added binary locations for MSVC7.Net versions of VisIt.
*
*****************************************************************************/
char *
......@@ -393,10 +396,19 @@ AddEnvironment(int useShortFileName)
if(haveVISITDEVDIR)
{
#ifdef USING_MSVC6
#if defined(_DEBUG)
static const char *configDir = "\\bin\\Debug";
#else
static const char *configDir = "\\bin\\Release";
#endif
#else
/* The location of the binaries are different for MSVC7.Net */
#if defined(_DEBUG)
static const char *configDir = "\\bin\\MSVC7.Net\\Debug";
#else
static const char *configDir = "\\bin\\MSVC7.Net\\Release";
#endif
#endif
visitpath = (char *)malloc(strlen(visitdevdir) + strlen(configDir) + 1);
sprintf(visitpath, "%s%s", visitdevdir, configDir);
......@@ -404,10 +416,19 @@ AddEnvironment(int useShortFileName)
else
{
char tmpdir[512];
#ifdef USING_MSVC6
#if defined(_DEBUG)
sprintf(tmpdir, "C:\\VisItDev%s\\bin\\Debug", VERSION);
#else
sprintf(tmpdir, "C:\\VisItDev%s\\bin\\Release", VERSION);
#endif
#else
/* The location of the binaries are different for MSVC7.Net */
#if defined(_DEBUG)
sprintf(tmpdir, "C:\\VisItDev%s\\bin\\MSVC7.Net\\Debug", VERSION);
#else
sprintf(tmpdir, "C:\\VisItDev%s\\bin\\MSVC7.Net\\Release", VERSION);
#endif
#endif
visitpath = (char *)malloc(strlen(tmpdir) + 1);
strcpy(visitpath, tmpdir);
......
......@@ -56,6 +56,9 @@
# Brad Whitlock, Fri Apr 23 12:25:56 PDT 2004
# Added winutil to the top level.
#
# Jeremy Meredith, Tue Aug 24 21:29:45 PDT 2004
# Added the simulation prototype.
#
withhelp=no
......@@ -99,6 +102,7 @@ PATH="$PATH:./clearcase_bin"
./clearcase_bin/mkman --quiet --recursive --simple ./visitpy
./clearcase_bin/mkman --quiet --recursive --simple ./java
./clearcase_bin/mkman --quiet --recursive --simple ./tools
./clearcase_bin/mkman --quiet --recursive --simple ./sim
./clearcase_bin/mkman --quiet --recursive --simple ./data
./clearcase_bin/mkman --quiet --recursive --simple ./include
./clearcase_bin/mkman --quiet --recursive --simple ./bin
......
This diff is collapsed.
This diff is collapsed.
......@@ -39,6 +39,9 @@
# Brad Whitlock, Tue Jun 29 10:12:12 PDT 2004
# I made the Windows version get its own config files.
#
# Brad Whitlock, Thu Aug 12 12:26:57 PDT 2004
# I added support for the MSVC7.Net compiler suite.
#
#------------------------------------------------------------------------------
if(`pwd` != "/data_vobs/VisIt") then
......@@ -158,12 +161,6 @@ cp $TOPDIR/include/vtk/MangleMesaInclude/*.h include/VTK/MangleMesaInclude
rm -f include/VTK/vtkCamera.h
mv include/VisIt/vtkCamera.h include/VTK
#
# Create an include/Python directory and copy the Python headers to it.
#
echo "Copying Python include files to include/Python..."
cp -R $TOPDIR/include/Python include
#
# Create an include/Mesa directory and copy the Mesa files to it.
#
......@@ -180,7 +177,7 @@ cd $VisItDev
#
echo "Creating bin directory..."
cp -R $TOPDIR/windowsbuild/bin .
foreach configdir (Debug Release)
foreach configdir (Debug Release MSVC7.Net/Debug MSVC7.Net/Release)
# Copy the makemovie script to the right bin dir.
cp $VISITSRC/bin/makemovie.py bin/$configdir
# Copy the host config files to the right bin dir.
......@@ -199,20 +196,48 @@ foreach configdir (Debug Release)
echo "Directory for plot plugins." > bin/$configdir/plots/README.txt
end
# Unzip the Python tar file in bin/Release so we have Python modules available
# when we try to distribute VisIt on Windows.
#
# We don't maintain all DLLs for the MSVC7.Net distribution so add the rest
# of the DLLs from the MSVC 6 distribution into the MSVC7.Net directory.
#
foreach buildmode (Debug Release)
cd $VisItDev/bin/$buildmode
foreach DLL (MesaGL.dll hdf5dll.dll osmesa.dll silohdf5.dll sziplib.dll zlib.dll)
cp $DLL ../MSVC7.Net/$buildmode
end
end
cd $VisItDev
# Unzip the Python tar file in bin/Release so we have Python 2.3.4 modules
# available when we try to distribute VisIt on Windows.
cd bin/Release
gunzip PythonModules.tar.gz
tar xvf PythonModules.tar
rm -f PythonModules.tar
cd $VisItDev
# Unzip the Python tar file in bin/MSVC7.Net/Release so we have Python modules
# available when we try to distribute VisIt on Windows.
cd bin/MSVC7.Net/Release
gunzip PythonModules-2.3.4.tar.gz
tar xvf PythonModules-2.3.4.tar
rm -f PythonModules-2.3.4.tar
cd $VisItDev
# Remove the help files since we've copied them into different directories.
rm $VISITSRC/help/*.{html,helpml}
# Move windowsbuild/lib directory up to $VisItDev.
echo "Creating lib directory..."
cp -R $TOPDIR/windowsbuild/lib .
foreach buildmode (Debug Release)
# Copy import libraries
cd $VisItDev/lib/$buildmode
foreach DLL (MesaGL.lib hdf5dll.lib osmesa.lib silohdf5.lib zlib.lib)
cp $DLL ../MSVC7.Net/$buildmode
end
end
cd $VisItDev
# Move windowsbuild/resources directory up to $VisItDev.
echo "Creating resources directory..."
......@@ -226,6 +251,10 @@ cp -R $TOPDIR/windowsbuild/installation .
echo "Creating projects directory..."
cp -R $TOPDIR/windowsbuild/projects .
# Move the windowsbuild/projects directory up to $VisItDev.
echo "Creating projects-MSVC7.Net directory..."
cp -R $TOPDIR/windowsbuild/projects-MSVC7.Net .
# Copy the windowsbuild/script directory up to $VisItDev.
echo "Creating script directory..."
cp -R $TOPDIR/windowsbuild/script .
......
......@@ -49,6 +49,31 @@ InvalidFilesException::InvalidFilesException(const char *filename)
}
// ****************************************************************************
// Method: InvalidFilesException constructor
//
// Arguments:
// filename The name of an invalid file.
// message A more informative message than the default one.
//
// Programmer: Jeremy Meredith
// Creation: August 11, 2004
//
// Modifications:
//
// ****************************************************************************
InvalidFilesException::InvalidFilesException(const std::string &filename,
const std::string &message)
{
char str[2048];
sprintf(str, "The database had an error opening %s: %s", filename.c_str(),
message.c_str());
msg = str;
}
// ****************************************************************************
// Method: InvalidFilesException constructor
//
......
......@@ -6,9 +6,10 @@
#define INVALID_FILES_EXCEPTION_H
#include <avtexception_exports.h>
#include <DatabaseException.h>
#include <string>
// ****************************************************************************
// Class: InvalidFilesException
......@@ -24,6 +25,9 @@
// Hank Childs, Wed Sep 13 20:01:24 PDT 2000
// Added a constructor with a file list.
//
// Jeremy Meredith, Wed Aug 11 16:27:32 PDT 2004
// Adding a new constructor that allows a more informative message.
//
// ****************************************************************************
class AVTEXCEPTION_API InvalidFilesException : public DatabaseException
......@@ -31,6 +35,8 @@ class AVTEXCEPTION_API InvalidFilesException : public DatabaseException
public:
InvalidFilesException(const char *);
InvalidFilesException(const char * const *, int);
InvalidFilesException(const std::string&,
const std::string&);
InvalidFilesException(int);
virtual ~InvalidFilesException() VISIT_THROW_NOTHING {;};
};
......
......@@ -7,7 +7,7 @@
#else
#define AVTEXCEPTION_API __declspec(dllimport)
#endif
#ifdef USING_MSVC6
#if defined(USING_MSVC6) || defined(USING_MSVC7)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
......
......@@ -8,7 +8,7 @@
#else
#define COMM_API __declspec(dllimport)
#endif
#ifdef USING_MSVC6
#if defined(USING_MSVC6) || defined(USING_MSVC7)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
......
......@@ -14,6 +14,13 @@
#include <misc_exports.h>
#if defined(_WIN32) && defined(GetMessage)
// The windows.h header file defines GetMessage to be GetMessageA, which
// interferes with us calling VisItException::GetMessage. Make sure that
// GetMessage is not defined.
#undef GetMessage
#endif
#ifdef FAKE_EXCEPTIONS
#define VISIT_THROW_NOTHING
#else
......
......@@ -7,7 +7,7 @@
#else
#define MISC_API __declspec(dllimport)
#endif
#ifdef USING_MSVC6
#if defined(USING_MSVC6) || defined(USING_MSVC7)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
......
......@@ -7,7 +7,7 @@
#else
#define PARSER_API __declspec(dllimport)
#endif
#ifdef USING_MSVC6
#if defined(USING_MSVC6) || defined(USING_MSVC7)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
......
......@@ -3,7 +3,7 @@
#if defined(_WIN32)
#ifdef USING_MSVC6
#if defined(USING_MSVC6) || defined(USING_MSVC7)
// Disable inheritance by dominance warning message.
#pragma warning(disable:4250)
// Disable DLL interface warning.
......
......@@ -7,7 +7,7 @@
#else
#define PLUGIN_API __declspec(dllimport)
#endif
#ifdef USING_MSVC6
#if defined(USING_MSVC6) || defined(USING_MSVC7)
// Turn off warning about inheritance by dominance.
#pragma warning(disable:4250)
// Turn off warning about lack of DLL interface
......
......@@ -266,6 +266,9 @@ RemoteProxyBase::AddArgument(const std::string &arg)
// Moved this method from ViewerRemoteProcessChooser and changed the code
// a little.
//
// Brad Whitlock, Tue Aug 10 17:16:55 PST 2004
// Undefined a macro on Windows because it interferes with HostProfile.
//
// ****************************************************************************
void
......@@ -277,6 +280,9 @@ RemoteProxyBase::AddProfileArguments(const HostProfile &profile,
//
// Set the user's login name.
//
#if defined(_WIN32) && defined(GetUserName)
#undef GetUserName
#endif
SetRemoteUserName(profile.GetUserName());
//
......
......@@ -7,7 +7,7 @@
#else
#define PROXYBASE_API __declspec(dllimport)
#endif
#ifdef USING_MSVC6
#if defined(USING_MSVC6) || defined(USING_MSVC7)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
......
......@@ -11,7 +11,7 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 31 15:10:25 PST 2003