#endif
std::map<std::string, Config_ModuleReader::PluginType> Config_ModuleReader::myPluginTypes;
+std::set<std::string> Config_ModuleReader::myDependencyModules;
Config_ModuleReader::Config_ModuleReader(const char* theEventGenerated)
: Config_XMLReader(PLUGIN_FILE),
myEventGenerated(theEventGenerated)
{
- myHaveSalome = false;
- char* anEnv = getenv("SALOME_ROOT_DIR");
- std::string value = normalize(anEnv);
- if (!value.empty()) {
- myHaveSalome = true;
- }
-
}
Config_ModuleReader::~Config_ModuleReader()
return myFeaturesInFiles;
}
-/*
+/*!
* Get module name from plugins.xml
* (property "module")
*/
return getProperty(aRoot, PLUGINS_MODULE);
}
-/*
- *
- */
void Config_ModuleReader::processNode(xmlNodePtr theNode)
{
if (isNode(theNode, NODE_PLUGIN, NULL)) {
- bool isAvailable = isAvaliableOnThisPlatform(getProperty(theNode, PLUGIN_PLATFORM));
- if (!isAvailable)
+ if (!hasRequiredModules(theNode))
return;
std::string aPluginConf = getProperty(theNode, PLUGIN_CONFIG);
std::string aPluginLibrary = getProperty(theNode, PLUGIN_LIBRARY);
return isNode(theNode, NODE_PLUGINS, NULL);
}
+bool Config_ModuleReader::hasRequiredModules(xmlNodePtr theNode) const
+{
+ std::string aRequiredModule = normalize(getProperty(theNode, PLUGIN_DEPENDENCY));
+ if(aRequiredModule.empty())
+ return true;
+ std::set<std::string>::iterator it = myDependencyModules.begin();
+ for ( ; it != myDependencyModules.end(); it++ ) {
+ if (*it == aRequiredModule) return true;
+ }
+ return false;
+}
+
std::list<std::string> Config_ModuleReader::importPlugin(const std::string& thePluginLibrary,
const std::string& thePluginXmlConf)
{
if(!aPluginName.empty()) {
myPluginTypes[aPluginName] = aType;
}
-
+ addDependencyModule(aPluginName);
return aPluginName;
}
-void Config_ModuleReader::loadPlugin(const std::string thePluginName)
+void Config_ModuleReader::loadPlugin(const std::string& thePluginName)
{
PluginType aType = Config_ModuleReader::Binary;
if(myPluginTypes.find(thePluginName) != myPluginTypes.end()) {
}
}
-bool Config_ModuleReader::isAvaliableOnThisPlatform(const std::string& thePluginPlatform)
-{
- bool result = true;
- PluginPlatform aPlatform = All;
- std::string aPlatformName = normalize(thePluginPlatform) ;
- if (aPlatformName == PLUGIN_PLATFORM_SALOME) {
- aPlatform = Salome;
- } else if (aPlatformName == PLUGIN_PLATFORM_NEWGEOM) {
- aPlatform = OpenParts;
- } else if (!thePluginPlatform.empty()) {
- Events_Error::send("Unknown platform: " + thePluginPlatform);
- }
- if (aPlatform == All) {
- result = true;
- } else if (myHaveSalome) {
- result = aPlatform == Salome;
- } else {
- result = aPlatform == OpenParts;
- }
- return result;
-
-}
-
-void Config_ModuleReader::loadScript(const std::string theFileName)
+void Config_ModuleReader::loadScript(const std::string& theFileName)
{
/* aquire python thread */
PyGILState_STATE gstate = PyGILState_Ensure();
- PyObject* module = PyImport_ImportModule(theFileName.c_str());
+ PyObject* module = PyImport_ImportModule(theFileName.c_str());
if (!module) {
std::string anErrorMsg = "An error occured while importing " + theFileName;
//Get detailed error message:
if (PyErr_Occurred()) {
- PyObject *ptype, *pvalue, *ptraceback;
+ PyObject *pstr, *ptype, *pvalue, *ptraceback;
PyErr_Fetch(&ptype, &pvalue, &ptraceback);
- std::string aPyError = std::string(PyString_AsString(pvalue));
+ PyErr_NormalizeException(&ptype, &pvalue, &ptraceback);
+ pstr = PyObject_Str(pvalue);
+ std::string aPyError = std::string(PyString_AsString(pstr));
if (!aPyError.empty()) {
anErrorMsg += ":\n" + aPyError;
}
+ Py_XDECREF(pstr);
Py_XDECREF(ptype);
Py_XDECREF(pvalue);
Py_XDECREF(ptraceback);
PyGILState_Release(gstate);
}
-void Config_ModuleReader::loadLibrary(const std::string theLibName)
+void Config_ModuleReader::loadLibrary(const std::string& theLibName)
{
std::string aFileName = library(theLibName);
if (aFileName.empty())
return;
-#ifdef WIN32
+ #ifdef WIN32
HINSTANCE aModLib = ::LoadLibrary(aFileName.c_str());
-#else
+ #else
void* aModLib = dlopen( aFileName.c_str(), RTLD_LAZY | RTLD_GLOBAL );
-#endif
+ #endif
if(!aModLib && theLibName != "DFBrowser") { // don't show error for internal debugging tool
std::string anErrorMsg = "Failed to load " + aFileName;
- #ifndef WIN32
+ #ifdef WIN32
+ DWORD dwLastError = ::GetLastError();
+ LPSTR messageBuffer = NULL;
+ size_t size = ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ dwLastError,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPSTR)&messageBuffer, 0, NULL);
+ anErrorMsg += ": " + std::string(messageBuffer, size);
+ #else
anErrorMsg += ": " + std::string(dlerror());
#endif
+ std::cerr << anErrorMsg << std::endl;
Events_Error::send(anErrorMsg);
}
}
+void Config_ModuleReader::addDependencyModule(const std::string& theModuleName)
+{
+ myDependencyModules.insert(normalize(theModuleName));
+}
+