Commit 5f170abe authored by whitlocb's avatar whitlocb

Change plugin entry point function in plugin info to a macro that lets us...

Change plugin entry point function in plugin info to a macro that lets us change plugin characteristics more easily and not have to change plugin info in hundreds of files. Fix Qwt location for static builds on Mac.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28871 18c085ea-50e0-402c-830e-de6fd14e8384
parent eb2e0fd2
......@@ -46,8 +46,13 @@ IF (WIN32)
SET_UP_THIRD_PARTY(QWT lib include qwt)
SET(QWT_LIBRARY ${QWT_LIB})
ELSEIF (APPLE)
SET_UP_THIRD_PARTY(QWT lib lib/qwt.framework/Headers qwt)
SET(QWT_LIBRARY ${QWT_LIBRARY_DIR}/${QWT_LIB}/qwt)
IF(VISIT_STATIC)
SET_UP_THIRD_PARTY(QWT lib include qwt)
SET(QWT_LIBRARY ${QWT_LIB})
ELSE(VISIT_STATIC)
SET_UP_THIRD_PARTY(QWT lib lib/qwt.framework/Headers qwt)
SET(QWT_LIBRARY ${QWT_LIBRARY_DIR}/${QWT_LIB}/qwt)
ENDIF(VISIT_STATIC)
ELSE (WIN32)
SET_UP_THIRD_PARTY(QWT lib include qwt)
SET(QWT_LIBRARY ${QWT_LIB})
......
......@@ -43,6 +43,7 @@
#ifndef DATABASE_PLUGIN_INFO_H
#define DATABASE_PLUGIN_INFO_H
#include <plugin_exports.h>
#include <plugin_entry_point.h>
#include <stdio.h>
#include <string>
......
......@@ -47,7 +47,6 @@
#include <InvalidPluginException.h>
#include <Utility.h>
#include <visitstream.h>
#include <visit-config.h>
#include <string>
#include <vector>
......@@ -266,9 +265,11 @@ DatabasePluginManager::GetCommonPluginInfo(const string &id)
bool
DatabasePluginManager::LoadGeneralPluginInfo()
{
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
// Get the GeneralPluginInfo creator
GeneralDatabasePluginInfo *(*getInfo)(void) =
(GeneralDatabasePluginInfo*(*)(void))PluginSymbol("GetGeneralInfo");
GeneralDatabasePluginInfo *(*getInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(GeneralDatabasePluginInfo*(*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetGeneralInfo");
if (!getInfo)
{
EXCEPTION3(InvalidPluginException, "Error retrieving info creator",
......@@ -276,7 +277,7 @@ DatabasePluginManager::LoadGeneralPluginInfo()
}
// Get the general plugin info
GeneralDatabasePluginInfo *info = (*getInfo)();
GeneralDatabasePluginInfo *info = (*getInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL);
if (!info)
{
EXCEPTION2(InvalidPluginException, "Error creating general info",
......@@ -320,8 +321,10 @@ DatabasePluginManager::LoadGeneralPluginInfo()
void
DatabasePluginManager::LoadEnginePluginInfo()
{
EngineDatabasePluginInfo *(*getEngineInfo)(void) =
(EngineDatabasePluginInfo* (*)(void))PluginSymbol("GetEngineInfo");
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
EngineDatabasePluginInfo *(*getEngineInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(EngineDatabasePluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetEngineInfo");
if (!getEngineInfo)
{
......@@ -330,8 +333,8 @@ DatabasePluginManager::LoadEnginePluginInfo()
openPlugin.c_str());
}
enginePluginInfo.push_back((*getEngineInfo)());
commonPluginInfo.push_back((*getEngineInfo)());
enginePluginInfo.push_back((*getEngineInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
commonPluginInfo.push_back((*getEngineInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
}
// ****************************************************************************
......@@ -350,8 +353,10 @@ DatabasePluginManager::LoadEnginePluginInfo()
void
DatabasePluginManager::LoadMDServerPluginInfo()
{
MDServerDatabasePluginInfo *(*getMDServerInfo)(void) =
(MDServerDatabasePluginInfo* (*)(void))PluginSymbol("GetMDServerInfo");
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
MDServerDatabasePluginInfo *(*getMDServerInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(MDServerDatabasePluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetMDServerInfo");
if (!getMDServerInfo)
{
......@@ -360,8 +365,8 @@ DatabasePluginManager::LoadMDServerPluginInfo()
openPlugin.c_str());
}
mdserverPluginInfo.push_back((*getMDServerInfo)());
commonPluginInfo.push_back((*getMDServerInfo)());
mdserverPluginInfo.push_back((*getMDServerInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
commonPluginInfo.push_back((*getMDServerInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
}
// ****************************************************************************
......
......@@ -44,6 +44,7 @@
#define OPERATOR_PLUGIN_INFO_H
#include <plugin_exports.h>
#include <plugin_vartypes.h>
#include <plugin_entry_point.h>
#include <stdio.h>
// Forward declarations.
......
......@@ -331,9 +331,11 @@ OperatorPluginManager::BroadcastGeneralInfo(PluginBroadcaster *broadcaster)
bool
OperatorPluginManager::LoadGeneralPluginInfo()
{
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
// Get the GeneralPluginInfo creator
GeneralOperatorPluginInfo *(*getInfo)(void) =
(GeneralOperatorPluginInfo*(*)(void))PluginSymbol("GetGeneralInfo");
GeneralOperatorPluginInfo *(*getInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(GeneralOperatorPluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetGeneralInfo");
if (!getInfo)
{
EXCEPTION3(InvalidPluginException, "Error retrieving info creator",
......@@ -341,7 +343,7 @@ OperatorPluginManager::LoadGeneralPluginInfo()
}
// Get the general plugin info
GeneralOperatorPluginInfo *info = (*getInfo)();
GeneralOperatorPluginInfo *info = (*getInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL);
if (!info)
{
EXCEPTION2(InvalidPluginException, "Error creating general info",
......@@ -382,8 +384,10 @@ OperatorPluginManager::LoadGeneralPluginInfo()
void
OperatorPluginManager::LoadGUIPluginInfo()
{
GUIOperatorPluginInfo *(*getGUIInfo)(void) =
(GUIOperatorPluginInfo* (*)(void))PluginSymbol("GetGUIInfo");
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
GUIOperatorPluginInfo *(*getGUIInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(GUIOperatorPluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetGUIInfo");
if (!getGUIInfo)
{
......@@ -392,8 +396,8 @@ OperatorPluginManager::LoadGUIPluginInfo()
openPlugin.c_str());
}
guiPluginInfo.push_back((*getGUIInfo)());
commonPluginInfo.push_back((*getGUIInfo)());
guiPluginInfo.push_back((*getGUIInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
commonPluginInfo.push_back((*getGUIInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
}
// ****************************************************************************
......@@ -412,8 +416,10 @@ OperatorPluginManager::LoadGUIPluginInfo()
void
OperatorPluginManager::LoadViewerPluginInfo()
{
ViewerOperatorPluginInfo *(*getViewerInfo)(void) =
(ViewerOperatorPluginInfo* (*)(void))PluginSymbol("GetViewerInfo");
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
ViewerOperatorPluginInfo *(*getViewerInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(ViewerOperatorPluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetViewerInfo");
if (!getViewerInfo)
{
......@@ -422,8 +428,8 @@ OperatorPluginManager::LoadViewerPluginInfo()
openPlugin.c_str());
}
viewerPluginInfo.push_back((*getViewerInfo)());
commonPluginInfo.push_back((*getViewerInfo)());
viewerPluginInfo.push_back((*getViewerInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
commonPluginInfo.push_back((*getViewerInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
}
// ****************************************************************************
......@@ -442,8 +448,10 @@ OperatorPluginManager::LoadViewerPluginInfo()
void
OperatorPluginManager::LoadEnginePluginInfo()
{
EngineOperatorPluginInfo *(*getEngineInfo)(void) =
(EngineOperatorPluginInfo* (*)(void))PluginSymbol("GetEngineInfo");
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
EngineOperatorPluginInfo *(*getEngineInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(EngineOperatorPluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetEngineInfo");
if (!getEngineInfo)
{
......@@ -452,8 +460,8 @@ OperatorPluginManager::LoadEnginePluginInfo()
openPlugin.c_str());
}
enginePluginInfo.push_back((*getEngineInfo)());
commonPluginInfo.push_back((*getEngineInfo)());
enginePluginInfo.push_back((*getEngineInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
commonPluginInfo.push_back((*getEngineInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
}
// ****************************************************************************
......@@ -472,8 +480,10 @@ OperatorPluginManager::LoadEnginePluginInfo()
void
OperatorPluginManager::LoadScriptingPluginInfo()
{
ScriptingOperatorPluginInfo *(*getScriptingInfo)(void) =
(ScriptingOperatorPluginInfo* (*)(void))PluginSymbol("GetScriptingInfo");
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
ScriptingOperatorPluginInfo *(*getScriptingInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(ScriptingOperatorPluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetScriptingInfo");
if (!getScriptingInfo)
{
......@@ -482,8 +492,8 @@ OperatorPluginManager::LoadScriptingPluginInfo()
openPlugin.c_str());
}
scriptingPluginInfo.push_back((*getScriptingInfo)());
commonPluginInfo.push_back((*getScriptingInfo)());
scriptingPluginInfo.push_back((*getScriptingInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
commonPluginInfo.push_back((*getScriptingInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
}
// ****************************************************************************
......
......@@ -44,6 +44,7 @@
#define PLOT_PLUGIN_INFO_H
#include <plugin_exports.h>
#include <plugin_vartypes.h>
#include <plugin_entry_point.h>
#include <stdio.h>
#include <string>
......
......@@ -272,9 +272,11 @@ PlotPluginManager::GetScriptingPluginInfo(const string &id)
bool
PlotPluginManager::LoadGeneralPluginInfo()
{
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
// Get the GeneralPluginInfo creator
GeneralPlotPluginInfo *(*getInfo)(void) =
(GeneralPlotPluginInfo*(*)(void))PluginSymbol("GetGeneralInfo");
GeneralPlotPluginInfo *(*getInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(GeneralPlotPluginInfo*(*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetGeneralInfo");
if (!getInfo)
{
EXCEPTION3(InvalidPluginException, "Error retrieving info creator",
......@@ -282,7 +284,7 @@ PlotPluginManager::LoadGeneralPluginInfo()
}
// Get the general plugin info
GeneralPlotPluginInfo *info = (*getInfo)();
GeneralPlotPluginInfo *info = (*getInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL);
if (!info)
{
EXCEPTION2(InvalidPluginException, "Error creating general info",
......@@ -322,8 +324,10 @@ PlotPluginManager::LoadGeneralPluginInfo()
void
PlotPluginManager::LoadGUIPluginInfo()
{
GUIPlotPluginInfo *(*getGUIInfo)(void) =
(GUIPlotPluginInfo* (*)(void))PluginSymbol("GetGUIInfo");
VISIT_PLUGIN_ENTRY_ARGS_DECLARE
GUIPlotPluginInfo *(*getGUIInfo)(VISIT_PLUGIN_ENTRY_ARGS) =
(GUIPlotPluginInfo* (*)(VISIT_PLUGIN_ENTRY_ARGS))PluginSymbol("GetGUIInfo");
if (!getGUIInfo)
{
......@@ -332,8 +336,8 @@ PlotPluginManager::LoadGUIPluginInfo()
openPlugin.c_str());
}
guiPluginInfo.push_back((*getGUIInfo)());
commonPluginInfo.push_back((*getGUIInfo)());
guiPluginInfo.push_back((*getGUIInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
commonPluginInfo.push_back((*getGUIInfo)(VISIT_PLUGIN_ENTRY_ARGS_CALL));
}
// ****************************************************************************
......@@ -352,8 +356,10 @@ PlotPluginManager::LoadGUIPluginInfo()
void
PlotPluginManager::LoadViewerPluginInfo()
{