SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Compare commits

base: SHS:3c543e79f051f9177182fd79a5af456e925c573a
Branches Tags
SHS:master SHS:pico_sdk SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old
...
compare: SHS:ec96adee3f4e6f30eb66b1faafd724aec6daa166
Branches Tags
SHS:master SHS:pico_sdk SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old

2 Commits
3c543e79f0 ... ec96adee3f

Author SHA1 Message Date
andrey
ec96adee3f Merge branch 'master' of https://git.shs.tools/SHS/pip 2020-12-23 16:52:35 +03:00
andrey
587d90f269 fix plugin path in picout 2020-12-23 16:52:27 +03:00
1 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

8
libs/main/system/piplugin.cpp
View File

@@ -255,7 +255,7 @@ bool PIPluginLoader::load(const PIString & name) {
if (!lib.load(findLibrary(name))) { if (!lib.load(findLibrary(name))) {
unload(); unload();
error = LibraryLoadError; error = LibraryLoadError;
error_str = "Load plugin \"" + name + "\" error: can`t load lib: " + lib.lastError(); error_str = "Load plugin \"" + lib.path() + "\" error: can`t load lib: " + lib.lastError();
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
} }
@@ -264,14 +264,14 @@ bool PIPluginLoader::load(const PIString & name) {
if (!func_loader_version) { if (!func_loader_version) {
unload(); unload();
error = MissingSymbols; error = MissingSymbols;
error_str = "Load plugin \"" + name + "\" error: can`t find " + STR(__PIP_PLUGIN_LOADER_VERSION_FUNC__); error_str = "Load plugin \"" + lib.path() + "\" error: can`t find " + STR(__PIP_PLUGIN_LOADER_VERSION_FUNC__);
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
} }
if (__PIP_PLUGIN_LOADER_VERSION__ != func_loader_version()) { if (__PIP_PLUGIN_LOADER_VERSION__ != func_loader_version()) {
unload(); unload();
error = InvalidLoaderVersion; error = InvalidLoaderVersion;
error_str = "Load plugin \"" + name + "\" error: invalid loader version: application = " + PIString::fromNumber(func_loader_version()) error_str = "Load plugin \"" + lib.path() + "\" error: invalid loader version: application = " + PIString::fromNumber(func_loader_version())
+ ", plugin = " + PIString::fromNumber(__PIP_PLUGIN_LOADER_VERSION__); + ", plugin = " + PIString::fromNumber(__PIP_PLUGIN_LOADER_VERSION__);
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
@@ -281,7 +281,7 @@ bool PIPluginLoader::load(const PIString & name) {
if (pversion != lversion) { if (pversion != lversion) {
unload(); unload();
error = InvalidUserVersion; error = InvalidUserVersion;
error_str = "Load plugin \"" + name + "\" error: invalid user version: application = " + lversion + ", plugin = " + pversion; error_str = "Load plugin \"" + lib.path() + "\" error: invalid user version: application = " + lversion + ", plugin = " + pversion;
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
} }