replace libaxolotl by libsignal

(cherry picked from commit 219d1e3fb1c29a0b14b32801baab0abcaae5e7dd)

7 files changed, 18 insertions, 18 deletions

diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln
index ce0ac82939..afc70869fe 100644
--- a/bin15/miranda32.sln
+++ b/bin15/miranda32.sln
@@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\m
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "..\libs\libjson\libjson.vcxproj", "{F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\libs\zlib\zlib.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}"
@@ -151,6 +149,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\ICQ-WIM
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StdPopup", "..\src\core\stdpopup\stdpopup.vcxproj", "{713067DF-65EE-480B-A000-B2A323495F16}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -191,14 +191,6 @@ Global
 		{F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|Win32.Build.0 = Release|Win32
 		{F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|x64.ActiveCfg = Release|x64
 		{F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|x64.Build.0 = Release|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.Build.0 = Debug|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.ActiveCfg = Debug|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.Build.0 = Debug|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.ActiveCfg = Release|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.Build.0 = Release|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.ActiveCfg = Release|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.Build.0 = Release|x64
 		{7711F563-6473-4ABD-B5E3-477CE8384AD6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7711F563-6473-4ABD-B5E3-477CE8384AD6}.Debug|Win32.Build.0 = Debug|Win32
 		{7711F563-6473-4ABD-B5E3-477CE8384AD6}.Debug|x64.ActiveCfg = Debug|x64
@@ -567,6 +559,14 @@ Global
 		{713067DF-65EE-480B-A000-B2A323495F16}.Release|Win32.Build.0 = Release|Win32
 		{713067DF-65EE-480B-A000-B2A323495F16}.Release|x64.ActiveCfg = Release|x64
 		{713067DF-65EE-480B-A000-B2A323495F16}.Release|x64.Build.0 = Release|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.Build.0 = Debug|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.ActiveCfg = Debug|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.Build.0 = Debug|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.ActiveCfg = Release|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.Build.0 = Release|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.ActiveCfg = Release|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -575,7 +575,6 @@ Global
 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
 		{538E451F-E667-4D07-BCE6-976ECC7BB8D1} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
 		{F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
-		{620E0BE7-3763-4F35-9DBD-4770104E269C} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
 		{7711F563-6473-4ABD-B5E3-477CE8384AD6} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
 		{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
 		{9299B507-1AF9-4C93-9560-5F637D1E0C9E} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
@@ -622,6 +621,7 @@ Global
 		{E98A8615-1082-1979-D6D8-F763F13BFCBD} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{EFB2355B-82B3-4759-B7D8-95F8E9506291} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
 		{713067DF-65EE-480B-A000-B2A323495F16} = {E7FB43FB-3563-4568-8846-A88FC37449BF}
+		{620E0BE7-3763-4F35-9DBD-4770104E269C} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A4CD630-DD83-4096-AA4D-7A141E43E853}
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 006a77b2e4..5a6ea0962b 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(zlib)
 add_subdirectory(libjson)
-add_subdirectory(libaxolotl)
+add_subdirectory(libsignal)
 add_subdirectory(freeimage)
\ No newline at end of file
diff --git a/libs/libsignal/CMakeLists.txt b/libs/libsignal/CMakeLists.txt
index 2019f621a3..31ab27ce56 100644
--- a/libs/libsignal/CMakeLists.txt
+++ b/libs/libsignal/CMakeLists.txt
@@ -9,5 +9,5 @@ file(GLOB SOURCES "src/*.h" "src/*.c"
 include_directories("src" "src/protobuf-c" "src/curve25519" "src/curve25519/ed25519"
 "src/curve25519/ed25519/nacl_includes" "src/curve25519/ed25519/additions"
 "src/curve25519/ed25519/additions/generalized/*.h")
-set(TARGET libaxolotl)
+set(TARGET libsignal)
 include(${CMAKE_SOURCE_DIR}/cmake/lib.cmake)
\ No newline at end of file
diff --git a/protocols/JabberG/CMakeLists.txt b/protocols/JabberG/CMakeLists.txt
index 87ef6d2d81..520f38cfb5 100644
--- a/protocols/JabberG/CMakeLists.txt
+++ b/protocols/JabberG/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc")
 set(TARGET Jabber)
-include_directories(${CMAKE_SOURCE_DIR}/libs/libaxolotl/src)
+include_directories(${CMAKE_SOURCE_DIR}/libs/libsignal/src)
 include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake)
-target_link_libraries(${TARGET} Zlib FreeImage libaxolotl ${OPENSSL_LIBRARIES} comctl32.lib UxTheme.lib ws2_32.lib)
+target_link_libraries(${TARGET} Zlib FreeImage libsignal ${OPENSSL_LIBRARIES} comctl32.lib UxTheme.lib ws2_32.lib)
 add_subdirectory(jabber_xstatus)
 add_subdirectory(proto_jabber)
\ No newline at end of file
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]