Commit 1f7d28dd authored by whitlocb's avatar whitlocb
Browse files

I added version to the path used for private plugins.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@14757 18c085ea-50e0-402c-830e-de6fd14e8384
parent 70d2cc97
......@@ -705,6 +705,9 @@ $0 = shift @ARGV;
# Eric Brugger, Wed Apr 20 10:25:53 PDT 2011
# I added support for Cielo at LANL.
#
# Brad Whitlock, Fri May 6 15:21:05 PDT 2011
# Add support for version in the private plugin path.
#
###############################################################################
use POSIX qw(ceil);
......@@ -2485,24 +2488,32 @@ $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")
{
$privateplugins="$ENV{HOME}/.visit/$ver/$archdir/plugins/plots:$ENV{HOME}/.visit/$ver/$archdir/plugins/databases:$ENV{HOME}/.visit/$ver/$archdir/plugins/operators";
$oldprivateplugins="$ENV{HOME}/.visit/$archdir/plugins/plots:$ENV{HOME}/.visit/$archdir/plugins/databases:$ENV{HOME}/.visit/$archdir/plugins/operators";
if ($ENV{DYLD_FALLBACK_LIBRARY_PATH} eq "")
{
$ENV{DYLD_FALLBACK_LIBRARY_PATH} = "$visitlibdir:$ENV{HOME}/.visit/$archdir/plugins/plots:$ENV{HOME}/.visit/$archdir/plugins/databases:$ENV{HOME}/.visit/$archdir/plugins/operators:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries";
$ENV{DYLD_FALLBACK_LIBRARY_PATH} = "$visitlibdir:$privateplugins:$oldprivateplugins:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries";
}
else
{
$ENV{DYLD_FALLBACK_LIBRARY_PATH} = "$visitlibdir:$ENV{HOME}/.visit/$archdir/plugins/plots:$ENV{HOME}/.visit/$archdir/plugins/databases:$ENV{HOME}/.visit/$archdir/plugins/operators:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries:$ENV{DYLD_FALLBACK_LIBRARY_PATH}";
$ENV{DYLD_FALLBACK_LIBRARY_PATH} = "$visitlibdir:$privateplugins:$oldprivateplugins:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries:$ENV{DYLD_FALLBACK_LIBRARY_PATH}";
}
}
# Set up plugin search paths in the correct order
if ($IsRunningOnJaguar_ORNL)
{
$visitprivateplugins = "/lustre/widow1/scratch/$ENV{USER}/.visit/$archdir/plugins";
$visitprivateplugins = "/lustre/widow1/scratch/$ENV{USER}/.visit/$ver/$archdir/plugins";
$visitprivateplugins_old = "/lustre/widow1/scratch/$ENV{USER}/.visit/$archdir/plugins";
}
else
{
$visitprivateplugins = "$ENV{HOME}/.visit/$archdir/plugins";
$visitprivateplugins = "$ENV{HOME}/.visit/$ver/$archdir/plugins";
$visitprivateplugins_old = "$ENV{HOME}/.visit/$archdir/plugins";
}
if ($ver eq "")
{
$visitprivateplugins = $visitprivateplugins_old;
}
if ($publiconly)
......@@ -2516,7 +2527,7 @@ else
{
$ENV{VISITPLUGINDIRORIG} = $ENV{VISITPLUGINDIR};
}
$ENV{VISITPLUGINDIR}="$ENV{VISITPLUGINDIRORIG}:$visitprivateplugins:$visitplugins";
$ENV{VISITPLUGINDIR}="$ENV{VISITPLUGINDIRORIG}:$visitprivateplugins:$visitprivateplugins_old:$visitplugins";
}
......
......@@ -110,7 +110,7 @@ enhancements and bug-fixes that were added to this release.</p>
<a name="Dev_changes"></a>
<p><b><font size="4">Changes for VisIt developers in version 2.3</font></b></p>
<ul>
<li></li>
<li>Private plugins are now installed to <i>~/.visit/&lt;version&gt;/&lt;architecture&gt;</i> instead of the former location <i>~/.visit/&lt;architecture&gt;</i>. This is meant to enable the user to keep several versions of a plugin matched to specific versions of VisIt. Note that loading plugins from the former location will also still work.</li>
</ul>
<p>Click the following link to view the release notes for the previous 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