Commit 55a47ab5 authored by hrchilds's avatar hrchilds

Update from April 5, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@868 18c085ea-50e0-402c-830e-de6fd14e8384
parent c16faf38
......@@ -139,6 +139,13 @@ setenv VISITARCH tru64_5_gcc_3.3.3
Now build each of the dependent libraries followed by VisIt.
If you are building on AIX you should set the object mode to specify if you
are building a 32 or a 64 bit executable. You should always build a 32 bit
version and then you may also optionally build a 64 bit version. To set the
object mode issue one of the following two commands.
setenv OBJECT_MODE 32
setenv OBJECT_MODE 64
Mesa
=====
......@@ -236,7 +243,7 @@ env CXXFLAGS="" CFLAGS="" ./bootstrap
# (ccmake) either with the curses header or library. (Mainly with AIX).
# To prevent CMake from attempting to build ccmake, open CMakeCache.txt
# and set CURSES_LIBRARY:FILEPATH= to ""
make
gmake
#
# Build VTK
......@@ -253,17 +260,13 @@ cd VTK
#
../cmake-2.2.3/bin/cmake .
#
# Edit CMakeCache.txt. Turn BUILD_SHARED_LIBS, VTK_USE_MANGLED_MESA, and
# VTK_USE_ANSI_STDLIB on (Note that some platforms will have a definition
# for VTK_USE_ANSI_STDLIB and some will not). Turn BUILD_TESTING off.
# Edit CMakeCache.txt. Turn BUILD_SHARED_LIBS and VTK_USE_MANGLED_MESA on.
# Turn BUILD_TESTING off.
#
# If you want to change the compilers you should modify CMAKE_CXX_COMPILER
# and CMAKE_C_COMPILER. If you want to change the compiler flags you should
# modify CMAKE_C_FLAGS and CMAKE_CXX_FLAGS. You might want to specify "-O2"
# as a compiler flag to build an optimized version. If you want to specify
# the location of the OpenGL library you should modify OPENGL_gl_LIBRARY and
# OPENGL_glu_LIBRARY (/usr/shlib/libGL.so and /usr/shlib/libGLU.so on tru64
# systems.)
# as a compiler flag to build an optimized version.
#
# On irix systems you will need to specify "-LANG:std" for the compiler and
# linker flags. If you are building a 64 bit version you will also need
......@@ -361,8 +364,7 @@ cd VTK
# Again, this change has only been found to be necessary for Altix systems
# gcc 3.3.3.
#
make
gmake
#
# Install it in the visit directory under the vtk directory.
......@@ -392,9 +394,9 @@ cp VolumeRendering/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/VolumeRender
cp MangleMesaInclude/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/MangleMesaInclude
cp vtkstd/* $VISITDIR/vtk/5.0.0c/$VISITARCH/vtkstd
cp -d bin/*.so* $VISITDIR/vtk/5.0.0c/$VISITARCH/lib
# For IRIX, solaris
# For aix, IRIX, solaris
# cp -R bin/*.so* $VISITDIR/vtk/5.0.0c/$VISITARCH/lib
# For true64,
# For true64
# cp bin/*.so $VISITDIR/vtk/5.0.0c/$VISITARCH/lib
cd ..
......@@ -1205,9 +1207,9 @@ More information about building VisIt follows after that.
#
# Build and install it in the visit directory.
#
gunzip visit061218.tar.gz
tar xf visit061218.tar
cd visit061218/config-site
gunzip visit070330.tar.gz
tar xf visit070330.tar
cd visit070330/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -1225,14 +1227,15 @@ 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.5 aix $VISITDIR
clearcase_bin/visit-install 1.5.5 darwin $VISITDIR
clearcase_bin/visit-install 1.5.5 irix6 $VISITDIR
clearcase_bin/visit-install 1.5.5 linux $VISITDIR
clearcase_bin/visit-install 1.5.5 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.5.5 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.5.5 osf1 $VISITDIR
clearcase_bin/visit-install 1.5.5 sunos5 $VISITDIR
clearcase_bin/visit-install 1.6 aix $VISITDIR
clearcase_bin/visit-install 1.6 aix64 $VISITDIR
clearcase_bin/visit-install 1.6 darwin $VISITDIR
clearcase_bin/visit-install 1.6 irix6 $VISITDIR
clearcase_bin/visit-install 1.6 linux $VISITDIR
clearcase_bin/visit-install 1.6 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.6 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.6 osf1 $VISITDIR
clearcase_bin/visit-install 1.6 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
......
This diff is collapsed.
......@@ -17,7 +17,7 @@ Unix and Mac OS X:
where
"version" will be 1.5.5 for the current distribution.
"version" will be 1.6 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.5 irix6 /usr/local/visit
visit-install 1.6 irix6 /usr/local/visit
will install the irix6, 1.5.5 version of visit in the directory
will install the irix6, 1.6 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_5_5.irix6.tar.gz" present in the current directory for this
"visit1_6.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.5 linux /usr/local/visit
visit-install 1.6 linux /usr/local/visit
to add a linux, 1.5.5 version of visit to the same directory.
to add a linux, 1.6 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.5.exe to your desktop.
1. Copy the file visit1.6.exe to your desktop.
2. Double click on the visit1.5.5.exe icon to run the installer.
2. Double click on the visit1.6.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -160,6 +160,13 @@ $0 = shift @ARGV;
# MPICH-2, for example, has a python-based launcher, and setting this
# unconditionally will prevent parallel engines from launching.
#
# Eric Brugger, Wed Apr 4 10:07:51 PDT 2007
# Added support for specifying 32 or 64 bit executables for aix.
#
# Thomas R. Treadway, Wed Apr 4 18:02:52 PDT 2007
# Treat the platformDir like all of the others, allowing darwin-ppc,
# darwin-i386, [or darwin (universal) directory].
#
###############################################################################
use POSIX qw(ceil);
......@@ -358,6 +365,7 @@ $fullusage = "$usage
-publicpluginsonly Disable all plugins but the default ones.
-compiler <cc> Require version built with the specified compiler.
-switch <switch> Require version built for the specified switch.
-objectmode <mode> Require a specific object file mode.
Developer options
---------------------------------------------------------------------------
......@@ -474,6 +482,7 @@ $envonly = 0;
$logging = 0;
$req_compiler = "";
$req_switch = "";
$req_object_mode = "";
$use_new_console = 0;
$visit_sets_up_environment = 0;
$pre_command = "";
......@@ -536,6 +545,7 @@ while (scalar(@ARGV) > 0) {
elsif ($arg eq "-break") { if($debug_gdb) {$bp = shift; push @breakpoints, $bp; } else {push @visitargs, $arg;}}
elsif ($arg eq "-compiler") { $req_compiler = shift; }
elsif ($arg eq "-switch") { $req_switch = shift; push @visitargs, "-switch", $req_switch; }
elsif ($arg eq "-objectmode") { $req_object_mode = shift; push @visitargs, "-objectmode", $req_object_mode; }
elsif ($arg eq "-totalview" ) {
$debug_totalview = shift;
push @norun, $debug_totalview;
......@@ -761,7 +771,7 @@ for ($os) {
last;
};
/aix/ && do {
if ($ENV{OBJECT_MODE} and $ENV{OBJECT_MODE} eq "64")
if ($req_object_mode eq "64")
{
if ($req_compiler eq "xlc") {
push @supportedarchs, "ibm-aix-pwr64-xlc";
......@@ -770,10 +780,13 @@ for ($os) {
push @supportedarchs, "ibm-aix-pwr64";
}
}
if ($req_compiler eq "xlc") {
push @supportedarchs, "ibm-aix-pwr-xlc";
} else {
push @supportedarchs, "ibm-aix-pwr";
else
{
if ($req_compiler eq "xlc") {
push @supportedarchs, "ibm-aix-pwr-xlc";
} else {
push @supportedarchs, "ibm-aix-pwr";
}
}
$launch = "poe" if ($procs_set && $launch eq "");
last;
......@@ -811,7 +824,32 @@ for ($os) {
last;
};
/darwin/ && do {
push @supportedarchs, "darwin-ppc";
if ($req_compiler eq "ppc") {
push @supportedarchs, "darwin-ppc";
}
elsif ($req_compiler eq "i386") {
push @supportedarchs, "darwin-i386";
}
elsif ( -d "$visitdir/darwin")
{
push @supportedarchs, "darwin";
}
else
{
chomp( $mach = `uname -m` );
if ($mach =~ /i386/) {
push @supportedarchs, "darwin-i386";
}
elsif ($mach =~ /x86_64/) {
push @supportedarchs, "darwin-x86_64";
}
elsif ($mach =~ /ppc/) {
push @supportedarchs, "darwin-ppc";
}
elsif ($mach =~ /ppc_64/) {
push @supportedarchs, "darwin-ppc_64";
}
}
$launch = "mpirun" if ($procs_set && $launch eq "");
last;
};
......@@ -1049,7 +1087,7 @@ $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:/usr/local/lib";
# Set up some environment flags that let VisIt run on Darwin.
if($os eq "darwin")
{
$ENV{DYLD_LIBRARY_PATH} = "$visitlibdir:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries:$ENV{DYLD_LIBRARY_PATH}";
$ENV{DYLD_LIBRARY_PATH} = "$visitlibdir:$ENV{HOME}/.visit/$archdir/plugins:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries:$ENV{DYLD_LIBRARY_PATH}";
}
# Set up plugin search paths in the correct order
......
......@@ -356,6 +356,11 @@ $0 = shift @ARGV;
#
# Mark C. Miller, Tue Nov 22 09:42:57 PST 2005
# Removed refs to sl_io subdirectory
#
# Thomas R. Treadway, Wed Apr 4 18:02:52 PDT 2007
# Treat the platformDir like all of the others, allowing darwin-ppc,
# darwin-i386, [or darwin (universal) directory].
#
###############################################################################
......@@ -928,7 +933,19 @@ for ($os) {
last;
};
/darwin/ && do {
$archdir = "darwin-ppc";
chomp( $mach = `uname -m` );
if ($mach =~ /i386/) {
push @supportedarchs, "darwin-i386";
}
elsif ($mach =~ /x86_64/) {
push @supportedarchs, "darwin-x86_64";
}
elsif ($mach =~ /ppc/) {
push @supportedarchs, "darwin-ppc";
}
elsif ($mach =~ /ppc_64/) {
push @supportedarchs, "darwin-ppc_64";
}
$launch = "mpirun" if ($procs_set && $launch eq "");
last;
};
......@@ -1155,7 +1172,7 @@ $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:/usr/local/lib";
# Set up some environment flags that let VisIt run on Darwin.
if($os eq "darwin")
{
$ENV{DYLD_LIBRARY_PATH} = "$visitlibdir:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries:$ENV{DYLD_LIBRARY_PATH}";
$ENV{DYLD_LIBRARY_PATH} = "$visitlibdir:$ENV{HOME}/.visit/$archdir/plugins:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries:$ENV{DYLD_LIBRARY_PATH}";
}
# Set up plugin search paths in the correct order
......
......@@ -128,7 +128,7 @@ end
# If we're doing more than converting then run mif2help.
if ("$MIFOnly" == "FALSE") then
# If the tool is built then proceed.
if(-e mif2help) then
if(-e $helpPath/mif2help) then
# Create a list of MIF files to pass to mif2help.
set mifargs = " "
foreach input ($inputFiles)
......@@ -137,7 +137,7 @@ if ("$MIFOnly" == "FALSE") then
set mifargs = "$tmpvar"
end
mif2help $mifargs
$helpPath/mif2help $mifargs
else
echo "The mif2help tool failed to build."
endif
......
......@@ -270,6 +270,14 @@
# Deleted the vtk exodus and netcdf libraries from the list of required
# vtk libraries.
#
# Thomas R. Treadway, Wed Apr 4 12:40:20 PDT 2007
# Modified Mac (Darwin) procession to created darwin, darwin-i386,
# darwin-x86_64, darwin-ppc, darwin-ppc_64, depending on the machine
# architecture, or if a universal binary (as determined by qt library).
# Added argument "arch" for setting "osver" and "visitbindir" to allow
# cross compiles and builds.
# Added more checks to removed the "cp: No match." conditions.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -284,6 +292,7 @@ set CompilerGiven = "FALSE"
set compiler = ""
set SwitchGiven = "FALSE"
set switch = ""
set ArchGiven = "FALSE"
set Strip = "TRUE"
set Make = "make"
set Help = "FALSE"
......@@ -363,6 +372,13 @@ while ($#argv >= 1)
set SwitchGiven = TRUE
breaksw
case -arch:
shift
set osver = $1
set visitbindir = $1
set ArchGiven = TRUE
breaksw
default:
echo " "
echo ">>>>>>>>>> Illegal option $1 <<<<<<<<<<"
......@@ -377,7 +393,7 @@ if ($Help == TRUE) then
echo " [-md <visit_dir>] [-nd] [-nmesa]"
echo " [-npython] [-nqt] [-nstrip] [-nvtk]"
echo " [-os <operating_system>] [-compiler <compiler>]"
echo " [-switch <switch>]"
echo " [-switch <switch>] [-arch <architecture>]"
echo ""
echo " -c Compress the resultant package."
echo " -g Gzip the resultant package. (default)"
......@@ -391,6 +407,7 @@ if ($Help == TRUE) then
echo " -nstrip Do not strip the execubles and libraries."
echo " -nvtk No VTK libraries."
echo " -os os Operating system."
echo " -arch architecture Force architecture package."
echo " -compiler cc Compiler."
echo " -switch switch Switch type."
exit (1)
......@@ -531,7 +548,8 @@ endif
#
# Determine the os version string and hardware os string.
#
switch ($os)
if ("$ArchGiven" == "FALSE") then
switch ($os)
case hp-ux:
echo "Found an HP-UX version of visit"
set osver = hp
......@@ -620,11 +638,38 @@ switch ($os)
case darwin:
echo "Found a MacOS X version of visit"
set visitbindir = darwin-ppc
set osver = "darwin"
breaksw
endsw
set archBins = `file $VisItDir/lib/$QtLibName | head -n 1`
if (`echo "$archBins" | grep "universal"` == "") then
set arch = `/usr/bin/uname -m`
switch ($arch)
case i386:
case i486:
case i586:
case i686:
set osver = darwin-i386
set visitbindir = darwin-i386
breaksw
case x86_64:
set osver = darwin-x86_64
set visitbindir = darwin-x86_64
breaksw
case ppc:
set osver = darwin-ppc
set visitbindir = darwin-ppc
breaksw
case ppc_64:
set osver = darwin-ppc_64
set visitbindir = darwin-ppc_64
breaksw
endsw
else
set osver = darwin
set visitbindir = darwin
endif
breaksw
endsw
endif
#
# Set a bunch of paths used later in the script.
#
......@@ -746,11 +791,6 @@ cp $VisItDir/bin/makemovie.py $bindir
cp $VisItDir/bin/makemoviemain.py $bindir
# copy surfcomp
cp $VisItDir/exe/surfcomp $bindir
# Copy MacOS X address computation script and address file.
cp $VisItDir/bin/linkedit.py $bindir
if(-e $VisItDir/address.txt) then
cp $VisItDir/address.txt distribution/visit/$Version/$visitbindir/
endif
# Copy the movie templates
cp $VisItDir/bin/movietemplates/*.mt $bindir/movietemplates
cp $VisItDir/bin/movietemplates/*.ui $bindir/movietemplates
......@@ -887,11 +927,17 @@ cp $VisItDir/lib/python/lib/$pyver/*.txt $libdir/python/lib/$pyve
cp $VisItDir/lib/python/lib/$pyver/*.py $libdir/python/lib/$pyver
cp $VisItDir/lib/python/lib/$pyver/*.pyc $libdir/python/lib/$pyver
cp $VisItDir/lib/python/lib/$pyver/*.pyo $libdir/python/lib/$pyver
cp $VisItDir/lib/python/lib/$pyver/*.$SHLIB_SOEXT $libdir/python/lib/$pyver
if(-e "$VisItDir/lib/python/lib/$pyver/*.$SHLIB_SOEXT") then
cp $VisItDir/lib/python/lib/$pyver/*.$SHLIB_SOEXT $libdir/python/lib/$pyver
endif
cp $VisItDir/lib/python/lib/$pyver/config/* $libdir/python/lib/$pyver/config
cp $VisItDir/lib/python/lib/$pyver/lib-dynload/* $libdir/python/lib/$pyver/lib-dynload
cp $VisItDir/lib/python/lib/$pyver/site-packages/PIL.* $libdir/python/lib/$pyver/site-packages
cp $VisItDir/lib/python/lib/$pyver/site-packages/PIL/* $libdir/python/lib/$pyver/site-packages/PIL
if(-e "$VisItDir/lib/python/lib/$pyver/site-packages/PIL.*") then
cp $VisItDir/lib/python/lib/$pyver/site-packages/PIL.* $libdir/python/lib/$pyver/site-packages
endif
if(-e "$VisItDir/lib/python/lib/$pyver/site-packages/PIL/*") then
cp $VisItDir/lib/python/lib/$pyver/site-packages/PIL/* $libdir/python/lib/$pyver/site-packages/PIL
endif
cp $VisItDir/lib/python/lib/$pyver/xml/*.{py,pyc,pyo} $libdir/python/lib/$pyver/xml
cp $VisItDir/lib/python/lib/$pyver/xml/dom/*.{py,pyc,pyo} $libdir/python/lib/$pyver/xml/dom
cp $VisItDir/lib/python/lib/$pyver/xml/parsers/*.{py,pyc,pyo} $libdir/python/lib/$pyver/xml/parsers
......@@ -924,7 +970,10 @@ endif
#
if("$os" == "darwin") then
cp $VisItDir/lib/libmili.$SHLIB_SOEXT $libdir
cp $VisItDir/lib/libgahl.$SHLIB_SOEXT $libdir
# not needed in mili build
if(-e $VisItDir/lib/libgahl.$SHLIB_SOEXT) then
cp $VisItDir/lib/libgahl.$SHLIB_SOEXT $libdir
endif
cp $VisItDir/lib/libhdf5.$SHLIB_SOEXT $libdir
endif
......@@ -972,42 +1021,76 @@ cp $VisItDir/include/visit/[A-M]*.h $incdir/visit
cp $VisItDir/include/visit/[N-Q]*.h $incdir/visit
cp $VisItDir/include/visit/[R-Z]*.h $incdir/visit
cp $VisItDir/include/visit/a[a-uw-zA-Z]*.h $incdir/visit
cp $VisItDir/include/visit/av[a-su-zA-Z]*.h $incdir/visit
if(-e "$VisItDir/include/visit/av[a-su-zA-Z]*.h") then
cp $VisItDir/include/visit/av[a-su-zA-Z]*.h $incdir/visit
endif
cp $VisItDir/include/visit/avt[a-z]*.h $incdir/visit
cp $VisItDir/include/visit/avt[A-M]*.h $incdir/visit
cp $VisItDir/include/visit/avt[N-Z]*.h $incdir/visit
cp $VisItDir/include/visit/[b-z]*.h $incdir/visit
cp $VisItDir/include/mesa/GL/*.h $incdir/mesa/GL
cp $VisItDir/include/vtk/*.h $incdir/vtk
cp $VisItDir/include/vtk/*.txx $incdir/vtk
cp $VisItDir/include/vtk/Common/[a-uw-zA-Z]*.h $incdir/visit
cp $VisItDir/include/vtk/Common/[a-uw-zA-Z]*.txx $incdir/visit
cp $VisItDir/include/vtk/Common/v[a-su-zA-Z]*.h $incdir/visit
cp $VisItDir/include/vtk/Common/v[a-su-zA-Z]*.txx $incdir/visit
cp $VisItDir/include/vtk/Common/vt[a-jl-zA-Z]*.h $incdir/vtk/Common
cp $VisItDir/include/vtk/Common/vt[a-jl-zA-Z]*.txx $incdir/vtk/Common
if(-e "$VisItDir/include/vtk/*.txx") then
cp $VisItDir/include/vtk/*.txx $incdir/vtk
endif
if(-e "$VisItDir/include/vtk/Common/[a-uw-zA-Z]*.h") then
cp $VisItDir/include/vtk/Common/[a-uw-zA-Z]*.h $incdir/visit
endif
if(-e "$VisItDir/include/vtk/Common/[a-uw-zA-Z]*.txx") then
cp $VisItDir/include/vtk/Common/[a-uw-zA-Z]*.txx $incdir/visit
endif
if(-e "$VisItDir/include/vtk/Common/v[a-su-zA-Z]*.h") then
cp $VisItDir/include/vtk/Common/v[a-su-zA-Z]*.h $incdir/visit
endif
if(-e "$VisItDir/include/vtk/Common/v[a-su-zA-Z]*.txx") then
cp $VisItDir/include/vtk/Common/v[a-su-zA-Z]*.txx $incdir/visit
endif
if(-e "$VisItDir/include/vtk/Common/vt[a-jl-zA-Z]*.h") then
cp $VisItDir/include/vtk/Common/vt[a-jl-zA-Z]*.h $incdir/vtk/Common
endif
if(-e "$VisItDir/include/vtk/Common/vt[a-jl-zA-Z]*.txx") then
cp $VisItDir/include/vtk/Common/vt[a-jl-zA-Z]*.txx $incdir/vtk/Common
endif
cp $VisItDir/include/vtk/Common/vtk[a-zA-J]*.h $incdir/vtk/Common
cp $VisItDir/include/vtk/Common/vtk[a-zA-J]*.txx $incdir/vtk/Common
cp $VisItDir/include/vtk/Common/vtk[K-Z]*.h $incdir/vtk/Common
cp $VisItDir/include/vtk/Common/vtk[K-Z]*.txx $incdir/vtk/Common
cp $VisItDir/include/vtk/Common/vtk[K-Z_]*.h $incdir/vtk/Common
if(-e "$VisItDir/include/vtk/Common/vtk[K-Z]*.txx") then
cp $VisItDir/include/vtk/Common/vtk[K-Z]*.txx $incdir/vtk/Common
endif
cp $VisItDir/include/vtk/Filtering/*.h $incdir/vtk/Filtering
cp $VisItDir/include/vtk/Filtering/*.txx $incdir/vtk/Filtering
cp $VisItDir/include/vtk/GenericFiltering/*.h $incdir/vtk/GenericFiltering
cp $VisItDir/include/vtk/GenericFiltering/*.txx $incdir/vtk/GenericFiltering
if(-e "$VisItDir/include/vtk/GenericFiltering/*.txx") then
cp $VisItDir/include/vtk/GenericFiltering/*.txx $incdir/vtk/GenericFiltering
endif
cp $VisItDir/include/vtk/Graphics/*.h $incdir/vtk/Graphics
cp $VisItDir/include/vtk/Graphics/*.txx $incdir/vtk/Graphics
if(-e "$VisItDir/include/vtk/Graphics/*.txx") then
cp $VisItDir/include/vtk/Graphics/*.txx $incdir/vtk/Graphics
endif
cp $VisItDir/include/vtk/Hybrid/*.h $incdir/vtk/Hybrid
cp $VisItDir/include/vtk/Hybrid/*.txx $incdir/vtk/Hybrid
if(-e "$VisItDir/include/vtk/Hybrid/*.txx") then
cp $VisItDir/include/vtk/Hybrid/*.txx $incdir/vtk/Hybrid
endif
cp $VisItDir/include/vtk/IO/*.h $incdir/vtk/IO
cp $VisItDir/include/vtk/IO/*.txx $incdir/vtk/IO
if(-e "$VisItDir/include/vtk/IO/*.txx") then
cp $VisItDir/include/vtk/IO/*.txx $incdir/vtk/IO
endif
cp $VisItDir/include/vtk/Imaging/*.h $incdir/vtk/Imaging
cp $VisItDir/include/vtk/Imaging/*.txx $incdir/vtk/Imaging
if(-e "$VisItDir/include/vtk/Imaging/*.txx") then
cp $VisItDir/include/vtk/Imaging/*.txx $incdir/vtk/Imaging
endif
cp $VisItDir/include/vtk/MangleMesaInclude/*.h $incdir/vtk/MangleMesaInclude
cp $VisItDir/include/vtk/MangleMesaInclude/*.txx $incdir/vtk/MangleMesaInclude
if(-e "$VisItDir/include/vtk/MangleMesaInclude/*.txx") then
cp $VisItDir/include/vtk/MangleMesaInclude/*.txx $incdir/vtk/MangleMesaInclude
endif
cp $VisItDir/include/vtk/Rendering/*.h $incdir/vtk/Rendering
cp $VisItDir/include/vtk/Rendering/*.txx $incdir/vtk/Rendering
if(-e "$VisItDir/include/vtk/Rendering/*.txx") then
cp $VisItDir/include/vtk/Rendering/*.txx $incdir/vtk/Rendering
endif
cp $VisItDir/include/vtk/Utilities/*.h $incdir/vtk/Utilities
cp $VisItDir/include/vtk/Utilities/*.txx $incdir/vtk/Utilities
if(-e "$VisItDir/include/vtk/Utilities/*.txx") then
cp $VisItDir/include/vtk/Utilities/*.txx $incdir/vtk/Utilities
endif
cp $VisItDir/include/vtk/Utilities/vtkexpat/*.h $incdir/vtk/Utilities/vtkexpat
cp $VisItDir/include/vtk/Utilities/vtktiff/*.h $incdir/vtk/Utilities/vtktiff
cp $VisItDir/include/vtk/Utilities/vtkzlib/*.h $incdir/vtk/Utilities/vtkzlib
......@@ -1030,14 +1113,24 @@ cp $VisItDir/include/qt/private/*.h $incdir/qt/private
if (-e $VisItDir/help) then
echo "Copying help files to the distribution..."
cp $VisItDir/help/[a-gi-z]*.html $helpdir
cp $VisItDir/help/h[a-df-z]*.html $helpdir
cp $VisItDir/help/he[a-km-z]*.html $helpdir
cp $VisItDir/help/hel[a-oq-z]*.html $helpdir
cp $VisItDir/help/help[a-z]*.html $helpdir
if(-e "$VisItDir/help/h[a-df-z]*.html") then
cp $VisItDir/help/h[a-df-z]*.html $helpdir
endif
if(-e "$VisItDir/help/he[a-km-z]*.html") then
cp $VisItDir/help/he[a-km-z]*.html $helpdir
endif
if(-e "$VisItDir/help/hel[a-oq-z]*.html") then
cp $VisItDir/help/hel[a-oq-z]*.html $helpdir
endif
if(-e "$VisItDir/help/help[a-z]*.html") then
cp $VisItDir/help/help[a-z]*.html $helpdir
endif
cp $VisItDir/help/help0[01]*.html $helpdir
cp $VisItDir/help/help0[23]*.html $helpdir
cp $VisItDir/help/help0[45]*.html $helpdir
cp $VisItDir/help/help0[67]*.html $helpdir
if(-e "$VisItDir/help/help0[67]*.html") then
cp $VisItDir/help/help0[67]*.html $helpdir
endif
if (-e $VisItDir/help/visit.helpml) then
cp $VisItDir/help/visit.helpml $helpdir
endif
......
......@@ -19,11 +19,9 @@ user=`whoami`
#
# Parse the execute line, providing default values for error checking.
#
hitit=true
crier=true
sunset=true
sc=true
ice=true
purple=true
lilac=true
gauss=true
......@@ -40,25 +38,15 @@ for abc
do
case $1 in
-none)
hitit=false
crier=false
sunset=false
sc=false
ice=false
purple=false
lilac=false
gauss=false
hopi=false
shift
;;
-hitit)
hitit=false
shift
;;
+hitit)
hitit=true
shift
;;
-crier)
crier=false
shift
......@@ -83,14 +71,6 @@ do
sc=true
shift
;;
-ice)
ice=false
shift
;;
+ice)
ice=true
shift
;;
-purple)
purple=false
shift
......@@ -149,62 +129,6 @@ then
exit