Commit 98f87000 authored by hrchilds's avatar hrchilds

Update from June 8, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@681 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2200d1c9
......@@ -16,7 +16,7 @@ shell prompt.
Mesa 5.0 3-D Graphics Library http://www.mesa3d.org/
Python 2.1.2 Scripting Language http://www.python.org
Qt 3.3.2 GUI Toolkit http://www.trolltech.com
Silo 4.5 File I/O library http://www.llnl.gov/bdiv/meshtv
Silo 4.5.1 File I/O library http://www.llnl.gov/bdiv/meshtv
VTK 5.0.0a Visualization Toolkit http://www.kitware.com
......@@ -39,7 +39,7 @@ build and install those libraries prior to building VisIt.
======= ======= =========== ====================
Boxlib ??? An AMR I/O library ???
HDF4 2.4.1 File I/O library http://hdf.ncsa.uiuc.edu/hdf4.html
HDF5 1.6.0 File I/O library http://hdf.ncsa.uiuc.edu/HDF5/
HDF5 1.6.5 File I/O library http://hdf.ncsa.uiuc.edu/HDF5/
Mili 1.09 File I/O library (none)
netCDF 3.6.0 File I/O library http://www.unidata.ucar.edu/packages/netcdf/
CGNS 2.4 File I/O library http://www.cgns.org
......@@ -598,8 +598,8 @@ Silo, read the BUILD_NOTES file in the Silo distribution for more information.
#
# Build Silo
#
sh silo051121.sh
cd silo051121
sh silo060605.sh
cd silo060605
#
#
......@@ -616,7 +616,7 @@ cd silo051121
# If you want to build silo with hdf5 support then use the commented configure
# line. If you want to build silo with hdf5 support you must first build hdf5,
# which is described later in this document.
# env CFLAGS=-O2 ./configure --without-readline -with-hdf5=$VISITDIR/hdf5/1.6.0/$VISITARCH/include,$VISITDIR/hdf5/1.6.0/$VISITARCH/lib --without-exodus
# env CFLAGS=-O2 ./configure --without-readline -with-hdf5=$VISITDIR/hdf5/1.6.5/$VISITARCH/include,$VISITDIR/hdf5/1.6.5/$VISITARCH/lib --without-exodus
#
env CFLAGS=-O2 ./configure --without-readline --without-hdf5 --without-exodus
make
......@@ -625,12 +625,12 @@ make
# Install it in the visit directory under the silo directory.
#
mkdir $VISITDIR/silo
mkdir $VISITDIR/silo/4.5
mkdir $VISITDIR/silo/4.5/$VISITARCH
mkdir $VISITDIR/silo/4.5/$VISITARCH/{include,lib}
cp silo/silo/silo.{h,inc} $VISITDIR/silo/4.5/$VISITARCH/include
cp silo/sdx/sdx.{h,inc} $VISITDIR/silo/4.5/$VISITARCH/include
cp lib/libsilo.a $VISITDIR/silo/4.5/$VISITARCH/lib
mkdir $VISITDIR/silo/4.5.1
mkdir $VISITDIR/silo/4.5.1/$VISITARCH
mkdir $VISITDIR/silo/4.5.1/$VISITARCH/{include,lib}
cp silo/silo/silo.{h,inc} $VISITDIR/silo/4.5.1/$VISITARCH/include
cp silo/sdx/sdx.{h,inc} $VISITDIR/silo/4.5.1/$VISITARCH/include
cp lib/libsilo.a $VISITDIR/silo/4.5.1/$VISITARCH/lib
cd ..
......@@ -1123,9 +1123,9 @@ More information about building VisIt follows after that.
#
# Build and install it in the visit directory.
#
gunzip visit060327.tar.gz
tar xf visit060327.tar
cd visit060327/config-site
gunzip visit060612.tar.gz
tar xf visit060612.tar
cd visit060612/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -1143,14 +1143,14 @@ clearcase_bin/visit-bin-dist
# Use the appropriate install command based on the operating system on
# which you built VisIt.
#
clearcase_bin/visit-install 1.5.2 aix $VISITDIR
clearcase_bin/visit-install 1.5.2 darwin $VISITDIR
clearcase_bin/visit-install 1.5.2 irix6 $VISITDIR
clearcase_bin/visit-install 1.5.2 linux $VISITDIR
clearcase_bin/visit-install 1.5.2 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.5.2 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.5.2 osf1 $VISITDIR
clearcase_bin/visit-install 1.5.2 sunos5 $VISITDIR
clearcase_bin/visit-install 1.5.3 aix $VISITDIR
clearcase_bin/visit-install 1.5.3 darwin $VISITDIR
clearcase_bin/visit-install 1.5.3 irix6 $VISITDIR
clearcase_bin/visit-install 1.5.3 linux $VISITDIR
clearcase_bin/visit-install 1.5.3 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.5.3 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.5.3 osf1 $VISITDIR
clearcase_bin/visit-install 1.5.3 sunos5 $VISITDIR
When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the
......
......@@ -17,7 +17,7 @@ Unix and Mac OS X:
where
"version" will be 1.5.2 for the current distribution.
"version" will be 1.5.3 for the current distribution.
"platform" will be one of the following: aix, aix64-xlc, darwin,
irix6, linux-altix, linux-ia64, linux-x86_64, linux_chaos, linux_rhel3,
......@@ -29,17 +29,17 @@ Unix and Mac OS X:
For example
visit-install 1.5.2 irix6 /usr/local/visit
visit-install 1.5.3 irix6 /usr/local/visit
will install the irix6, 1.5.2 version of visit in the directory
will install the irix6, 1.5.3 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_5_2.irix6.tar.gz" present in the current directory for this
"visit1_5_3.irix6.tar.gz" present in the current directory for this
to function properly. You can install multiple binaries into the
same directory. For example, you could then execute
visit-install 1.5.2 linux /usr/local/visit
visit-install 1.5.3 linux /usr/local/visit
to add a linux, 1.5.2 version of visit to the same directory.
to add a linux, 1.5.3 version of visit to the same directory.
2. Add the bin directory below the installation directory
(/usr/local/visit/bin in our example) to each user's search path.
......@@ -77,8 +77,8 @@ Unix and Mac OS X:
Windows:
1. Copy the file visit1.5.2.exe to your desktop.
1. Copy the file visit1.5.3.exe to your desktop.
2. Double click on the visit1.5.2.exe icon to run the installer.
2. Double click on the visit1.5.3.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -234,6 +234,9 @@
# Eric Brugger, Fri Mar 17 09:42:22 PST 2006
# I corrected an error setting the symbolic link libqui.a.
#
# Eric Brugger, Wed Jun 7 16:26:14 PDT 2006
# I modified the script to handle the new vtk library naming conventions.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -459,47 +462,23 @@ if (("$MesaLibs" == "TRUE") && \
endif
#
# Determine the names of the VTK shared libraries.
# Set the names of the VTK shared libraries.
#
set VTKCoLibName = "libvtkCommon.$SHLIB_SOEXT"
set VTKDiLibName = "libvtkDICOMParser.$SHLIB_SOEXT"
set VTKFiLibName = "libvtkFiltering.$SHLIB_SOEXT"
set VTKGrLibName = "libvtkGraphics.$SHLIB_SOEXT"
set VTKHyLibName = "libvtkHybrid.$SHLIB_SOEXT"
set VTKImLibName = "libvtkImaging.$SHLIB_SOEXT"
set VTKIoLibName = "libvtkIO.$SHLIB_SOEXT"
set VTKReLibName = "libvtkRendering.$SHLIB_SOEXT"
set VTKExLibName = "libvtkexpat.$SHLIB_SOEXT"
set VTKFrLibName = "libvtkfreetype.$SHLIB_SOEXT"
set VTKFtLibName = "libvtkftgl.$SHLIB_SOEXT"
set VTKPnLibName = "libvtkpng.$SHLIB_SOEXT"
set VTKJpLibName = "libvtkjpeg.$SHLIB_SOEXT"
set VTKTiLibName = "libvtktiff.$SHLIB_SOEXT"
set VTKZlLibName = "libvtkzlib.$SHLIB_SOEXT"
set vtklibs="libvtkCommon libvtkDICOMParser libvtkFiltering libvtkGraphics libvtkHybrid libvtkIO libvtkImaging libvtkMPEG2Encode libvtkNetCDF libvtkRendering libvtkexoIIc libvtkexpat libvtkfreetype libvtkftgl libvtkjpeg libvtkpng libvtksys libvtktiff libvtkzlib"
#
# Check that the VTK libraries exist.
#
if (("$VTKLibs" == "TRUE") && \
((! -e $VisItDir/lib/$VTKCoLibName) || \
(! -e $VisItDir/lib/$VTKDiLibName) || \
(! -e $VisItDir/lib/$VTKFiLibName) || \
(! -e $VisItDir/lib/$VTKGrLibName) || \
(! -e $VisItDir/lib/$VTKHyLibName) || \
(! -e $VisItDir/lib/$VTKImLibName) || \
(! -e $VisItDir/lib/$VTKIoLibName) || \
(! -e $VisItDir/lib/$VTKReLibName) || \
(! -e $VisItDir/lib/$VTKExLibName) || \
(! -e $VisItDir/lib/$VTKFrLibName) || \
(! -e $VisItDir/lib/$VTKFtLibName) || \
(! -e $VisItDir/lib/$VTKPnLibName) || \
(! -e $VisItDir/lib/$VTKJpLibName) || \
(! -e $VisItDir/lib/$VTKTiLibName) || \
(! -e $VisItDir/lib/$VTKZlLibName))) then
echo " "
echo "Error: Missing VTK libraries in $VisItDir/lib. aborting ..."
echo " "
exit (1)
if ("$VTKLibs" == "TRUE") then
foreach vtklib ($vtklibs)
echo "processing $vtklib"
if (! -e $VisItDir/lib/$vtklib.$SHLIB_SOEXT) then
echo " "
echo "Error: Missing VTK libraries in $VisItDir/lib. aborting ..."
echo " "
exit (1)
endif
end
endif
#
......@@ -838,21 +817,21 @@ ln -s "python/lib/$pyver/config/lib${pyver}.$SHLIB_SOEXT" $libdir
#
# Copy the VTK libraries to the distribution.
#
cp $VisItDir/lib/$VTKCoLibName $libdir/$VTKCoLibName
cp $VisItDir/lib/$VTKDiLibName $libdir/$VTKDiLibName
cp $VisItDir/lib/$VTKFiLibName $libdir/$VTKFiLibName
cp $VisItDir/lib/$VTKGrLibName $libdir/$VTKGrLibName
cp $VisItDir/lib/$VTKHyLibName $libdir/$VTKHyLibName
cp $VisItDir/lib/$VTKImLibName $libdir/$VTKImLibName
cp $VisItDir/lib/$VTKIoLibName $libdir/$VTKIoLibName
cp $VisItDir/lib/$VTKReLibName $libdir/$VTKReLibName
cp $VisItDir/lib/$VTKExLibName $libdir/$VTKExLibName
cp $VisItDir/lib/$VTKFrLibName $libdir/$VTKFrLibName
cp $VisItDir/lib/$VTKFtLibName $libdir/$VTKFtLibName
cp $VisItDir/lib/$VTKPnLibName $libdir/$VTKPnLibName
cp $VisItDir/lib/$VTKJpLibName $libdir/$VTKJpLibName
cp $VisItDir/lib/$VTKTiLibName $libdir/$VTKTiLibName
cp $VisItDir/lib/$VTKZlLibName $libdir/$VTKZlLibName
if ("$VTKLibs" == "TRUE") then
foreach vtklib ($vtklibs)
if ("$SHLIB_SOEXT" == "so") then
if ("$os" == "aix") then
cp $VisItDir/lib/$vtklib.so $libdir/$vtklib.so
else
cp $VisItDir/lib/$vtklib.so.5.0.0 $libdir/$vtklib.so.5.0.0
ln -s $vtklib.so.5.0.0 $libdir/$vtklib.so.5.0
ln -s $vtklib.so.5.0.0 $libdir/$vtklib.so
endif
else
cp $VisItDir/lib/$vtklib.dylib $libdir/$vtklib.dylib
endif
end
endif
#
# If we're on MacOS X, copy some libraries that are statically linked on
......
......@@ -107,6 +107,9 @@
# Brad Whitlock, Thu May 25 15:22:32 PST 2006
# Added logic to create .installinfo file.
#
# Eric Brugger, Wed Jun 7 16:38:48 PDT 2006
# Remove some debug statements.
#
#-----------------------------------------------------------------------
set Compress = COMPRESS
......@@ -360,10 +363,8 @@ cd $platformBin/..
set platformPath = `pwd`
cd $savepwd
set platformDir = ""
echo "platformPath = $platformPath"
foreach f (`echo $platformPath | tr "/" " "`)
set platformDir = $f
echo "platformDir = $platformDir"
end
# Copy the files
find . -print | cpio -pmud $dir/$version+
......
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