Commit 3376a0b3 authored by hrchilds's avatar hrchilds
Browse files

Update from August 25, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@308 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4a641b91
......@@ -29,10 +29,10 @@ shell prompt.
Qt 3.3.1 GUI Toolkit http://www.trolltech.com
Silo 4.4 File I/O library http://www.llnl.gov/bdiv/meshtv
VTK 20031028 Visualization Toolkit http://www.kitware.com
HDF5 1.6.0 I/O library http://hdf.ncsa.uiuc.edu/HDF5/
Optional Version Description For More information
======== ======= =========== ====================
HDF5 1.6.0 I/O library http://hdf.ncsa.uiuc.edu/HDF5/
Mili 1.06 I/O library (none)
The public version of VisIt has been built with the above listed versions
......@@ -156,6 +156,7 @@ later on.
mkdir visit
echo `pwd`/visit > visitpath
set VISITPATH="`pwd`/visit"
==============================================================================
Building Qt as a set of prebound dynamic libraries
......@@ -180,16 +181,16 @@ rm ../lib/libqt*
make
# Install Qt
mkdir ../visit/qt
mkdir ../visit/qt/bin
mkdir ../visit/qt/include
mkdir ../visit/qt/include/private
mkdir ../visit/qt/lib
cp bin/{designer,findtr,moc,qt20fix,qtrename140} ../visit/qt/bin
cd include; cp *.h ../../visit/qt/include
cp private/*.h ../../visit/qt/include/private
mkdir $VISITPATH/qt
mkdir $VISITPATH/qt/bin
mkdir $VISITPATH/qt/include
mkdir $VISITPATH/qt/include/private
mkdir $VISITPATH/qt/lib
cp bin/{designer,findtr,moc,qt20fix,qtrename140} $VISITPATH/qt/bin
cd include; cp *.h $VISITPATH/qt/include
cp private/*.h $VISITPATH/qt/include/private
cd ../lib
cp libqt-mt.3.3.1.dylib ../../visit/qt/lib/libqt.dylib
cp libqt-mt.3.3.1.dylib $VISITPATH/qt/lib/libqt.dylib
cd ../..
==============================================================================
......@@ -250,11 +251,11 @@ make darwin
#
# Install Mesa
#
mkdir ../visit/mesa
mkdir ../visit/mesa/{include,lib}
mkdir ../visit/mesa/include/GL
cp include/GL/*.h ../visit/mesa/include/GL
cp lib/*.dylib ../visit/mesa/lib
mkdir $VISITPATH/mesa
mkdir $VISITPATH/mesa/{include,lib}
mkdir $VISITPATH/mesa/include/GL
cp include/GL/*.h $VISITPATH/mesa/include/GL
cp lib/*.dylib $VISITPATH/mesa/lib
cd ..
==============================================================================
......@@ -362,24 +363,24 @@ Note: Be sure that you use a different offset for each library or prebinding wil
#
# Install VTK in the visit directory under the vtk directory.
#
mkdir ../visit/vtk
mkdir ../visit/vtk/{Common,Filtering,Graphics,Hybrid,IO,Imaging,Rendering,MangleMesaInclude,lib}
cp vtkConfigure.h ../visit/vtk
cp vtkToolkits.h ../visit/vtk
cp vtk*Instantiator.h ../visit/vtk
cp Utilities/zlib/zlib.h ../visit/vtk
cp Utilities/zlib/zconf.h ../visit/vtk
cp Utilities/zlib/zlibDllConfig.h ../visit/vtk
cp Utilities/tiff/*.h ../visit/vtk
cp Common/*.h ../visit/vtk/Common
cp Filtering/*.h ../visit/vtk/Filtering
cp Graphics/*.h ../visit/vtk/Graphics
cp Hybrid/*.h ../visit/vtk/Hybrid
cp IO/*.h ../visit/vtk/IO
cp Imaging/*.h ../visit/vtk/Imaging
cp Rendering/*.h ../visit/vtk/Rendering
cp MangleMesaInclude/*.h ../visit/vtk/MangleMesaInclude
cp bin/*.dylib ../visit/vtk/lib
mkdir $VISITPATH/vtk
mkdir $VISITPATH/vtk/{Common,Filtering,Graphics,Hybrid,IO,Imaging,Rendering,MangleMesaInclude,lib}
cp vtkConfigure.h $VISITPATH/vtk
cp vtkToolkits.h $VISITPATH/vtk
cp vtk*Instantiator.h $VISITPATH/vtk
cp Utilities/zlib/zlib.h $VISITPATH/vtk
cp Utilities/zlib/zconf.h $VISITPATH/vtk
cp Utilities/zlib/zlibDllConfig.h $VISITPATH/vtk
cp Utilities/tiff/*.h $VISITPATH/vtk
cp Common/*.h $VISITPATH/vtk/Common
cp Filtering/*.h $VISITPATH/vtk/Filtering
cp Graphics/*.h $VISITPATH/vtk/Graphics
cp Hybrid/*.h $VISITPATH/vtk/Hybrid
cp IO/*.h $VISITPATH/vtk/IO
cp Imaging/*.h $VISITPATH/vtk/Imaging
cp Rendering/*.h $VISITPATH/vtk/Rendering
cp MangleMesaInclude/*.h $VISITPATH/vtk/MangleMesaInclude
cp bin/*.dylib $VISITPATH/vtk/lib
cd ..
The next offset after libvtkRendering.dylib, which has an offset of 0x21f6f000 and
......@@ -411,6 +412,8 @@ tar zxvf Python-2.3.3.tgz
cd Python-2.3.3
env OPT="-O3 -Wall -Wstrict-prototypes -fno-common -fPIC" ./configure --prefix=`cat ../visitpath`/python
make
# Install Python
make install
# Now that Python is built, we need to create a shared library version.
......@@ -420,7 +423,7 @@ ar -x ../libpython2.3.a
echo "char **environ=0;" > environhack.c
gcc -o environhack.o -c environhack.c
gcc -dynamiclib -prebind -Wl,-seg1addr,0x222b3000,-install_name,@executable_path/../lib/libpython2.3.dylib,-compatibility_version,2.3.3,-current_version,2.3.3 -twolevel_namespace -o libpython2.3.dylib *.o -framework Carbon
cp libpython2.3.dylib ../../visit/python/lib/python2.3/config/libpython2.3.dylib
cp libpython2.3.dylib $VISITPATH/python/lib/python2.3/config/libpython2.3.dylib
cd ../..
The next offset after libpython.dylib, which has an offset of 0x222b3000 and a library
......@@ -433,6 +436,48 @@ offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x22605000
===============================================================================
Building HDF5 as a prebound dynamic library
===============================================================================
HDF5 is a data storage library that allows you to efficiently write large
volumes of structured storage to a disk file. VisIt can technically be built
without support for HDF5 so it is an optional, but recommended, package. Though
it is optional, we build it before the Silo library because the Silo library
should be built with support for HDF5 when possible. If you don't want to build
HDF5, you can skip this section but you will have to take care that you do not
attempt to build Silo with support for HDF5.
tar zxvf hdf5-1.6.0.tar.gz
cd hdf5-1.6.0
env CFLAGS="-O2 -fPIC" ./configure
make
# The HDF5 libraries get built, even as dylib shared libraries. That's
# not quite good enough though since we want to set the beginning
# address of the library and make it be prebound. We'll build our own
# version of the library using the prebuilt sources.
cd src
gcc -dynamiclib -prebind -twolevel_namespace -Wl,-seg1addr,0x22605000,-install_name,@executable_path/../lib/libhdf5.dylib,-compatibility_version,1.6,-current_version,1.6 -o libhdf5.dylib *.lo -lz
# Install HDF5
mkdir $VISITPATH/hdf5
mkdir $VISITPATH/hdf5/include
mkdir $VISITPATH/hdf5/lib
cp libhdf5.dylib $VISITPATH/hdf5/lib
cp *.h $VISITPATH/hdf5/include
cd ../..
The next offset after libhdf5.dylib, which has an offset of 0x22605000 and
a library size of 1,055,884 (0x101c8c) bytes is:
# Next offset
offset = 0x22605000 + int(float(0x101c8c) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x22714000
===============================================================================
Building Silo as a prebound dynamic library
===============================================================================
......@@ -443,10 +488,20 @@ listed below to build Silo. If you have any problems building or installing
Silo, read the INSTALL_NOTES file in the SILO distribution for more
information.
Note that these instructions assume that Silo will be built with HDF5 support.
If you don't want to build Silo with HDF5 support, replace the --with-hdf5=...
with --without-hdf5. The library segment offsets used assume that Silo will be
built with support for HDF5. If you choose to disable HDF5 support, the
offsets will not be affected since the HDF5 version of the Silo library
should be larger.
# Build silo source into an archive library
sh silo020325.sh
cd silo020325
env CFLAGS="-O2 -fno-common -fPIC" ./configure --disable-sdx --without-readline --without-hdf5 --without-exodus
# Set the values of some helper variables (tcsh)
set HDF5INCLUDE=$VISITDIR/hdf5/include
set HDF5LIB=$VISITDIR/hdf5/lib
env CFLAGS="-O2 -fno-common -fPIC" ./configure --disable-sdx --without-readline --without-exodus --with-hdf5=$HDF5INCLUDE,$HDF5LIB
make
# Turn the archive library into a prebound dynamic library
......@@ -455,29 +510,29 @@ cd lib
mkdir tmplib
cd tmplib
ar -x ../libsilo.a
gcc -dynamiclib -prebind -twolevel_namespace -Wl,-seg1addr,0x22605000,-install_name,@executable_path/../lib/libsilo.dylib,-compatibility_version,4.3.2,-current_version,4.3.2 -o ../libsilo.dylib *.o
gcc -dynamiclib -prebind -twolevel_namespace -Wl,-seg1addr,0x22714000,-install_name,@executable_path/../lib/libsilo.dylib,-compatibility_version,4.3.2,-current_version,4.3.2 -o ../libsilo.dylib *.o -L$HDF5LIB -lhdf5
cd ..
# Install Silo
mkdir ../visit/silo
mkdir ../visit/silo/include
mkdir ../visit/silo/lib
cp silo/silo/silo.h ../visit/silo/include
cp silo/silo/silo.inc ../visit/silo/include
cp silo/sdx/sdx.h ../visit/silo/include
cp silo/sdx/sdx.inc ../visit/silo/include
cp lib/libsilo.dylib ../visit/silo/lib
mkdir $VISITDIR/silo
mkdir $VISITDIR/silo/include
mkdir $VISITDIR/silo/lib
cp silo/silo/silo.h $VISITDIR/silo/include
cp silo/silo/silo.inc $VISITDIR/silo/include
cp silo/sdx/sdx.h $VISITDIR/silo/include
cp silo/sdx/sdx.inc $VISITDIR/silo/include
cp lib/libsilo.dylib $VISITDIR/silo/lib
cd ..
The next offset after libpython.dylib, which has an offset of 0x22605000 and a library
size of 453,352 (0x6eae8) bytes is:
The next offset after libsilo.dylib, which has an offset of 0x22714000 and a library
size of 595,036 (0x9145c) bytes is:
# Next offset
offset = 0x22605000 + int(float(0x6eae8) * 1.05)
offset = 0x22714000 + int(float(0x9145c) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x2267a000
offset = 0x227ad000
===============================================================================
Building Mili as a prebound dynamic library
......@@ -499,8 +554,8 @@ the Mili's src directory
CC=gcc
CFLAGS = -I. -O2 -fno-common -fPIC
MILI_LDFLAGS=-Wl,-seg1addr,0x2267d000 -L. -lgahl
GAHL_LDFLAGS=-Wl,-seg1addr,0x2267a000
MILI_LDFLAGS=-Wl,-seg1addr,0x227b0000 -L. -lgahl
GAHL_LDFLAGS=-Wl,-seg1addr,0x227ad000
LDFLAGS=-dynamiclib -prebind -twolevel_namespace -Wl,-install_name,@executable_path/../lib/$@
.SUFFIXES : .o .c
MILI_SRC=mili.c direc.c param.c io.c util.c dep.c svar.c srec.c mesh_u.c wrap_c.c io_mem.c eprtf.c sarray.c
......@@ -521,58 +576,22 @@ Now that you're in Mili's source directory and you have a Makefile,
type: make
# Install Mili
mkdir ../../visit/mili
cp *.dylib ../../visit/mili
cp mili.h ../../visit/mili
cp mili_enum.h ../../visit/mili
mkdir $VISITPATH/mili
cp *.dylib $VISITPATH/mili
cp mili.h $VISITPATH/mili
cp mili_enum.h $VISITPATH/mili
cd ../..
The next offset after libmili.dylib, which has an offset of 0x2267d000 and
The next offset after libmili.dylib, which has an offset of 0x227b0000 and
a library size of 109,556 (0x1abf4) bytes is:
# Next offset
offset = 0x2267d000 + int(float(0x1abf4) * 1.05)
offset = 0x227b0000 + int(float(0x1abf4) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x2269a000
===============================================================================
Building HDF5 as a prebound dynamic library
===============================================================================
tar zxvf hdf5-1.6.0.tar.gz
cd hdf5-1.6.0
env CFLAGS="-O2 -fPIC" ./configure
make
# The HDF5 libraries get built, even as dylib shared libraries. That's
# not quite good enough though since we want to set the beginning
# address of the library and make it be prebound. We'll build our own
# version of the library using the prebuilt sources. Note that the
# segment offset used for HDF5 does not exactly correspond to the offset
# computed after making Mili. I had to add 60000 to the offset because
# libtool said that Silo and HDF5 were overlapping.
cd src
gcc -dynamiclib -prebind -twolevel_namespace, -Wl,-seg1addr,0x226a9000,-install_name,@executable_path/../lib/libhdf5.dylib,-compatibility_version,1.6,-current_version,1.6 -o libhdf5.dylib *.lo -lz
# Install HDF5
mkdir ../../visit/hdf5
mkdir ../../visit/hdf5/include
mkdir ../../visit/hdf5/lib
cp libhdf5.dylib ../../visit/hdf5/lib
cp *.h ../../visit/hdf5/include
cd ../..
offset = 0x227cd000
The next offset after libhdf5.dylib, which has an offset of 0x226a9000 and
a library size of 1,055,884 (0x101c8c) bytes is:
# Next offset
offset = 0x226a9000 + int(float(0x101c8c) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x227b8000
===============================================================================
Building VisIt with prebinding
......@@ -580,16 +599,18 @@ Building VisIt with prebinding
Since we may want to add other libraries to our list of prebound
dynamic libraries, for database reader plugins, etc, we should
reserve a memory range after the Silo library. Suppose all other
libraries that we want can fit in 50Mb. The starting address for
the VisIt libraries would then be: 0x2267a000 + 50Mb
reserve a memory range after the Python library. Suppose all other
libraries that we want can fit in 10Mb. If that assumption becomes invalid,
we can recalculate the offset for the VisIt libraries. The starting address
for the VisIt libraries using the current assumptions would then be:
0x22605000 + 10Mb
# Next offset
offset = 0x2267a000 + 0x2faf080
offset = 0x22605000 + 0x2faf080
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x2562a000
offset = 0x22f8f000
VisIt uses GNU's autoconf system to provide platform independence when
building VisIt in a UNIX environment. Autoconf creates a script called
......@@ -597,12 +618,26 @@ configure that tests your system for various libraries and programs required
to build VisIt. Follow the directions listed below to build VisIt.
More information about building VisIt follows after that.
#
# HDF5 and Silo
#
If you built the Silo library with support for HDF5 using the instructions in
this document then you will need to modify VisIt's configure script somewhat so
programs that require the silo library also get linked with the HDF5 library.
On most other platforms, the Silo library is a static archive with the HDF5
symbols linked into it. These build instructions for MacOS X build Silo as a
dynamic, prebound library using a dynamic HDF5 library.
vi configure
replace -lsilo with: -lsilo -lhdf5
save and quit
#
# Configure VisIt
#
gunzip visit040719.tar.gz
tar xf visit040719.tar
cd visit040719/config-site
gunzip visit040816.tar.gz
tar xf visit040816.tar
cd visit040816/config-site
echo VISITHOME=`cat ../../visitpath` > `hostname`.conf
cat Template.conf >> `hostname`.conf
cd ..
......@@ -625,9 +660,6 @@ vi Makefile
# so the Silo database reader can build. The default optimization level (-O2)
# causes gcc to run out of memory on some MacOS X computers.
# Change Silo version if you have a slightly old version of Silo.
vi avtSiloWriter.h
comment out #define SILO_VERSION_4_4
cd ../..
......
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)
}