Commit e05498c4 authored by hrchilds's avatar hrchilds

Update from June 9, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@682 18c085ea-50e0-402c-830e-de6fd14e8384
parent 98f87000
......@@ -368,7 +368,12 @@ tar xf qt-x11-free-3.3.2.tar
cd qt-x11-free-3.3.2
setenv QTDIR `pwd`
set path=($QTDIR/bin $path)
setenv LD_LIBRARY_PATH $QTDIR/lib:$LD_LIBRARY_PATH
# NOTE: if LD_LIBRARY_PATH is not set in your environment, this command will
# fail. In this case, just issue:
# setenv LD_LIBRARY_PATH $QTDIR/lib
setenv LD_LIBRARYN32_PATH $QTDIR/lib:$LD_LIBRARYN32_PATH # SGI
setenv LD_LIBRARY64_PATH $QTDIR/lib:$LD_LIBRARY64_PATH # SGI
......@@ -874,6 +879,12 @@ On irix systems if you want to build a 64 bit version you will need to
precede the configure command with "env CC="cc -O2 -64" CFLAGS="-O2 -64".
The CC part is to get around a bug in their make system.
On aix systems you will need to specify the appropriate flags to build
either a 32 bit or 64 bit version. To build a 32 bit version, preceed the
configure command with "env CC="xlc -q32" AR="ar -X 32"". To build a 64
bit version, preceed the configure command with "env CC="xlc -q64" AR="ar
-X 64"".
On itanium (ia64) systems you will need to add -fPIC to the compile flags.
This can be done by preceding the configure command with "env CFLAGS=-fPIC".
......@@ -917,8 +928,9 @@ This can be done by adding the line "CXXFLAGS += -fPIC" and "FFLAGS += -fPIC"
near the top of the file GNUmakefile.
On opteron systems you will need to add "-m64 -fPIC" to the compile flags.
This can be done byy adding the line "CXXFLAGS += "-m64 -fPIC"" and
"FFLAGS += -m64 -fPIC" near the top of the file GNUmakefile.
This can be done by adding the line "CXXFLAGS += -m64 -fPIC" and
"FFLAGS += -m64 -fPIC" near the top of the file GNUmakefile. You also will
probably want to add optimization flags (i.e. -O2).
#
# Boxlib builds either a 2d or 3d version and VisIt needs both, so you will
......@@ -950,6 +962,10 @@ This can be done byy adding the line "CXXFLAGS += "-m64 -fPIC"" and
# Start off by building the 3d version.
#
gmake -f GNUmakefile
#
# If the make fails with complaints about the header file "limits", try
# moving the directory "std" to "std.old" and issuing another make command.
#
#
# Install the 3d version in the visit directory under the boxlib directory.
......@@ -1182,4 +1198,15 @@ The second group of options are used when building with support for reading
SAF files. The third group of options are used when building with support
for reading exodus files.
Some platforms (especially SUSE) have compilation problems with
"plots/Volume/avtOpenGL3DTextureVolumeRenderer.C". We are currently working
on using an extension wrangler type approach to deal with this. In the
interim, you can avoid this problem by adding:
#ifndef VTK_IMPLEMENT_MESA_CXX
extern PFNGLTEXIMAGE3DEXTPROC glTexImage3D;
#endif
to the file after the standard includes.
If you have any problems send e-mail to visit-help@llnl.gov.
......@@ -471,7 +471,6 @@ set vtklibs="libvtkCommon libvtkDICOMParser libvtkFiltering libvtkGraphics libvt
#
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 ..."
......@@ -820,7 +819,7 @@ ln -s "python/lib/$pyver/config/lib${pyver}.$SHLIB_SOEXT" $libdir
if ("$VTKLibs" == "TRUE") then
foreach vtklib ($vtklibs)
if ("$SHLIB_SOEXT" == "so") then
if ("$os" == "aix") then
if ("$os" == "aix" || "$os" == "osf") then
cp $VisItDir/lib/$vtklib.so $libdir/$vtklib.so
else
cp $VisItDir/lib/$vtklib.so.5.0.0 $libdir/$vtklib.so.5.0.0
......
......@@ -24,7 +24,7 @@ sunset=true
sc=true
tidalwave=true
white=true
pu=true
purple=true
lilac=true
gauss=true
......@@ -44,7 +44,7 @@ do
sc=false
tidalwave=false
white=false
pu=false
purple=false
lilac=false
gauss=false
shift
......@@ -89,12 +89,12 @@ do
white=true
shift
;;
-pu)
pu=false
-purple)
purple=false
shift
;;
+pu)
pu=true
+purple)
purple=true
shift
;;
-lilac)
......@@ -338,7 +338,7 @@ fi
rm -f white
cat <<EOF > white
#!/bin/sh
PATH=/usr/local/bin:$PATH
PATH=/usr/local/bin:\$PATH
if test ! -d /p/gw1/$user ; then
mkdir /p/gw1/$user
fi
......@@ -383,22 +383,22 @@ then
fi
#
# Build on pu, both serial and parallel versions.
# Build on purple, both serial and parallel versions.
#
rm -f pu
cat <<EOF > pu
rm -f purple
cat <<EOF > purple
#!/bin/sh
PATH=/usr/local/bin:$PATH
if test ! -d /p/gpu1/$user ; then
mkdir /p/gpu1/$user
PATH=/usr/local/bin:\$PATH
if test ! -d /p/gp1/$user ; then
mkdir /p/gp1/$user
fi
if test ! -d /p/gpu1/$user/pu ; then
mkdir /p/gpu1/$user/pu
if test ! -d /p/gp1/$user/purple ; then
mkdir /p/gp1/$user/purple
fi
rm -rf /p/gpu1/$user/pu/visitbuild
mkdir /p/gpu1/$user/pu/visitbuild
mv pu_$dist.tar.gz /p/gpu1/$user/pu/visitbuild/$dist.tar.gz
cd /p/gpu1/$user/pu/visitbuild
rm -rf /p/gp1/$user/purple/visitbuild
mkdir /p/gp1/$user/purple/visitbuild
mv purple_$dist.tar.gz /p/gp1/$user/purple/visitbuild/$dist.tar.gz
cd /p/gp1/$user/purple/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
......@@ -408,8 +408,8 @@ gmake -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -compiler xlc -make gmake >> ../buildlog 2>&1
mv visit\$ver2.aix64-xlc.tar.gz ..
cd ..
echo " build of visit on pu" > resultlog 2>&1
echo " ----------------------" >> resultlog 2>&1
echo " build of visit on purple" > resultlog 2>&1
echo " --------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l >> resultlog 2>&1
echo "" >> resultlog 2>&1
......@@ -421,13 +421,13 @@ echo "The database plugins:" >> resultlog 2>&1
ls $dist/plugins/databases/libI* | sed "s/$dist\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
EOF
if [ $pu = true ]
if [ $purple = true ]
then
if [ $test = no ]
then
scp pu pu:pu_buildit
scp $dist.tar.gz pu:pu_$dist.tar.gz
ssh pu "chmod 750 pu_buildit;./pu_buildit" &
scp purple purple:purple_buildit
scp $dist.tar.gz purple:purple_$dist.tar.gz
ssh purple "chmod 750 purple_buildit;./purple_buildit" &
fi
fi
......@@ -485,6 +485,8 @@ fi
rm -f gauss
cat <<EOF > gauss
#!/bin/sh
XLOCALEDIR=/usr/lib/X11/locale
PATH=/usr/bin/X11:\$PATH
if test ! -d /usr/tmp/$user ; then
mkdir /usr/tmp/$user
fi
......@@ -533,5 +535,5 @@ fi
#
if [ $test = no ]
then
rm -f hitit sunset sc tidalwave white pu lilac gauss
rm -f hitit sunset sc tidalwave white purple lilac gauss
fi
......@@ -206,13 +206,13 @@
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pbatch</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="partition" type="string">gauss</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">srun</Field>
<Field name="launchMethod" type="string">psub/srun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
......@@ -228,13 +228,13 @@
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pbatch</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="partition" type="string">gauss</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">srun</Field>
<Field name="launchMethod" type="string">psub/srun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
......@@ -444,72 +444,6 @@
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">pu.llnl.gov</Field>
<Field name="hostAliases" type="string">pu.llnl.gov pu###.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string"></Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">false</Field>
<Field name="launchMethod" type="string"></Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">pu.llnl.gov</Field>
<Field name="hostAliases" type="string">pu.llnl.gov pu###.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">4</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pu,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">psub</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel interactive pdebug</Field>
<Field name="host" type="string">pu.llnl.gov</Field>
<Field name="hostAliases" type="string">pu.llnl.gov pu###.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pdebug</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">poe</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">purple.llnl.gov</Field>
......@@ -529,7 +463,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
......@@ -771,7 +705,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
......@@ -837,7 +771,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
......
......@@ -215,13 +215,13 @@
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pbatch</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="partition" type="string">gauss</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">srun</Field>
<Field name="launchMethod" type="string">psub/srun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
......@@ -238,13 +238,13 @@
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pbatch</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="partition" type="string">gauss</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">srun</Field>
<Field name="launchMethod" type="string">psub/srun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
......@@ -464,75 +464,6 @@
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">pu.llnl.gov</Field>
<Field name="hostAliases" type="string">pu.llnl.gov pu###.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string"></Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">false</Field>
<Field name="launchMethod" type="string"></Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">pu.llnl.gov</Field>
<Field name="hostAliases" type="string">pu.llnl.gov pu###.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">4</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pu,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">psub</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel interactive pdebug</Field>
<Field name="host" type="string">pu.llnl.gov</Field>
<Field name="hostAliases" type="string">pu.llnl.gov pu###.llnl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pdebug</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">poe</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">purple.llnl.gov</Field>
......@@ -552,7 +483,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
......@@ -805,7 +736,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
......@@ -874,7 +805,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
......
......@@ -615,7 +615,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
......
......@@ -642,7 +642,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
......
......@@ -28,7 +28,7 @@ sunset=true
sc=true
tidalwave=true
white=true
pu=true
purple=true
lilac=true
gauss=true
......@@ -49,7 +49,7 @@ do
sc=false
tidalwave=false
white=false
pu=false
purple=false
lilac=false
gauss=false
shift
......@@ -63,7 +63,7 @@ do
sc=true
tidalwave=true
white=true
pu=true
purple=true
lilac=true
shift
;;
......@@ -107,12 +107,12 @@ do
white=true
shift
;;
-pu)
pu=false
-purple)
purple=false
shift
;;
+pu)
pu=true
+purple)
purple=true
shift
;;
-lilac)
......@@ -374,15 +374,15 @@ then
fi
#
# Install on pu.
# Install on purple.
#
rm -f pu
cat <<EOF > pu
rm -f purple
cat <<EOF > purple
./visit-install -private -c closed -g visit -b bdivp -gw -l $ver aix64-xlc /usr/gapps/visit > installlog 2>&1
echo "" >> resultlog 2>&1
echo " install of visit on pu" >> resultlog 2>&1
echo " ------------------------" >> resultlog 2>&1
echo " install of visit on purple" >> resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /usr/gapps/visit >> resultlog 2>&1
echo "" >> resultlog 2>&1
......@@ -396,13 +396,13 @@ echo "The database plugins:" >> resultlog 2>&1
ls /usr/gapps/visit/$ver/ibm-aix-pwr64-xlc/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver\/ibm-aix-pwr64-xlc\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
EOF
if [ $pu = true ]
if [ $purple = true ]
then
if [ $test = no ]
then
cat pu >> lc
cat purple >> lc
scp pu:/p/gpu1/$user/pu/visitbuild/visit$ver2.aix64-xlc.tar.gz .
scp purple:/p/gp1/$user/purple/visitbuild/visit$ver2.aix64-xlc.tar.gz .
scp visit$ver2.aix64-xlc.tar.gz sc1:
fi
fi
......@@ -491,5 +491,5 @@ fi
#
if [ $test = no ]
then
rm -f bdiv hitit sunset lc sc tidalwave white pu lilac gauss
rm -f bdiv hitit sunset lc sc tidalwave white purple lilac gauss
fi
......@@ -514,7 +514,7 @@ if [ $vertex = true ]
then
if [ $test = no ]
then
scp vertex2:/usr/tmp/$user/vertex/visitbuild/visit$ver2.linux-x86_64.tar.gz .
scp vertex0:/usr/tmp/$user/vertex/visitbuild/visit$ver2.linux-x86_64.tar.gz .
scp visit$ver2.linux-x86_64.tar.gz gps15:
scp visit-install gps15:
scp vertex gps15:vertex_install
......
......@@ -551,12 +551,15 @@ ConfigManager::PutBackChar(char c)
//
// Modifications:
//
// Hank Childs, Thu Jun 8 16:14:54 PDT 2006
// Initialize 'c' to remove compiler warning.
//
// ****************************************************************************
void
ConfigManager::FinishTag()
{
char c;
char c = '\0';
for(int i = 0; !feof(fp) && ((c = ReadChar()) != '>'); ++i);
if(c != '>')
......
......@@ -35,6 +35,7 @@
*
*****************************************************************************/
#include <PickAttributes.h>
#include <DataNode.h>
#include <stdio.h>
......@@ -89,7 +90,7 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 17 14:46:02 PST 2006
// Creation: Fri Jun 9 09:02:30 PDT 2006
//
// Modifications:
//
......@@ -166,7 +167,7 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissDDDDD
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 17 14:46:02 PST 2006
// Creation: Fri Jun 9 09:02:30 PDT 2006
//
// Modifications:
//
......@@ -282,7 +283,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 17 14:46:02 PST 2006
// Creation: Fri Jun 9 09:02:30 PDT 2006
//
// Modifications:
//
......@@ -306,7 +307,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 17 14:46:02 PST 2006
// Creation: Fri Jun 9 09:02:30 PDT 2006
//
// Modifications:
//
......@@ -425,7 +426,7 @@ PickAttributes::operator = (const PickAttributes &obj)