Commit 9a25b37b authored by miller86's avatar miller86

Merging 1.12RC to trunk: adding work-around for problems launching visit from...

Merging 1.12RC to trunk: adding work-around for problems launching visit from an LLNL lscratch filesystem with another lscratch filesystem is down; making failed env-var<->make-var collision check at top level an abort instead of a warning

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7754 18c085ea-50e0-402c-830e-de6fd14e8384
parent ff4f4bb7
......@@ -158,6 +158,11 @@
# CXXFLAGS. This way, this target will not get executed for developers
# for common cases but will for users. Made the check NOT configurable.
#
# Mark C. Miller, Tue Jul 7 14:42:20 PDT 2009
# Made env. var collision check exit the make if it finds problems. The
# expectation is that this is a reasonable stop-gap since the issue will
# go away entirely upon moving to CMake.
#
##############################################################################
@SET_MAKE@
......@@ -237,11 +242,10 @@ check-make-and-env-vars:
if test -n "$$em_vars"; then \
echo ""; \
echo "The following variables in your environment may collide with"; \
echo "variables in VisIt's Makefiles. You may want to temporarily"; \
echo "adjust your environment by removing them using unsetenv (csh)"; \
echo "or unset (sh) before proceeding..."; \
echo "variables in VisIt's Makefiles. Please temporarily remove"; \
echo "using unsetenv (csh) or unset (sh) before proceeding..."; \
echo $$em_vars | tr ' ' '\n'; \
sleep 10; \
exit 1; \
else \
echo "OK"; \
fi \
......
......@@ -72,6 +72,10 @@ exec perl -x $0 ${1+"$@"};
# Dave Pugmire, Thu May 7 13:46:51 EDT 2009
# Add support for running visitconvert in parallel.
#
# Mark C. Miller, Tue Jul 7 18:00:34 PDT 2009
# Added logic to avoid backtick pwd if possible. That is causing problems
# on LLNL systems when ANY lscratch filesystem happens to be down and
# the user may be starting VisIt from ANOTHER lscratch filesystem.
###############################################################################
......@@ -86,7 +90,10 @@ $ENV{PATH} = join ':' , ("$ENV{PATH}","/bin","/usr/bin","/usr/sbin",
# set base directory
chomp( $progname= `basename $0`);
chomp( $progdir = `dirname $0` );
chomp( $cwd = `pwd` );
chomp( $cwd = $ENV{PWD} );
if (!$cwd) {
chomp( $cwd = `pwd` );
}
# check if we are called via a symbolic link to visit
$link = readlink($0);
......
......@@ -497,6 +497,11 @@ $0 = shift @ARGV;
# Predicated usage and exit on help switch appearing AS THE ONLY other arg
# on the command line. This allows '--help' to be passed to visit cli
# scripts which may have their own help and argument processing.
#
# Mark C. Miller, Tue Jul 7 18:00:34 PDT 2009
# Added logic to avoid backtick pwd if possible. That is causing problems
# on LLNL systems when ANY lscratch filesystem happens to be down and
# the user may be starting VisIt from ANOTHER lscratch filesystem.
###############################################################################
use POSIX qw(ceil);
......@@ -508,7 +513,11 @@ use POSIX qw(ceil);
$visitdir = $ENV{VISITDIR};
$progname = $ENV{VISITPROGRAM};
$ver = $ENV{VISITVERSION};
$cwd =`pwd`;
$cwd = $ENV{PWD};
if (!$cwd)
{
$cwd = `pwd`;
}
chomp $cwd;
if (!defined $visitdir or
......
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