projects / packages / domoticz.git / blame
| Commit | Line | Data |
|---|---|---|
| 109876d2 JP |
1 | --- domoticz-2021.1/hardware/plugins/DelayedLink.h.orig 2021-04-17 17:50:55.000000000 +0200 |
| 2 | +++ domoticz-2021.1/hardware/plugins/DelayedLink.h 2021-04-20 12:36:46.238826640 +0200 | |
| 4b7cd6b2 | 3 | @@ -155,25 +155,9 @@ |
| fbf2e314 JP |
4 | shared_lib_ = nullptr; |
| 5 | if (!shared_lib_) { | |
| 6 | #ifdef WIN32 | |
| 4b7cd6b2 | 7 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python312.dll"); |
| 4ff80f89 | 8 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python311.dll"); |
| fbf2e314 | 9 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python310.dll"); |
| 9a71e0cb | 10 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python39.dll"); |
| 86ad2462 | 11 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll"); |
| 9dda6696 AM |
12 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll"); |
| 13 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll"); | |
| 14 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll"); | |
| 15 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll"); | |
| 86ad2462 | 16 | + if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll"); |
| 9dda6696 | 17 | #else |
| 4b7cd6b2 | 18 | - if (!shared_lib_) FindLibrary("python3.12", true); |
| 4ff80f89 | 19 | - if (!shared_lib_) FindLibrary("python3.11", true); |
| fbf2e314 | 20 | - if (!shared_lib_) FindLibrary("python3.10", true); |
| 9a71e0cb | 21 | - if (!shared_lib_) FindLibrary("python3.9", true); |
| 86ad2462 | 22 | - if (!shared_lib_) FindLibrary("python3.8", true); |
| 9dda6696 AM |
23 | - if (!shared_lib_) FindLibrary("python3.7", true); |
| 24 | - if (!shared_lib_) FindLibrary("python3.6", true); | |
| 25 | - if (!shared_lib_) FindLibrary("python3.5", true); | |
| 26 | - if (!shared_lib_) FindLibrary("python3.4", true); | |
| 109876d2 | 27 | + if (!shared_lib_) FindLibrary(PYTHON_LIBDIR, false); |
| 10f7a92e | 28 | #ifdef __FreeBSD__ |
| 4b7cd6b2 JP |
29 | if (!shared_lib_) FindLibrary("python3.12m", true); |
| 30 | if (!shared_lib_) FindLibrary("python3.11m", true); | |
| 109876d2 JP |
31 | @@ -355,34 +327,20 @@ |
| 32 | else | |
| 33 | { | |
| 34 | std::vector<std::string> entries; | |
| 35 | - DirectoryListing(entries, sLibrary, true, false); | |
| 36 | - for (const auto &entry : entries) | |
| 9dda6696 | 37 | - { |
| 109876d2 JP |
38 | - if (shared_lib_) |
| 39 | - { | |
| 40 | - break; | |
| 41 | - } | |
| 42 | - | |
| 43 | - library = sLibrary + entry + "/"; | |
| 9dda6696 AM |
44 | - FindLibrary(library, false); |
| 45 | - } | |
| 109876d2 JP |
46 | - |
| 47 | - entries.clear(); | |
| 48 | DirectoryListing(entries, sLibrary, false, true); | |
| 49 | for (const auto &filename : entries) | |
| 9dda6696 | 50 | { |
| 109876d2 JP |
51 | - if (shared_lib_) |
| 52 | - { | |
| 53 | - break; | |
| 54 | - } | |
| 9dda6696 | 55 | |
| 109876d2 JP |
56 | if (filename.length() > 12 && |
| 57 | filename.compare(0, 11, "libpython3.") == 0 && | |
| 58 | - filename.compare(filename.length() - 3, 3, ".so") == 0 && | |
| 59 | - filename.compare(filename.length() - 6, 6, ".dylib") == 0) | |
| 60 | + filename.find(".so", 10) != std::string::npos) | |
| 61 | { | |
| 62 | - library = sLibrary + filename; | |
| 63 | + library = sLibrary + "/" + filename; | |
| 64 | shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); | |
| 65 | + if (shared_lib_) | |
| 66 | + { | |
| 67 | + break; | |
| 68 | + } | |
| 69 | } | |
| 9dda6696 | 70 | } |
| 109876d2 | 71 | } |