Commit 76a4a9d2 authored by bonnell's avatar bonnell
Browse files

Merge RC 1.6.1 to trunk

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@1369 18c085ea-50e0-402c-830e-de6fd14e8384
parent e47f1226
......@@ -1207,9 +1207,9 @@ More information about building VisIt follows after that.
#
# Build and install it in the visit directory.
#
gunzip visit070330.tar.gz
tar xf visit070330.tar
cd visit070330/config-site
gunzip visit070702.tar.gz
tar xf visit070702.tar
cd visit070702/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -1227,15 +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.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
clearcase_bin/visit-install 1.6.1 aix $VISITDIR
clearcase_bin/visit-install 1.6.1 aix64 $VISITDIR
clearcase_bin/visit-install 1.6.1 darwin $VISITDIR
clearcase_bin/visit-install 1.6.1 irix6 $VISITDIR
clearcase_bin/visit-install 1.6.1 linux $VISITDIR
clearcase_bin/visit-install 1.6.1 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.6.1 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.6.1 osf1 $VISITDIR
clearcase_bin/visit-install 1.6.1 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.6 for the current distribution.
"version" will be 1.6.1 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.6 irix6 /usr/local/visit
visit-install 1.6.1 irix6 /usr/local/visit
will install the irix6, 1.6 version of visit in the directory
will install the irix6, 1.6.1 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_6.irix6.tar.gz" present in the current directory for this
"visit1_6_1.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.6 linux /usr/local/visit
visit-install 1.6.1 linux /usr/local/visit
to add a linux, 1.6 version of visit to the same directory.
to add a linux, 1.6.1 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.6.exe to your desktop.
1. Copy the file visit1.6.1.exe to your desktop.
2. Double click on the visit1.6.exe icon to run the installer.
2. Double click on the visit1.6.1.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -51,6 +51,7 @@ hoth=true
sunspot=true
quad=true
up=true
pengra=true
thunder=true
prism=true
yana=true
......@@ -72,6 +73,7 @@ do
sunspot=false
quad=false
up=false
pengra=false
thunder=false
prism=false
yana=false
......@@ -111,6 +113,14 @@ do
up=true
shift
;;
-pengra)
pengra=false
shift
;;
+pengra)
pengra=true
shift
;;
-thunder)
thunder=false
shift
......@@ -300,9 +310,9 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
make >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel --enable-visitmodule >> ../buildlog 2>&1
gmake -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -make gmake >> ../buildlog 2>&1
mv visit\$ver2.irix6.tar.gz ..
cd ..
rm -f resultlog
......@@ -403,6 +413,56 @@ then
fi
fi
#
# Build on pengra.
#
rm -f pengra
cat <<EOF > pengra
#!/bin/sh
if test ! -d /usr/tmp/$user ; then
mkdir /usr/tmp/$user
fi
if test ! -d /usr/tmp/$user/pengra ; then
mkdir /usr/tmp/$user/pengra
fi
rm -rf /usr/tmp/$user/pengra/visitbuild
mkdir /usr/tmp/$user/pengra/visitbuild
mv pengra_$dist.tar.gz /usr/tmp/$user/pengra/visitbuild/$dist.tar.gz
cd /usr/tmp/$user/pengra/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ..
cd ..
rm -f resultlog
echo " build of visit on pengra" > resultlog 2>&1
echo " --------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls $dist/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls $dist/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls $dist/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
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
mail $emailName < resultlog
EOF
if [ $pengra = true ]
then
if [ $test = no ]
then
scp pengra pengra1:pengra_buildit
scp $dist.tar.gz pengra1:pengra_$dist.tar.gz
ssh pengra1 "chmod 750 pengra_buildit;./pengra_buildit" &
fi
fi
#
# Build on thunder.
#
......@@ -665,5 +725,5 @@ fi
#
if [ $test = no ]
then
rm -f hoth sunspot quad up thunder prism yana xchem davinci
rm -f hoth sunspot quad up pengra thunder prism yana xchem davinci
fi
......@@ -56,6 +56,7 @@ hoth=true
sunspot=true
quad=true
up=true
pengra=true
thunder=true
prism=true
yana=true
......@@ -78,6 +79,7 @@ do
sunspot=false
quad=false
up=false
pengra=false
thunder=false
prism=false
yana=false
......@@ -117,6 +119,14 @@ do
up=true
shift
;;
-pengra)
pengra=false
shift
;;
+pengra)
pengra=true
shift
;;
-thunder)
thunder=false
shift
......@@ -358,6 +368,42 @@ then
fi
fi
#
# Install on pengra.
#
rm -f pengra
cat <<EOF > pengra
#!/bin/sh
./visit-install -private -c open -g visit -b bdivp -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on pengra" > resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /usr/gapps/visit >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l /usr/gapps/visit/$ver/linux-intel/bin >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver\/linux-intel\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $pengra = true ]
then
if [ $test = no ]
then
scp pengra2:/usr/tmp/$user/pengra/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
scp visit$ver2.linux_chaos.tar.gz pengra2:
scp visit-install pengra2:
scp pengra pengra2:pengra_install
ssh pengra2 "chmod 750 pengra_install;./pengra_install"
fi
fi
#
# Install on thunder.
#
......@@ -543,5 +589,5 @@ fi
#
if [ $test = no ]
then
rm -f hoth sunspot quad up thunder prism yana xchem davinci
rm -f hoth sunspot quad up pengra thunder prism yana xchem davinci
fi
......@@ -42,7 +42,7 @@
#include <avtExtrudedVolFileFormat.h>
#include <string>
#include <fstream>
#include <visitstream.h>
#include <snprintf.h>
#include <vtkCell.h>
......
......@@ -389,7 +389,12 @@ int readRLEData(MHDdata *data)
int_value = lsbits[count] + 94.0 * msbits[count];
/* reconstruct the original floating point value from the range information & sign */
data->data[block64+count] = sign * expf(dzi * int_value + data->wrn2_z1);
/* Note that the following expression uses float(exp()) instead */
/* of expf(). This is because we are using gcc 3.2 on a solaris */
/* machine, which doesn't support expf. We should change this */
/* when we no longer support gcc 3.2. */
data->data[block64+count] = sign * float(exp(dzi * int_value + data->wrn2_z1));
}
}
......
......@@ -40,7 +40,11 @@
// ************************************************************************* //
#include <avtNek3DFileFormat.h>
#ifndef WIN32
#include <unistd.h>
#else
#include <direct.h>
#endif
#include <string>
......
......@@ -130,7 +130,8 @@ DataNetwork::~DataNetwork(void)
// ****************************************************************************
void DataNetwork::AddFilterNodeAfterExpressionEvaluator(NetnodeFilter *f)
{
std::vector<Netnode*>::iterator it = ++nodeList.begin();
std::vector<Netnode*>::iterator it = nodeList.begin();
++it;
if (it != nodeList.end())
{
// There is another Netnode ...
......
......@@ -1314,16 +1314,14 @@ QvisHelpWindow::synchronizeContents(const QString &page)
// Brad Whitlock, Tue Sep 10 16:29:49 PST 2002
// I added code to make the page redraw with the new font size.
//
// Kathleen Bonnell, Wed Jun 27 12:42:47 PDT 2007
// Removed Q_WS_WIN specific code.
//
// ****************************************************************************
void
QvisHelpWindow::increaseFontSize()
{
#ifdef Q_WS_WIN
QFont f(helpBrowser->font());
f.setPointSize(f.pointSize()/2+1);
helpBrowser->setFont(f);
#else
QFont f(helpBrowser->font());
f.setPointSize(f.pointSize()+1);
helpBrowser->setFont(f);
......@@ -1337,7 +1335,6 @@ QvisHelpWindow::increaseFontSize()
helpBrowser->setUpdatesEnabled(true);
helpBrowser->repaint();
#endif
#endif
}
// ****************************************************************************
......@@ -1353,17 +1350,14 @@ QvisHelpWindow::increaseFontSize()
// Brad Whitlock, Tue Sep 10 16:29:49 PST 2002
// I added code to make the page redraw with the new font size.
//
// Kathleen Bonnell, Wed Jun 27 12:42:47 PDT 2007
// Removed Q_WS_WIN specific code.
//
// ****************************************************************************
void
QvisHelpWindow::decreaseFontSize()
{
#ifdef Q_WS_WIN
QFont f(helpBrowser->font());
int ptSize = f.pointSize()/2-1;
f.setPointSize(ptSize);
helpBrowser->setFont(f);
#else
QFont f(helpBrowser->font());
int ptSize = f.pointSize()-1;
if(ptSize > 2)
......@@ -1381,7 +1375,6 @@ QvisHelpWindow::decreaseFontSize()
helpBrowser->repaint();
#endif
}
#endif
}
// ****************************************************************************
......
......@@ -67,6 +67,11 @@
# directories (old Python versions, .svn) Temporarily disable help file
# creation for call to visit-dist.
#
# Kathleen Bonnell, Wed Jun 27 15:37:34 PDT 2007
# Add -with-help back in as an arg to 'visit-dist'. Only copy Mesa dlls
# and libs from old MSVC6 directories, as all others have now been built
# with MSVC7.
#
#------------------------------------------------------------------------------
# Need another way to determine we are starting in the right directory.
......@@ -113,9 +118,7 @@ set VISITSRC="visit"
# Run the visit-dist script so it creates a source distribution
if ($create_src_dist == true) then
echo "Creating intermediate source package..."
#This currently is working in svn, so disable the -withhelp directive
#$SCRIPTDIR/visit-dist -withhelp $VISITSRC
$SCRIPTDIR/visit-dist $VISITSRC
$SCRIPTDIR/visit-dist -withhelp $VISITSRC
endif
# Create a directory to contain the VisIt source distribution.
......@@ -269,7 +272,7 @@ end
#
foreach buildmode (Debug Release)
cd $VisItDev/bin/$buildmode
foreach DLL (MesaGL.dll hdf5dll.dll osmesa.dll silohdf5.dll szlibdll.dll zlib.dll libbz2.dll)
foreach DLL (MesaGL.dll osmesa.dll)
cp $DLL ../MSVC7.Net/$buildmode
end
cd $VisItDev/bin/
......@@ -300,7 +303,7 @@ 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 libbz2.lib)
foreach DLL (MesaGL.lib osmesa.lib)
cp $DLL ../MSVC7.Net/$buildmode
end
cd $VisItDev/lib
......
......@@ -51,6 +51,10 @@ graphicalGetPassword(const char *host, int *okay)
// Brad Whitlock, Tue Dec 21 16:17:12 PST 2004
// Added code to close stdin so we don't gobble up input typed into the CLI.
//
// Jeremy Meredith, Wed Jun 27 12:08:52 EDT 2007
// Added support for standard SSH-style remote port forwarding arguments
// of the form "-R rp:lh:lp:".
//
// ****************************************************************************
int
......@@ -64,6 +68,8 @@ main(int argc, char *argv[])
bool printArgs = false;
bool hostSpecified = false;
int port = 22;
char portfwd[1024] = "";
int portfwdpos = 0;
// Initialize the command line array.
for(i = 0; i < 100; ++i)
......@@ -102,6 +108,65 @@ main(int argc, char *argv[])
++i;
}
}
else if(strcmp(arg, "-R") == 0)
{
// we must compose the port forward string
// according to PUTTY.H
if(i+1 < argc)
{
int l = strlen(argv[i+1]);
char *s = strdup(argv[i+1]);
char *p = s;
int part = 0;
char *remoteport;
char *localhost;
char *localport;
for (int j=0; j<l+1; j++)
{
if (s[j] == ':' || s[j] == '\0')
{
s[j] = '\0';
switch (part)
{
case 0:
remoteport = p;
break;
case 1:
localhost = p;
break;
case 2:
localport = p;
break;
default:
// we'll detect this as an error automatically
break;
}
p = &(s[j+1]);
part++;
}
}
if (part == 3)
{
// first is the R, for Remote
portfwd[portfwdpos++] = 'R';
for (int j=0; j<strlen(remoteport); j++)
portfwd[portfwdpos++] = remoteport[j];
// remote/local separated by tab
portfwd[portfwdpos++] = '\t';
for (int j=0; j<strlen(localhost); j++)
portfwd[portfwdpos++] = localhost[j];
// host/port separated by a colon
portfwd[portfwdpos++] = ':';
for (int j=0; j<strlen(localport); j++)
portfwd[portfwdpos++] = localport[j];
// terminate this forward with a \0
portfwd[portfwdpos++] = '\0';
// and the final forward is terminated with another \0
portfwd[portfwdpos] = '\0';
}
++i;
}
}
else if(strcmp(arg, "-D") == 0)
{
printArgs = true;
......@@ -150,7 +215,7 @@ main(int argc, char *argv[])
// Run the command on the remote machine.
RunRemoteCommand(username, host, port, commands, command_count,
graphicalGetPassword, 1);
graphicalGetPassword, 1, portfwd);
// Clean up.
if(!userSpecified)
......
......@@ -380,12 +380,15 @@ static int console_get_line_or_password(const char *prompt, char *str,
* Brad Whitlock, Fri Oct 10 14:21:53 PST 2003
* Added the port argument so we can use whatever port we want.
*
* Jeremy Meredith, Wed Jun 27 12:16:56 EDT 2007
* Added the port forwarding arguments.
*
*****************************************************************************/
int
RunRemoteCommand(const char *username, const char *host, int port,
const char *commands[], int nCommands, passwordCallback *cb,
int initSockets)
int initSockets, const char *portForwards)
{
WSAEVENT stdinevent, stdoutevent, stderrevent;
HANDLE handles[4];
......@@ -399,6 +402,7 @@ RunRemoteCommand(const char *username, const char *host, int port,
int connopen;
int exitcode;
int use_subsystem = 0;
int i;
/*** BEGIN LLNL CODE ***/
if(username == NULL || host == NULL || commands == NULL ||
......@@ -443,6 +447,18 @@ RunRemoteCommand(const char *username, const char *host, int port,
strncpy(cfg.host, host, sizeof(cfg.host)-1);
cfg.host[sizeof(cfg.host)-1] = '\0';
/*
* Copy the port forwards into the config.
*/
if (portForwards != NULL && strlen(portForwards) > 0)
{
for (i=0; i<1024 && (i<2 || portForwards[i-1] != '\0' ||
portForwards[i-2] != '\0') ; i++)
{
cfg.portfwd[i] = portForwards[i];
}
}
/*
* Verbose for now...
*/
......
......@@ -58,7 +58,7 @@ typedef const char *passwordCallback(const char *host, int *okay);
/* Prototypes. */
REMOTE_COMMAND_API int RunRemoteCommand(const char *username,
const char *host, int port, const char *commands[], int nCommands,
passwordCallback *cb, int initSockets);
passwordCallback *cb, int initSockets, const char *portForwards);
#ifdef __cplusplus
};
......
......@@ -35,6 +35,12 @@
*
*****************************************************************************/
// The following 2 include lines are only for the MIPSpro 7.41 compiler.
// There is some conflict between Python.h and Utility.h in including
// those 2 files. Remove once support for MIPSpro is dropped.
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
#include <stdio.h>
#include <Python.h>
......
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