Commit b5f7bb93 authored by bonnell's avatar bonnell
Browse files

For better namespace behavior, renames some visit-config defines with 'VISIT_'...

For better namespace behavior, renames some visit-config defines with 'VISIT_' prepended, namely: SLASH_CHAR, SLASH_STRING, SVN_REVISION, PLUGIN_EXTENSION, USE_PTY.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7178 18c085ea-50e0-402c-830e-de6fd14e8384
parent 40587061
......@@ -541,12 +541,12 @@ class MakefileGeneratorPlugin : public Plugin
"$(EPARLIBS_FOR_MACOSX_PREBINDING) "
"$(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)" << endl;
out << "" << endl;
out << "IDSO="<<visitplugininstall<<"/operators/libI"<<name<<"Operator" << PLUGIN_EXTENSION << endl;
out << "GDSO="<<visitplugininstall<<"/operators/libG"<<name<<"Operator" << PLUGIN_EXTENSION << endl;
out << "SDSO="<<visitplugininstall<<"/operators/libS"<<name<<"Operator" << PLUGIN_EXTENSION << endl;
out << "VDSO="<<visitplugininstall<<"/operators/libV"<<name<<"Operator" << PLUGIN_EXTENSION << endl;
out << "ESERDSO="<<visitplugininstall<<"/operators/libE"<<name<<"Operator_ser" << PLUGIN_EXTENSION << endl;
out << "EPARDSO="<<visitplugininstall<<"/operators/libE"<<name<<"Operator_par" << PLUGIN_EXTENSION << endl;
out << "IDSO="<<visitplugininstall<<"/operators/libI"<<name<<"Operator" << VISIT_PLUGIN_EXTENSION << endl;
out << "GDSO="<<visitplugininstall<<"/operators/libG"<<name<<"Operator" << VISIT_PLUGIN_EXTENSION << endl;
out << "SDSO="<<visitplugininstall<<"/operators/libS"<<name<<"Operator" << VISIT_PLUGIN_EXTENSION << endl;
out << "VDSO="<<visitplugininstall<<"/operators/libV"<<name<<"Operator" << VISIT_PLUGIN_EXTENSION << endl;
out << "ESERDSO="<<visitplugininstall<<"/operators/libE"<<name<<"Operator_ser" << VISIT_PLUGIN_EXTENSION << endl;
out << "EPARDSO="<<visitplugininstall<<"/operators/libE"<<name<<"Operator_par" << VISIT_PLUGIN_EXTENSION << endl;
}
else if (type=="plot")
{
......@@ -721,12 +721,12 @@ class MakefileGeneratorPlugin : public Plugin
out << "ESERLIBS=-lpipeline_ser -lplotter_ser -lavtfilters_ser -lavtmath_ser -lavtview -lavtexceptions -ldbatts -lstate -lmisc -lcomm -lexpr -lparser -lutility -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser -lexpressions_ser $(ESERLIBS_FOR_MACOSX_PREBINDING) $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)" << endl;
out << "EPARLIBS=-lpipeline_par -lplotter_par -lavtfilters_par -lavtmath_par -lavtview -lavtexceptions -ldbatts -lstate -lmisc -lcomm -lexpr -lparser -lutility -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par -lexpressions_par $(EPARLIBS_FOR_MACOSX_PREBINDING) $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)" << endl;
out << "" << endl;
out << "IDSO="<<visitplugininstall<<"/plots/libI"<<name<<"Plot" << PLUGIN_EXTENSION << endl;
out << "GDSO="<<visitplugininstall<<"/plots/libG"<<name<<"Plot" << PLUGIN_EXTENSION << endl;
out << "SDSO="<<visitplugininstall<<"/plots/libS"<<name<<"Plot" << PLUGIN_EXTENSION << endl;
out << "VDSO="<<visitplugininstall<<"/plots/libV"<<name<<"Plot" << PLUGIN_EXTENSION << endl;
out << "ESERDSO="<<visitplugininstall<<"/plots/libE"<<name<<"Plot_ser" << PLUGIN_EXTENSION << endl;
out << "EPARDSO="<<visitplugininstall<<"/plots/libE"<<name<<"Plot_par" << PLUGIN_EXTENSION << endl;
out << "IDSO="<<visitplugininstall<<"/plots/libI"<<name<<"Plot" << VISIT_PLUGIN_EXTENSION << endl;
out << "GDSO="<<visitplugininstall<<"/plots/libG"<<name<<"Plot" << VISIT_PLUGIN_EXTENSION << endl;
out << "SDSO="<<visitplugininstall<<"/plots/libS"<<name<<"Plot" << VISIT_PLUGIN_EXTENSION << endl;
out << "VDSO="<<visitplugininstall<<"/plots/libV"<<name<<"Plot" << VISIT_PLUGIN_EXTENSION << endl;
out << "ESERDSO="<<visitplugininstall<<"/plots/libE"<<name<<"Plot_ser" << VISIT_PLUGIN_EXTENSION << endl;
out << "EPARDSO="<<visitplugininstall<<"/plots/libE"<<name<<"Plot_par" << VISIT_PLUGIN_EXTENSION << endl;
}
else if (type=="database")
{
......@@ -807,10 +807,10 @@ class MakefileGeneratorPlugin : public Plugin
out << "EPARLIBS=-lpipeline_par -ldatabase_par -lmir_par -lavtmath_par -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)" << endl;
out << "" << endl;
out << "IDSO="<<visitplugininstall<<"/databases/libI"<<name<<"Database" << PLUGIN_EXTENSION << endl;
out << "MDSO="<<visitplugininstall<<"/databases/libM"<<name<<"Database" << PLUGIN_EXTENSION << endl;
out << "ESERDSO="<<visitplugininstall<<"/databases/libE"<<name<<"Database_ser" << PLUGIN_EXTENSION << endl;
out << "EPARDSO="<<visitplugininstall<<"/databases/libE"<<name<<"Database_par" << PLUGIN_EXTENSION << endl;
out << "IDSO="<<visitplugininstall<<"/databases/libI"<<name<<"Database" << VISIT_PLUGIN_EXTENSION << endl;
out << "MDSO="<<visitplugininstall<<"/databases/libM"<<name<<"Database" << VISIT_PLUGIN_EXTENSION << endl;
out << "ESERDSO="<<visitplugininstall<<"/databases/libE"<<name<<"Database_ser" << VISIT_PLUGIN_EXTENSION << endl;
out << "EPARDSO="<<visitplugininstall<<"/databases/libE"<<name<<"Database_par" << VISIT_PLUGIN_EXTENSION << endl;
}
out << endl;
out << "" << endl;
......
......@@ -521,9 +521,9 @@ protected:
}
// Make sure that it ends with a separator.
if(retval.length() > 0 && retval.right(1) != SLASH_STRING)
if(retval.length() > 0 && retval.right(1) != VISIT_SLASH_STRING)
{
retval += SLASH_STRING;
retval += VISIT_SLASH_STRING;
}
if (retval.length() == 0)
......
......@@ -528,7 +528,7 @@ ViewerConfigManager::ImportEntireState(const std::string &filename,
if(inVisItDir)
{
file2 = GetUserVisItDirectory() + std::string(SLASH_STRING) +
file2 = GetUserVisItDirectory() + std::string(VISIT_SLASH_STRING) +
filename;
}
......
......@@ -1677,19 +1677,19 @@ ViewerWindowManager::SaveWindow(int windowIndex)
"to be saved."));
}
if(fileBase[fileBase.size() - 1] == SLASH_CHAR)
if(fileBase[fileBase.size() - 1] == VISIT_SLASH_CHAR)
{
if(f[0] == SLASH_CHAR)
if(f[0] == VISIT_SLASH_CHAR)
fileBase = fileBase.substr(0,fileBase.size()-1) + f;
else
fileBase += f;
}
else
{
if(f[0] == SLASH_CHAR)
if(f[0] == VISIT_SLASH_CHAR)
fileBase += f;
else
fileBase = fileBase + std::string(SLASH_STRING) + f;
fileBase = fileBase + std::string(VISIT_SLASH_STRING) + f;
}
}
else
......@@ -1721,7 +1721,7 @@ ViewerWindowManager::SaveWindow(int windowIndex)
const char *tmp = fname, *last = NULL;
while (tmp != NULL)
{
tmp = strstr(tmp, SLASH_STRING);
tmp = strstr(tmp, VISIT_SLASH_STRING);
if (tmp != NULL)
{
last = tmp;
......@@ -1754,10 +1754,10 @@ ViewerWindowManager::SaveWindow(int windowIndex)
char right_prefix[1024];
if (has_dir_prefix)
{
sprintf(left_prefix, "%s%cleft_%s", dir_prefix, SLASH_CHAR,
sprintf(left_prefix, "%s%cleft_%s", dir_prefix, VISIT_SLASH_CHAR,
stem);
sprintf(right_prefix, "%s%cright_%s", dir_prefix,
SLASH_CHAR, stem);
VISIT_SLASH_CHAR, stem);
}
else
{
......@@ -1817,17 +1817,17 @@ ViewerWindowManager::SaveWindow(int windowIndex)
// if w or h are greated than the max window size,
// reduce them proportionally
if (w >= h && w > OSMESA_SIZE_LIMIT)
if (w >= h && w > VISIT_RENDERING_SIZE_LIMIT)
{
h = (int)((double)h * (double)OSMESA_SIZE_LIMIT / (double)w);
w = OSMESA_SIZE_LIMIT;
h = (int)((double)h * (double)VISIT_RENDERING_SIZE_LIMIT / (double)w);
w = VISIT_RENDERING_SIZE_LIMIT;
Message(tr("The window was too large to save at the requested resolution. "
"The resolution has been automatically reduced."));
}
else if (h >= w && h > OSMESA_SIZE_LIMIT)
else if (h >= w && h > VISIT_RENDERING_SIZE_LIMIT)
{
w = (int)((double)w * (double)OSMESA_SIZE_LIMIT / (double)h);
h = OSMESA_SIZE_LIMIT;
w = (int)((double)w * (double)VISIT_RENDERING_SIZE_LIMIT / (double)h);
h = VISIT_RENDERING_SIZE_LIMIT;
Message(tr("The window was too large to save at the requested resolution. "
"The resolution has been automatically reduced."));
}
......
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