diff options
| author | dartraiden <wowemuh@gmail.com> | 2019-03-28 21:00:13 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-28 21:05:25 +0300 |
| commit | 1e5a5016167cbfe8e5013bbbc33f4c8f952c2af7 (patch) | |
| tree | 26a9c19330a9a2d7717a726c58132bfc1ce8adb9 /tools | |
| parent | 2fdb1c30fd1136886eab6a570ea1f339a7bfc95b (diff) | |
replace libaxolotl by libsignal
(cherry picked from commit 219d1e3fb1c29a0b14b32801baab0abcaae5e7dd)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/installer_ng/MirandaNG.iss | 2 | ||||
| -rw-r--r-- | tools/installer_ng_stable/MirandaNG.iss | 2 | ||||
| -rw-r--r-- | tools/lpgen/lpgen.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index a8715c14fc..48d4fa56e5 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -109,7 +109,7 @@ Source: "Files\Plugins\GG.dll"; DestDir: "{app}\Plugins"; Components: protocols\ Source: "Files\Plugins\ICQ.dll"; DestDir: "{app}\Plugins"; Components: protocols\icq; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\IRC.dll"; DestDir: "{app}\Plugins"; Components: protocols\irc; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\Jabber.dll"; DestDir: "{app}\Plugins"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\Libs\libaxolotl.mir"; DestDir: "{app}\Libs"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent()
+Source: "Files\Libs\libsignal.mir"; DestDir: "{app}\Libs"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\MSN.dll"; DestDir: "{app}\Plugins"; Components: protocols\msn; Flags: ignoreversion; AfterInstall: ShowPercent()
; Clists
diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss index 05e913e5ef..1cd03f0fff 100644 --- a/tools/installer_ng_stable/MirandaNG.iss +++ b/tools/installer_ng_stable/MirandaNG.iss @@ -109,7 +109,7 @@ Source: "Files\Plugins\GG.dll"; DestDir: "{app}\Plugins"; Components: protocols\ Source: "Files\Plugins\ICQ.dll"; DestDir: "{app}\Plugins"; Components: protocols\icq; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\IRC.dll"; DestDir: "{app}\Plugins"; Components: protocols\irc; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\Jabber.dll"; DestDir: "{app}\Plugins"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\Libs\libaxolotl.mir"; DestDir: "{app}\Libs"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent()
+Source: "Files\Libs\libsignal.mir"; DestDir: "{app}\Libs"; Components: protocols\jabber; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\MSN.dll"; DestDir: "{app}\Plugins"; Components: protocols\msn; Flags: ignoreversion; AfterInstall: ShowPercent()
; Clists
diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js index 208e1ab5e8..a86d82b2d2 100644 --- a/tools/lpgen/lpgen.js +++ b/tools/lpgen/lpgen.js @@ -121,7 +121,7 @@ while (!sln_stream.AtEndOfStream) { // if exist sln_project_regexp, add to array, adding leading path to "trunk"
if (sln_project_regexp) {
//RegExp for unneeded modules, such as crypting library, zlib.dll etc.
- var unneeded_modules = /(libjson|Zlib|EkHtml|Libgcrypt|libotr|Cryptlib|pu_stub|libcurl|glib|Pcre16|liblua|winapi|json|libaxolotl|hunspell|ffi|m_popup|m_variables|libsodium|libtox|pthreads|sqlite3)/i;
+ var unneeded_modules = /(libjson|Zlib|EkHtml|Libgcrypt|libotr|Cryptlib|pu_stub|libcurl|glib|Pcre16|liblua|winapi|json|libsignal|hunspell|ffi|m_popup|m_variables|libsodium|libtox|pthreads|sqlite3)/i;
// Now check for unneeded modules NOT passed (module name are in sln_project_regexp[1]
if (!unneeded_modules.test(sln_project_regexp[1])) {
//no, this is not unneeded module, put path to array. Trunk path + path to file in sln_project_regexp[2]
|