diff options
| author | George Hazan <ghazan@miranda.im> | 2021-03-23 22:09:14 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-03-23 22:09:14 +0300 |
| commit | b63efb1fbceb4127c164377015889a979330a437 (patch) | |
| tree | b15fcca8b75021e3c6cb1e9fb519fff28cd37502 | |
| parent | 42143e9cf3719630ab370e9369764cdaac892821 (diff) | |
also for #2771 - removal of all MDBX utilities and libmdbx.mir itself
49 files changed, 16 insertions, 1969 deletions
diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln index b2b9bf481f..70299c6dfb 100644 --- a/bin15/mir_full.sln +++ b/bin15/mir_full.sln @@ -429,12 +429,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notifications", "Notificati EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProxySwitch", "..\plugins\ProxySwitch\ProxySwitch.vcxproj", "{7446276D-5845-4258-A245-83D1D4D3CEC3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\ICQ-WIM\ICQ-WIM.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}" @@ -447,8 +441,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewStory", "..\plugins\NewStory\NewStory.vcxproj", "{A7FAD273-8C71-4D72-A84F-2D160F2DC589}" @@ -1949,30 +1941,6 @@ Global {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|Win32.Build.0 = Release|Win32 {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|x64.ActiveCfg = Release|x64 {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|x64.Build.0 = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.ActiveCfg = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.Build.0 = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.ActiveCfg = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.Build.0 = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.ActiveCfg = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.Build.0 = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.ActiveCfg = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.Build.0 = Release|x64 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.ActiveCfg = Debug|Win32 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.Build.0 = Debug|Win32 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.ActiveCfg = Debug|x64 @@ -2021,14 +1989,6 @@ Global {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 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.ActiveCfg = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.Build.0 = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|x64.ActiveCfg = Debug|x64 @@ -2174,15 +2134,11 @@ Global {AD0D0500-CE7D-417D-9C36-3620D56CA6D4} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {7DC23E4E-2448-4811-AABD-F5D069F6E74A} = {F9C41695-3353-4564-A154-58106829B19C} - {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} - {EE383404-7976-4E87-BD13-A9B7B47C0C10} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} - {63BA600E-86BF-4502-9EF0-8C090292E161} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {B3494FED-FB8C-43F4-B341-F26A3460203B} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {EFB2355B-82B3-4759-B7D8-95F8E9506291} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {B3BC3949-6949-41DE-94BF-B112FBFB1A84} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {713067DF-65EE-480B-A000-B2A323495F16} = {E7FB43FB-3563-4568-8846-A88FC37449BF} {620E0BE7-3763-4F35-9DBD-4770104E269C} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} - {EE383404-4E87-7976-BD13-A9B7B47C0C10} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {86033E58-A1E3-43AD-AE8E-305E15E72A91} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {A7FAD273-8C71-4D72-A84F-2D160F2DC589} = {D8EA3AE1-64AA-42ED-9F13-83F6C7B5AA55} {A2E9DA24-95E4-4414-94AF-488A382E276A} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln index 683665ea11..a4a0c86903 100644 --- a/bin15/miranda32.sln +++ b/bin15/miranda32.sln @@ -121,14 +121,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protocols", "Protocols", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{6221EF9E-F53A-4381-B760-4C0208E5D597}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "..\libs\sqlite3\sqlite3.vcxproj", "{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQ-WIM\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}" @@ -141,8 +135,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsig EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pcre16.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protocols\Facebook\proto_facebook\Proto_Facebook.vcxproj", "{44298314-7DD4-4EF7-B576-30E503257223}" @@ -445,14 +437,6 @@ Global {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|Win32.Build.0 = Release|Win32 {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.ActiveCfg = Release|x64 {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.Build.0 = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|Win32.ActiveCfg = Debug|Win32 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|Win32.Build.0 = Debug|Win32 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|x64.ActiveCfg = Debug|x64 @@ -461,22 +445,6 @@ Global {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|Win32.Build.0 = Release|Win32 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|x64.ActiveCfg = Release|x64 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|x64.Build.0 = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.ActiveCfg = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.Build.0 = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.ActiveCfg = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.Build.0 = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.ActiveCfg = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.Build.0 = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.ActiveCfg = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.Build.0 = Release|x64 {DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32 {DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32 {DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64 @@ -517,14 +485,6 @@ Global {6124E997-426E-4A0B-9617-D6D577D5E7D7}.Release|Win32.Build.0 = Release|Win32 {6124E997-426E-4A0B-9617-D6D577D5E7D7}.Release|x64.ActiveCfg = Release|x64 {6124E997-426E-4A0B-9617-D6D577D5E7D7}.Release|x64.Build.0 = Release|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.ActiveCfg = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.Build.0 = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|x64.ActiveCfg = Debug|x64 @@ -589,16 +549,12 @@ Global {793B6174-89B0-4682-A957-A32BE7F61502} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {52282CDE-49DF-4662-B582-CCF971A9FEC2} - {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} - {EE383404-7976-4E87-BD13-A9B7B47C0C10} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} - {63BA600E-86BF-4502-9EF0-8C090292E161} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {DB3B0449-E576-4BBB-8B08-AB9E914D39CA} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {EFB2355B-82B3-4759-B7D8-95F8E9506291} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {713067DF-65EE-480B-A000-B2A323495F16} = {85220459-761D-4E24-A381-D35A95880254} {620E0BE7-3763-4F35-9DBD-4770104E269C} = {52282CDE-49DF-4662-B582-CCF971A9FEC2} {6124E997-426E-4A0B-9617-D6D577D5E7D7} = {52282CDE-49DF-4662-B582-CCF971A9FEC2} - {EE383404-4E87-7976-BD13-A9B7B47C0C10} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {86033E58-A1E3-43AD-AE8E-305E15E72A91} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {44298314-7DD4-4EF7-B576-30E503257223} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {A2E9DA24-95E4-4414-94AF-488A382E276A} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} diff --git a/bin16/mir_full.sln b/bin16/mir_full.sln index 99108ee153..0338d314b9 100644 --- a/bin16/mir_full.sln +++ b/bin16/mir_full.sln @@ -429,12 +429,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notifications", "Notificati EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProxySwitch", "..\plugins\ProxySwitch\ProxySwitch.vcxproj", "{7446276D-5845-4258-A245-83D1D4D3CEC3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\ICQ-WIM\ICQ-WIM.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}" @@ -447,8 +441,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewStory", "..\plugins\NewStory\NewStory.vcxproj", "{A7FAD273-8C71-4D72-A84F-2D160F2DC589}" @@ -1949,30 +1941,6 @@ Global {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|Win32.Build.0 = Release|Win32 {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|x64.ActiveCfg = Release|x64 {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|x64.Build.0 = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.ActiveCfg = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.Build.0 = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.ActiveCfg = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.Build.0 = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.ActiveCfg = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.Build.0 = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.ActiveCfg = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.Build.0 = Release|x64 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.ActiveCfg = Debug|Win32 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.Build.0 = Debug|Win32 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.ActiveCfg = Debug|x64 @@ -2021,14 +1989,6 @@ Global {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 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.ActiveCfg = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.Build.0 = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|x64.ActiveCfg = Debug|x64 @@ -2174,15 +2134,11 @@ Global {AD0D0500-CE7D-417D-9C36-3620D56CA6D4} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {7DC23E4E-2448-4811-AABD-F5D069F6E74A} = {F9C41695-3353-4564-A154-58106829B19C} - {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} - {EE383404-7976-4E87-BD13-A9B7B47C0C10} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} - {63BA600E-86BF-4502-9EF0-8C090292E161} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {B3494FED-FB8C-43F4-B341-F26A3460203B} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {EFB2355B-82B3-4759-B7D8-95F8E9506291} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {B3BC3949-6949-41DE-94BF-B112FBFB1A84} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {713067DF-65EE-480B-A000-B2A323495F16} = {E7FB43FB-3563-4568-8846-A88FC37449BF} {620E0BE7-3763-4F35-9DBD-4770104E269C} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} - {EE383404-4E87-7976-BD13-A9B7B47C0C10} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {86033E58-A1E3-43AD-AE8E-305E15E72A91} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {A7FAD273-8C71-4D72-A84F-2D160F2DC589} = {D8EA3AE1-64AA-42ED-9F13-83F6C7B5AA55} {A2E9DA24-95E4-4414-94AF-488A382E276A} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} diff --git a/bin16/miranda32.sln b/bin16/miranda32.sln index af0537b4ff..3a6982b734 100644 --- a/bin16/miranda32.sln +++ b/bin16/miranda32.sln @@ -121,14 +121,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protocols", "Protocols", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{6221EF9E-F53A-4381-B760-4C0208E5D597}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "..\libs\sqlite3\sqlite3.vcxproj", "{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}" @@ -141,8 +135,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StdPopup", "..\src\core\std EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protocols\Facebook\proto_facebook\Proto_Facebook.vcxproj", "{44298314-7DD4-4EF7-B576-30E503257223}" @@ -447,14 +439,6 @@ Global {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|Win32.Build.0 = Release|Win32 {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.ActiveCfg = Release|x64 {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.Build.0 = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64 - {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|Win32.ActiveCfg = Debug|Win32 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|Win32.Build.0 = Debug|Win32 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|x64.ActiveCfg = Debug|x64 @@ -463,22 +447,6 @@ Global {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|Win32.Build.0 = Release|Win32 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|x64.ActiveCfg = Release|x64 {0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|x64.Build.0 = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-7976-4E87-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.ActiveCfg = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|Win32.Build.0 = Debug|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.ActiveCfg = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Debug|x64.Build.0 = Debug|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.ActiveCfg = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.Build.0 = Release|Win32 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.ActiveCfg = Release|x64 - {63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.Build.0 = Release|x64 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.ActiveCfg = Debug|Win32 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.Build.0 = Debug|Win32 {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.ActiveCfg = Debug|x64 @@ -519,14 +487,6 @@ Global {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 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|Win32.Build.0 = Debug|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.ActiveCfg = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Debug|x64.Build.0 = Debug|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.ActiveCfg = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|Win32.Build.0 = Release|Win32 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.ActiveCfg = Release|x64 - {EE383404-4E87-7976-BD13-A9B7B47C0C10}.Release|x64.Build.0 = Release|x64 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.ActiveCfg = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|Win32.Build.0 = Debug|Win32 {86033E58-A1E3-43AD-AE8E-305E15E72A91}.Debug|x64.ActiveCfg = Debug|x64 @@ -599,16 +559,12 @@ Global {793B6174-89B0-4682-A957-A32BE7F61502} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {52282CDE-49DF-4662-B582-CCF971A9FEC2} - {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} - {EE383404-7976-4E87-BD13-A9B7B47C0C10} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} - {63BA600E-86BF-4502-9EF0-8C090292E161} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {B3494FED-FB8C-43F4-B341-F26A3460203B} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {DB3B0449-E576-4BBB-8B08-AB9E914D39CA} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {EFB2355B-82B3-4759-B7D8-95F8E9506291} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {713067DF-65EE-480B-A000-B2A323495F16} = {85220459-761D-4E24-A381-D35A95880254} {620E0BE7-3763-4F35-9DBD-4770104E269C} = {52282CDE-49DF-4662-B582-CCF971A9FEC2} - {EE383404-4E87-7976-BD13-A9B7B47C0C10} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52} {86033E58-A1E3-43AD-AE8E-305E15E72A91} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {44298314-7DD4-4EF7-B576-30E503257223} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {6124E997-426E-4A0B-9617-D6D577D5E7D7} = {52282CDE-49DF-4662-B582-CCF971A9FEC2} diff --git a/libs/libmdbx/CMakeLists.txt b/libs/libmdbx/CMakeLists.txt deleted file mode 100644 index 0dab031e95..0000000000 --- a/libs/libmdbx/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -file(GLOB SOURCES "src/mdbx.h" "src/mdbx.c") -set(TARGET libmdbx) -include(${CMAKE_SOURCE_DIR}/cmake/lib.cmake) - -set_target_properties(${TARGET} PROPERTIES COMPILE_DEFINITIONS "MDBX_BUILD_SHARED_LIBRARY=1;LIBMDBX_EXPORTS=1") diff --git a/libs/libmdbx/libmdbx.vcxproj b/libs/libmdbx/libmdbx.vcxproj deleted file mode 100644 index 9351bea039..0000000000 --- a/libs/libmdbx/libmdbx.vcxproj +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{6D19209B-ECE7-4B9C-941C-0AA2B484F199}</ProjectGuid> - <ProjectName>libmdbx</ProjectName> - <TargetName>libmdbx</TargetName> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\</OutDir> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - <GenerateManifest>false</GenerateManifest> - <EmbedManifest>false</EmbedManifest> - </PropertyGroup> - <Import Project="$(ProjectDir)..\..\build\vc.common\common.props" /> - <PropertyGroup> - <TargetExt>.mir</TargetExt> - <TargetPath>$(OutDir)$(TargetName)$(TargetExt)</TargetPath> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <PreprocessorDefinitions>MDBX_BUILD_SHARED_LIBRARY=1;MDBX_TXN_CHECKOWNER=0;LIBMDBX_EXPORTS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="src\mdbx.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="src\mdbx.c"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/libmdbx.vcxproj.filters b/libs/libmdbx/libmdbx.vcxproj.filters deleted file mode 100644 index d639ff0633..0000000000 --- a/libs/libmdbx/libmdbx.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> - <ItemGroup> - <ClInclude Include="src\mdbx.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="src\mdbx.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/mdbx_chk.vcxproj b/libs/libmdbx/mdbx_chk.vcxproj deleted file mode 100644 index f07ada1150..0000000000 --- a/libs/libmdbx/mdbx_chk.vcxproj +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{EE383404-4E87-7976-BD13-A9B7B47C0C10}</ProjectGuid> - <ProjectName>mdbx_chk</ProjectName> - </PropertyGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(ProjectDir)..\..\build\vc.common\app.props" /> - </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <PreprocessorDefinitions>LIBMDBX_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Console</SubSystem> - <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> - <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="src\mdbx_chk.c"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> - <ClCompile Include="..\..\build\appstub\appstub.cpp"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libmdbx.vcxproj"> - <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project> - </ProjectReference> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/mdbx_chk.vcxproj.filters b/libs/libmdbx/mdbx_chk.vcxproj.filters deleted file mode 100644 index 6a075502ac..0000000000 --- a/libs/libmdbx/mdbx_chk.vcxproj.filters +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> - <ItemGroup> - <ClCompile Include="..\..\build\appstub\appstub.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\mdbx_chk.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/mdbx_dump.vcxproj b/libs/libmdbx/mdbx_dump.vcxproj deleted file mode 100644 index 6f377319ff..0000000000 --- a/libs/libmdbx/mdbx_dump.vcxproj +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{EE383404-7976-4E87-BD13-A9B7B47C0C10}</ProjectGuid> - <ProjectName>mdbx_dump</ProjectName> - </PropertyGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(ProjectDir)..\..\build\vc.common\app.props" /> - </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <PreprocessorDefinitions>LIBMDBX_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Console</SubSystem> - <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> - <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="src\mdbx_dump.c"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> - <ClCompile Include="..\..\build\appstub\appstub.cpp"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libmdbx.vcxproj"> - <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project> - </ProjectReference> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/mdbx_dump.vcxproj.filters b/libs/libmdbx/mdbx_dump.vcxproj.filters deleted file mode 100644 index 28a168c533..0000000000 --- a/libs/libmdbx/mdbx_dump.vcxproj.filters +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> - <ItemGroup> - <ClCompile Include="..\..\build\appstub\appstub.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\mdbx_dump.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/mdbx_load.vcxproj b/libs/libmdbx/mdbx_load.vcxproj deleted file mode 100644 index 8494f6fa75..0000000000 --- a/libs/libmdbx/mdbx_load.vcxproj +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{63BA600E-86BF-4502-9EF0-8C090292E161}</ProjectGuid> - <ProjectName>mdbx_load</ProjectName> - </PropertyGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(ProjectDir)..\..\build\vc.common\app.props" /> - </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <PreprocessorDefinitions>LIBMDBX_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Console</SubSystem> - <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> - <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="src\mdbx_load.c"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> - <ClCompile Include="..\..\build\appstub\appstub.cpp"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libmdbx.vcxproj"> - <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project> - </ProjectReference> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/mdbx_load.vcxproj.filters b/libs/libmdbx/mdbx_load.vcxproj.filters deleted file mode 100644 index 288ff7625b..0000000000 --- a/libs/libmdbx/mdbx_load.vcxproj.filters +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> - <ItemGroup> - <ClCompile Include="..\..\build\appstub\appstub.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\mdbx_load.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/libs/libmdbx/src/cmake/compiler.cmake b/libs/libmdbx/src/cmake/compiler.cmake deleted file mode 100644 index ef49da85b1..0000000000 --- a/libs/libmdbx/src/cmake/compiler.cmake +++ /dev/null @@ -1,788 +0,0 @@ -## Copyright (c) 2012-2021 Leonid Yuriev <leo@yuriev.ru>. -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## - -cmake_minimum_required(VERSION 3.8.2) -cmake_policy(PUSH) -cmake_policy(VERSION 3.8.2) - -if(CMAKE_VERSION MATCHES ".*MSVC.*" AND CMAKE_VERSION VERSION_LESS 3.16) - message(FATAL_ERROR "CMake from MSVC kit is unfit! " - "Please use MSVC2019 with modern CMake the original CMake from https://cmake.org/download/") -endif() - -if(NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)) - message(FATAL_ERROR "This module required C or C++ to be enabled") -endif() - -if(CMAKE_CXX_COMPILER_LOADED) - include(CheckCXXSourceRuns) - include(CheckCXXSourceCompiles) - include(CheckCXXCompilerFlag) -endif() -if(CMAKE_C_COMPILER_LOADED) - include(CheckCSourceRuns) - include(CheckCSourceCompiles) - include(CheckCCompilerFlag) -endif() -include(CMakeDependentOption) -include(CheckLibraryExists) -include(CheckIncludeFiles) - -# Check if the same compile family is used for both C and CXX -if(CMAKE_C_COMPILER_LOADED AND CMAKE_CXX_COMPILER_LOADED AND - NOT (CMAKE_C_COMPILER_ID STREQUAL CMAKE_CXX_COMPILER_ID)) - message(WARNING "CMAKE_C_COMPILER_ID (${CMAKE_C_COMPILER_ID}) is different " - "from CMAKE_CXX_COMPILER_ID (${CMAKE_CXX_COMPILER_ID}). " - "The final binary may be unusable.") -endif() - -if(CMAKE_CXX_COMPILER_LOADED) - set(CMAKE_PRIMARY_LANG "CXX") -else() - set(CMAKE_PRIMARY_LANG "C") -endif() - -macro(check_compiler_flag flag variable) - if(CMAKE_CXX_COMPILER_LOADED) - check_cxx_compiler_flag(${flag} ${variable}) - else() - check_c_compiler_flag(${flag} ${variable}) - endif() -endmacro(check_compiler_flag) - -# We support building with Clang and gcc. First check -# what we're using for build. -if(CMAKE_C_COMPILER_LOADED AND CMAKE_C_COMPILER_ID MATCHES ".*[Cc][Ll][Aa][Nn][Gg].*") - set(CMAKE_COMPILER_IS_CLANG ON) - set(CMAKE_COMPILER_IS_GNUCC OFF) -endif() -if(CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXX_COMPILER_ID MATCHES ".*[Cc][Ll][Aa][Nn][Gg].*") - set(CMAKE_COMPILER_IS_CLANG ON) - set(CMAKE_COMPILER_IS_GNUCXX OFF) -endif() - -if(CMAKE_C_COMPILER_LOADED) - # Check for Elbrus lcc - execute_process(COMMAND ${CMAKE_C_COMPILER} --version - OUTPUT_VARIABLE tmp_lcc_probe_version - RESULT_VARIABLE tmp_lcc_probe_result ERROR_QUIET) - if(tmp_lcc_probe_result EQUAL 0) - string(FIND "${tmp_lcc_probe_version}" "lcc:" tmp_lcc_marker) - string(FIND "${tmp_lcc_probe_version}" ":e2k-" tmp_e2k_marker) - if(tmp_lcc_marker GREATER -1 AND tmp_e2k_marker GREATER tmp_lcc_marker) - execute_process(COMMAND ${CMAKE_C_COMPILER} -print-version - OUTPUT_VARIABLE CMAKE_C_COMPILER_VERSION - RESULT_VARIABLE tmp_lcc_probe_result) - set(CMAKE_COMPILER_IS_ELBRUSC ON) - set(CMAKE_C_COMPILER_ID "Elbrus") - else() - set(CMAKE_COMPILER_IS_ELBRUSC OFF) - endif() - unset(tmp_lcc_marker) - unset(tmp_e2k_marker) - endif() - unset(tmp_lcc_probe_version) - unset(tmp_lcc_probe_result) -endif() - -if(CMAKE_CXX_COMPILER_LOADED) - # Check for Elbrus l++ - execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version - OUTPUT_VARIABLE tmp_lxx_probe_version - RESULT_VARIABLE tmp_lxx_probe_result ERROR_QUIET) - if(tmp_lxx_probe_result EQUAL 0) - string(FIND "${tmp_lxx_probe_version}" "lcc:" tmp_lcc_marker) - string(FIND "${tmp_lxx_probe_version}" ":e2k-" tmp_e2k_marker) - if(tmp_lcc_marker GREATER -1 AND tmp_e2k_marker GREATER tmp_lcc_marker) - execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-version - OUTPUT_VARIABLE CMAKE_CXX_COMPILER_VERSION - RESULT_VARIABLE tmp_lxx_probe_result) - set(CMAKE_COMPILER_IS_ELBRUSCXX ON) - set(CMAKE_CXX_COMPILER_ID "Elbrus") - else() - set(CMAKE_COMPILER_IS_ELBRUSCXX OFF) - endif() - unset(tmp_lcc_marker) - unset(tmp_e2k_marker) - endif() - unset(tmp_lxx_probe_version) - unset(tmp_lxx_probe_result) -endif() - -# Hard coding the compiler version is ugly from cmake POV, but -# at least gives user a friendly error message. The most critical -# demand for C++ compiler is support of C++11 lambdas, added -# only in version 4.5 https://gcc.gnu.org/projects/cxx0x.html -if(CMAKE_COMPILER_IS_GNUCC) - if(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5 - AND NOT CMAKE_COMPILER_IS_ELBRUSC) - message(FATAL_ERROR " - Your GCC version is ${CMAKE_C_COMPILER_VERSION}, please update") - endif() -endif() -if(CMAKE_COMPILER_IS_GNUCXX) - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5 - AND NOT CMAKE_COMPILER_IS_ELBRUSCXX) - message(FATAL_ERROR " - Your G++ version is ${CMAKE_CXX_COMPILER_VERSION}, please update") - endif() -endif() - -if(CMAKE_CL_64) - set(MSVC64 1) -endif() -if(WIN32 AND CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG}) - execute_process(COMMAND ${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER} -dumpmachine - OUTPUT_VARIABLE __GCC_TARGET_MACHINE - OUTPUT_STRIP_TRAILING_WHITESPACE) - if(__GCC_TARGET_MACHINE MATCHES "amd64|x86_64|AMD64") - set(MINGW64 1) - endif() - unset(__GCC_TARGET_MACHINE) -endif() - -if(NOT DEFINED IOS) - if(APPLE AND (CMAKE_SYSTEM_NAME STREQUAL "iOS" - OR DEFINED CMAKE_IOS_DEVELOPER_ROOT - OR DEFINED IOS_PLATFORM OR DEFINED IOS_ARCH)) - set(IOS TRUE) - else() - set(IOS FALSE) - endif() -endif() - -if(NOT DEFINED CMAKE_TARGET_BITNESS) - if (CMAKE_SIZEOF_VOID_P LESS 4) - set(CMAKE_TARGET_BITNESS 16) - elseif (CMAKE_SIZEOF_VOID_P LESS 8) - set(CMAKE_TARGET_BITNESS 32) - else() - set(CMAKE_TARGET_BITNESS 64) - endif() -endif() - -if(CMAKE_COMPILER_IS_ELBRUSC OR CMAKE_SYSTEM_PROCESSOR MATCHES "e2k.*|E2K.*|elbrus.*|ELBRUS.*") - set(E2K TRUE) - set(CMAKE_SYSTEM_ARCH "Elbrus") -elseif((MSVC64 OR MINGW64) AND CMAKE_TARGET_BITNESS EQUAL 64) - set(X86_64 TRUE) - set(CMAKE_SYSTEM_ARCH "x86_64") -elseif(MINGW OR (MSVC AND NOT CMAKE_CROSSCOMPILING)) - set(X86_32 TRUE) - set(CMAKE_SYSTEM_ARCH "x86") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*" AND CMAKE_TARGET_BITNESS EQUAL 64) - set(X86_64 TRUE) - set(CMAKE_SYSTEM_ARCH "x86_64") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*") - set(X86_32 TRUE) - set(CMAKE_SYSTEM_ARCH "x86") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|ARM64.*)" AND CMAKE_TARGET_BITNESS EQUAL 64) - set(AARCH64 TRUE) - set(CMAKE_SYSTEM_ARCH "ARM64") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") - set(ARM32 TRUE) - set(CMAKE_SYSTEM_ARCH "ARM") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le.*" AND CMAKE_TARGET_BITNESS EQUAL 64) - set(PPC64LE TRUE) - set(CMAKE_SYSTEM_ARCH "PPC64LE") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64.*" AND CMAKE_TARGET_BITNESS EQUAL 64) - set(PPC64 TRUE) - set(CMAKE_SYSTEM_ARCH "PPC64") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc).*") - set(PPC32 TRUE) - set(CMAKE_SYSTEM_ARCH "PPC") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(mips|MIPS)64.*" AND CMAKE_TARGET_BITNESS EQUAL 64) - set(MIPS64 TRUE) - set(CMAKE_SYSTEM_ARCH "MIPS64") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(mips|MIPS).*") - set(MIPS32 TRUE) - set(CMAKE_SYSTEM_ARCH "MIPS") -endif() - -if(MSVC) - check_compiler_flag("/WX" CC_HAS_WERROR) -else() - # - # GCC started to warn for unused result starting from 4.2, and - # this is when it introduced -Wno-unused-result - # GCC can also be built on top of llvm runtime (on mac). - check_compiler_flag("-Wno-unknown-pragmas" CC_HAS_WNO_UNKNOWN_PRAGMAS) - check_compiler_flag("-Wextra" CC_HAS_WEXTRA) - check_compiler_flag("-Werror" CC_HAS_WERROR) - check_compiler_flag("-fexceptions" CC_HAS_FEXCEPTIONS) - if(CMAKE_CXX_COMPILER_LOADED) - check_cxx_compiler_flag("-fcxx-exceptions" CC_HAS_FCXX_EXCEPTIONS) - endif() - check_compiler_flag("-funwind-tables" CC_HAS_FUNWIND_TABLES) - check_compiler_flag("-fno-omit-frame-pointer" CC_HAS_FNO_OMIT_FRAME_POINTER) - check_compiler_flag("-fno-common" CC_HAS_FNO_COMMON) - check_compiler_flag("-ggdb" CC_HAS_GGDB) - check_compiler_flag("-fvisibility=hidden" CC_HAS_VISIBILITY) - check_compiler_flag("-march=native" CC_HAS_ARCH_NATIVE) - check_compiler_flag("-Og" CC_HAS_DEBUG_FRIENDLY_OPTIMIZATION) - check_compiler_flag("-Wall" CC_HAS_WALL) - check_compiler_flag("-Ominimal" CC_HAS_OMINIMAL) - check_compiler_flag("-ffunction-sections -fdata-sections" CC_HAS_SECTIONS) - check_compiler_flag("-ffast-math" CC_HAS_FASTMATH) - check_compiler_flag("-Wno-attributes" CC_HAS_WNO_ATTRIBUTES) - - # Check for an omp support - set(CMAKE_REQUIRED_FLAGS "-fopenmp -Werror") - if(CMAKE_CXX_COMPILER_LOADED) - check_cxx_source_compiles("int main(void) { - #pragma omp parallel - return 0; - }" HAVE_OPENMP) - else() - check_c_source_compiles("int main(void) { - #pragma omp parallel - return 0; - }" HAVE_OPENMP) - endif() - set(CMAKE_REQUIRED_FLAGS "") -endif() - -# Crutch for old C++ compilers and/or CMake to enabling C++11 -if(CMAKE_CXX_COMPILER_LOADED) - list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_std_11 HAS_CXX11) - if(HAS_CXX11 LESS 0) - check_compiler_flag("-std=gnu++11" CXX_FALLBACK_STDGNU11) - if(NOT CXX_FALLBACK_STDGNU11) - check_compiler_flag("-std=c++11" CXX_FALLBACK_STD11) - endif() - endif() -endif() - -# Check for LTO support by GCC -if(CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG}) - unset(gcc_collect) - unset(gcc_lto_wrapper) - - if(NOT CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 4.7) - execute_process(COMMAND ${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER} -v - OUTPUT_VARIABLE gcc_info_v ERROR_VARIABLE gcc_info_v) - - string(REGEX MATCH "^(.+\nCOLLECT_GCC=)([^ \n]+)(\n.+)$" gcc_collect_valid ${gcc_info_v}) - if(gcc_collect_valid) - string(REGEX REPLACE "^(.+\nCOLLECT_GCC=)([^ \n]+)(\n.+)$" "\\2" gcc_collect ${gcc_info_v}) - endif() - - string(REGEX MATCH "^(.+\nCOLLECT_LTO_WRAPPER=)([^ \n]+/lto-wrapper)(\n.+)$" gcc_lto_wrapper_valid ${gcc_info_v}) - if(gcc_lto_wrapper_valid) - string(REGEX REPLACE "^(.+\nCOLLECT_LTO_WRAPPER=)([^ \n]+/lto-wrapper)(\n.+)$" "\\2" gcc_lto_wrapper ${gcc_info_v}) - endif() - - set(gcc_suffix "") - if(gcc_collect_valid AND gcc_collect) - string(REGEX MATCH "^(.*cc)(-.+)$" gcc_suffix_valid ${gcc_collect}) - if(gcc_suffix_valid) - string(REGEX MATCH "^(.*cc)(-.+)$" "\\2" gcc_suffix ${gcc_collect}) - endif() - endif() - - get_filename_component(gcc_dir ${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER} DIRECTORY) - if(NOT CMAKE_GCC_AR) - find_program(CMAKE_GCC_AR NAMES gcc${gcc_suffix}-ar gcc-ar${gcc_suffix} PATHS ${gcc_dir} NO_DEFAULT_PATH) - endif() - if(NOT CMAKE_GCC_NM) - find_program(CMAKE_GCC_NM NAMES gcc${gcc_suffix}-nm gcc-nm${gcc_suffix} PATHS ${gcc_dir} NO_DEFAULT_PATH) - endif() - if(NOT CMAKE_GCC_RANLIB) - find_program(CMAKE_GCC_RANLIB NAMES gcc${gcc_suffix}-ranlib gcc-ranlib${gcc_suffix} PATHS ${gcc_dir} NO_DEFAULT_PATH) - endif() - - unset(gcc_dir) - unset(gcc_suffix_valid) - unset(gcc_suffix) - unset(gcc_lto_wrapper_valid) - unset(gcc_collect_valid) - unset(gcc_collect) - unset(gcc_info_v) - endif() - - if(CMAKE_GCC_AR AND CMAKE_GCC_NM AND CMAKE_GCC_RANLIB AND gcc_lto_wrapper) - message(STATUS "Found GCC's LTO toolset: ${gcc_lto_wrapper}, ${CMAKE_GCC_AR}, ${CMAKE_GCC_RANLIB}") - set(GCC_LTO_CFLAGS "-flto -fno-fat-lto-objects -fuse-linker-plugin") - set(GCC_LTO_AVAILABLE TRUE) - message(STATUS "Link-Time Optimization by GCC is available") - else() - set(GCC_LTO_AVAILABLE FALSE) - message(STATUS "Link-Time Optimization by GCC is NOT available") - endif() - unset(gcc_lto_wrapper) -endif() - -# check for LTO by MSVC -if(MSVC AND NOT CMAKE_COMPILER_IS_CLANG) - if(NOT MSVC_VERSION LESS 1600) - set(MSVC_LTO_AVAILABLE TRUE) - message(STATUS "Link-Time Optimization by MSVC is available") - else() - set(MSVC_LTO_AVAILABLE FALSE) - message(STATUS "Link-Time Optimization by MSVC is NOT available") - endif() -endif() - -# Check for LTO support by CLANG -if(CMAKE_COMPILER_IS_CLANG) - if(NOT CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 3.5) - execute_process(COMMAND ${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER} -print-search-dirs - OUTPUT_VARIABLE clang_search_dirs RESULT_VARIABLE clang_probe_result ERROR_QUIET) - - unset(clang_bindirs) - unset(clang_libdirs) - if(clang_probe_result EQUAL 0) - string(REGEX MATCH "(^|\n.*)(.*programs: =)([^\n]+)((\n.*)|$)" regexp_valid ${clang_search_dirs}) - if(regexp_valid) - string(REGEX REPLACE "(^|\n.*)(.*programs: =)([^\n]+)((\n.*)|$)" "\\3" list ${clang_search_dirs}) - string(REPLACE ":" ";" list "${list}") - #set(clang_bindirs "") - foreach(dir IN LISTS list) - get_filename_component(dir "${dir}" REALPATH) - list(APPEND clang_bindirs "${dir}") - endforeach() - list(REMOVE_DUPLICATES clang_bindirs) - endif() - string(REGEX MATCH "(^|\n.*)(.*libraries: =)([^\n]+)((\n.*)|$)" regexp_valid ${clang_search_dirs}) - if(regexp_valid) - string(REGEX REPLACE "(^|\n.*)(.*libraries: =)([^\n]+)((\n.*)|$)" "\\3" list ${clang_search_dirs}) - string(REPLACE ":" ";" list "${list}") - #set(clang_libdirs "") - foreach(dir IN LISTS list) - get_filename_component(dir "${dir}" REALPATH) - list(APPEND clang_libdirs "${dir}") - endforeach() - list(REMOVE_DUPLICATES clang_libdirs) - endif() - else() - get_filename_component(clang_bindirs ${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER} DIRECTORY) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - set(clang_libdirs ${clang_bindirs}) - else() - get_filename_component(clang_libdirs "${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER}/../lib" REALPATH) - endif() - endif() - - if(clang_bindirs AND clang_libdirs) - message(STATUS "Found CLANG/LLVM directories: ${clang_bindirs}, ${clang_libdirs}") - else() - message(STATUS "Could NOT find CLANG/LLVM directories (bin and/or lib).") - endif() - - if(NOT CMAKE_CLANG_LD AND clang_bindirs) - find_program(CMAKE_CLANG_LD NAMES lld-link ld.lld "ld${CMAKE_TARGET_BITNESS}.lld" lld llvm-link llvm-ld PATHS ${clang_bindirs} NO_DEFAULT_PATH) - endif() - if(NOT CMAKE_CLANG_AR AND clang_bindirs) - find_program(CMAKE_CLANG_AR NAMES llvm-ar ar PATHS ${clang_bindirs} NO_DEFAULT_PATH) - endif() - if(NOT CMAKE_CLANG_NM AND clang_bindirs) - find_program(CMAKE_CLANG_NM NAMES llvm-nm nm PATHS ${clang_bindirs} NO_DEFAULT_PATH) - endif() - if(NOT CMAKE_CLANG_RANLIB AND clang_bindirs) - find_program(CMAKE_CLANG_RANLIB NAMES llvm-ranlib ranlib PATHS ${clang_bindirs} NO_DEFAULT_PATH) - endif() - - set(clang_lto_plugin_name "LLVMgold${CMAKE_SHARED_LIBRARY_SUFFIX}") - if(NOT CMAKE_LD_GOLD AND clang_bindirs) - find_program(CMAKE_LD_GOLD NAMES ld.gold PATHS ${clang_bindirs}) - endif() - if(NOT CLANG_LTO_PLUGIN AND clang_libdirs) - find_file(CLANG_LTO_PLUGIN ${clang_lto_plugin_name} PATHS ${clang_libdirs} NO_DEFAULT_PATH) - endif() - - if(CLANG_LTO_PLUGIN) - message(STATUS "Found CLANG/LLVM's plugin for LTO: ${CLANG_LTO_PLUGIN}") - else() - message(STATUS "Could NOT find CLANG/LLVM's plugin (${clang_lto_plugin_name}) for LTO.") - endif() - - if(CMAKE_CLANG_LD) - message(STATUS "Found CLANG/LLVM's linker for LTO: ${CMAKE_CLANG_LD}") - else() - message(STATUS "Could NOT find CLANG/LLVM's linker (lld, llvm-ld, llvm-link) for LTO.") - endif() - - if(CMAKE_CLANG_AR AND CMAKE_CLANG_RANLIB AND CMAKE_CLANG_NM) - message(STATUS "Found CLANG/LLVM's binutils for LTO: ${CMAKE_CLANG_AR}, ${CMAKE_CLANG_RANLIB}, ${CMAKE_CLANG_NM}") - else() - message(STATUS "Could NOT find CLANG/LLVM's binutils (ar, ranlib, nm) for LTO.") - endif() - - unset(clang_lto_plugin_name) - unset(clang_libdir) - unset(clang_bindir_valid) - unset(clang_bindir) - unset(clang_search_dirs) - endif() - - if (CMAKE_CLANG_AR AND CMAKE_CLANG_NM AND CMAKE_CLANG_RANLIB - AND ((CLANG_LTO_PLUGIN AND CMAKE_LD_GOLD) - OR (CMAKE_CLANG_LD - AND NOT (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" - AND CMAKE_SYSTEM_NAME STREQUAL "Linux")) - OR APPLE)) - set(CLANG_LTO_AVAILABLE TRUE) - message(STATUS "Link-Time Optimization by CLANG/LLVM is available") - elseif(CMAKE_TOOLCHAIN_FILE AND NOT CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 7.0) - set(CLANG_LTO_AVAILABLE TRUE) - if(NOT CMAKE_CLANG_LD) - set(CMAKE_CLANG_LD ${CMAKE_LINKER}) - endif() - if(NOT CMAKE_CLANG_AR) - set(CMAKE_CLANG_AR ${CMAKE_AR}) - endif() - if(NOT CMAKE_CLANG_NM) - set(CMAKE_CLANG_NM ${CMAKE_NM}) - endif() - if(NOT CMAKE_CLANG_RANLIB) - set(CMAKE_CLANG_RANLIB ${CMAKE_RANLIB}) - endif() - message(STATUS "Assume Link-Time Optimization by CLANG/LLVM is available via ${CMAKE_TOOLCHAIN_FILE}") - else() - set(CLANG_LTO_AVAILABLE FALSE) - message(STATUS "Link-Time Optimization by CLANG/LLVM is NOT available") - endif() -endif() - -# Perform build type specific configuration. -option(ENABLE_BACKTRACE "Enable output of fiber backtrace information in 'show - fiber' administrative command. Only works on x86 architectures, if compiled - with gcc. If GNU binutils and binutils-dev libraries are installed, backtrace - is output with resolved function (symbol) names. Otherwise only frame - addresses are printed." OFF) - -set(HAVE_BFD False) -if(ENABLE_BACKTRACE) - if(NOT (X86_32 OR X86_64) OR NOT CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG}) - # We only know this option to work with gcc - message(FATAL_ERROR "ENABLE_BACKTRACE option is set but the system - is not x86 based (${CMAKE_SYSTEM_PROCESSOR}) or the compiler - is not GNU GCC (${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER}).") - endif() - # Use GNU bfd if present. - find_library(BFD_LIBRARY NAMES libbfd.a) - if(BFD_LIBRARY) - check_library_exists(${BFD_LIBRARY} bfd_init "" HAVE_BFD_LIB) - endif() - find_library(IBERTY_LIBRARY NAMES libiberty.a) - if(IBERTY_LIBRARY) - check_library_exists(${IBERTY_LIBRARY} cplus_demangle "" HAVE_IBERTY_LIB) - endif() - set(CMAKE_REQUIRED_DEFINITIONS -DPACKAGE=${PACKAGE} -DPACKAGE_VERSION=${PACKAGE_VERSION}) - check_include_files(bfd.h HAVE_BFD_H) - set(CMAKE_REQUIRED_DEFINITIONS) - find_package(ZLIB) - if(HAVE_BFD_LIB AND HAVE_BFD_H AND HAVE_IBERTY_LIB AND ZLIB_FOUND) - set(HAVE_BFD ON) - set(BFD_LIBRARIES ${BFD_LIBRARY} ${IBERTY_LIBRARY} ${ZLIB_LIBRARIES}) - find_package_message(BFD_LIBRARIES "Found libbfd and dependencies" - ${BFD_LIBRARIES}) - if(TARGET_OS_FREEBSD AND NOT TARGET_OS_DEBIAN_FREEBSD) - set(BFD_LIBRARIES ${BFD_LIBRARIES} iconv) - endif() - endif() -endif() - -macro(setup_compile_flags) - # save initial C/CXX flags - if(NOT INITIAL_CMAKE_FLAGS_SAVED) - if(CMAKE_CXX_COMPILER_LOADED) - set(INITIAL_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "Initial CMake's flags" FORCE) - endif() - if(CMAKE_C_COMPILER_LOADED) - set(INITIAL_CMAKE_C_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "Initial CMake's flags" FORCE) - endif() - set(INITIAL_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} CACHE STRING "Initial CMake's flags" FORCE) - set(INITIAL_CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} CACHE STRING "Initial CMake's flags" FORCE) - set(INITIAL_CMAKE_STATIC_LINKER_FLAGS ${CMAKE_STATIC_LINKER_FLAGS} CACHE STRING "Initial CMake's flags" FORCE) - set(INITIAL_CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS} CACHE STRING "Initial CMake's flags" FORCE) - set(INITIAL_CMAKE_FLAGS_SAVED TRUE CACHE INTERNAL "State of initial CMake's flags" FORCE) - endif() - - # reset C/CXX flags - if(CMAKE_CXX_COMPILER_LOADED) - set(CXX_FLAGS ${INITIAL_CMAKE_CXX_FLAGS}) - # Crutch for old C++ compilers and/or CMake to enabling C++11 - if(CXX_FALLBACK_STDGNU11) - add_compile_flags("CXX" "-std=gnu++11") - elseif(CXX_FALLBACK_STD11) - add_compile_flags("CXX" "-std=c++11") - endif() - endif() - if(CMAKE_C_COMPILER_LOADED) - set(C_FLAGS ${INITIAL_CMAKE_C_FLAGS}) - endif() - set(EXE_LINKER_FLAGS ${INITIAL_CMAKE_EXE_LINKER_FLAGS}) - set(SHARED_LINKER_FLAGS ${INITIAL_CMAKE_SHARED_LINKER_FLAGS}) - set(STATIC_LINKER_FLAGS ${INITIAL_CMAKE_STATIC_LINKER_FLAGS}) - set(MODULE_LINKER_FLAGS ${INITIAL_CMAKE_MODULE_LINKER_FLAGS}) - - if(CC_HAS_FEXCEPTIONS) - add_compile_flags("C;CXX" "-fexceptions") - endif() - if(CC_HAS_FCXX_EXCEPTIONS) - add_compile_flags("CXX" "-fcxx-exceptions" "-frtti") - endif() - if(MSVC) - # checks for /EHa or /clr options exists, - # i.e. is enabled structured async WinNT exceptions - string(REGEX MATCH "^(.* )*[-/]EHc*a( .*)*$" msvc_async_eh_enabled "${CXX_FLAGS}" "${C_FLAGS}") - string(REGEX MATCH "^(.* )*[-/]clr( .*)*$" msvc_clr_enabled "${CXX_FLAGS}" "${C_FLAGS}") - # remote any /EH? options - string(REGEX REPLACE "( *[-/]-*EH[csa]+ *)+" "" CXX_FLAGS "${CXX_FLAGS}") - string(REGEX REPLACE "( *[-/]-*EH[csa]+ *)+" "" C_FLAGS "${C_FLAGS}") - if (msvc_clr_enabled STREQUAL "") - if(NOT msvc_async_eh_enabled STREQUAL "") - add_compile_flags("C;CXX" "/EHa") - else() - add_compile_flags("C;CXX" "/EHsc") - endif() - endif() - endif(MSVC) - - if(CC_HAS_WNO_ATTRIBUTES AND CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG} - AND CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 9) - # GCC < 9.x generates false-positive warnings for optimization attributes - add_compile_flags("C;CXX" "-Wno-attributes") - endif() - - # In C a global variable without a storage specifier (static/extern) and - # without an initialiser is called a ’tentative definition’. The - # language permits multiple tentative definitions in the single - # translation unit; i.e. int foo; int foo; is perfectly ok. GNU - # toolchain goes even further, allowing multiple tentative definitions - # in *different* translation units. Internally, variables introduced via - # tentative definitions are implemented as ‘common’ symbols. Linker - # permits multiple definitions if they are common symbols, and it picks - # one arbitrarily for inclusion in the binary being linked. - # - # -fno-common forces GNU toolchain to behave in a more - # standard-conformant way in respect to tentative definitions and it - # prevents common symbols generation. Since we are a cross-platform - # project it really makes sense. There are toolchains that don’t - # implement GNU style handling of the tentative definitions and there - # are platforms lacking proper support for common symbols (osx). - if(CC_HAS_FNO_COMMON) - add_compile_flags("C;CXX" "-fno-common") - endif() - - if(CC_HAS_GGDB) - add_compile_flags("C;CXX" "-ggdb") - endif() - - if(CC_HAS_WNO_UNKNOWN_PRAGMAS AND NOT HAVE_OPENMP) - add_compile_flags("C;CXX" "-Wno-unknown-pragmas") - endif() - - if(CC_HAS_SECTIONS) - add_compile_flags("C;CXX" "-ffunction-sections" "-fdata-sections") - elseif(MSVC) - add_compile_flags("C;CXX" "/Gy") - endif() - - # We must set -fno-omit-frame-pointer here, since we rely - # on frame pointer when getting a backtrace, and it must - # be used consistently across all object files. - # The same reasoning applies to -fno-stack-protector switch. - if(ENABLE_BACKTRACE) - if(CC_HAS_FNO_OMIT_FRAME_POINTER) - add_compile_flags("C;CXX" "-fno-omit-frame-pointer") - endif() - endif() - - if(MSVC) - if(MSVC_VERSION LESS 1900) - message(FATAL_ERROR "At least \"Microsoft C/C++ Compiler\" version 19.0.24234.1 (Visual Studio 2015 Update 3) is required.") - endif() - if(NOT MSVC_VERSION LESS 1910) - add_compile_flags("CXX" "/Zc:__cplusplus") - endif() - add_compile_flags("C;CXX" "/utf-8") - else() - if(CC_HAS_WALL) - add_compile_flags("C;CXX" "-Wall") - endif() - if(CC_HAS_WEXTRA) - add_compile_flags("C;CXX" "-Wextra") - endif() - endif() - - if(CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG} - AND CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 5) - # G++ bug. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31488 - add_compile_flags("CXX" "-Wno-invalid-offsetof") - endif() - - add_definitions("-D__STDC_FORMAT_MACROS=1") - add_definitions("-D__STDC_LIMIT_MACROS=1") - add_definitions("-D__STDC_CONSTANT_MACROS=1") - add_definitions("-D_HAS_EXCEPTIONS=1") - - # Only add -Werror if it's a debug build, done by developers. - # Release builds should not cause extra trouble. - if(CC_HAS_WERROR AND (CI OR CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE STREQUAL "Debug")) - if(MSVC) - add_compile_flags("C;CXX" "/WX") - elseif(CMAKE_COMPILER_IS_CLANG) - if(NOT CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 6) - add_compile_flags("C;CXX" "-Werror") - endif() - elseif(CMAKE_COMPILER_IS_GNUCC) - if(NOT CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 6) - add_compile_flags("C;CXX" "-Werror") - endif() - else() - add_compile_flags("C;CXX" "-Werror") - endif() - endif() - - if(ENABLE_ASAN) - add_compile_flags("C;CXX" "-fsanitize=address") - endif() - - if(ENABLE_UBSAN) - add_compile_flags("C;CXX" "-fsanitize=undefined" "-fsanitize-undefined-trap-on-error") - endif() - - if(ENABLE_GCOV) - if(NOT HAVE_GCOV) - message(FATAL_ERROR - "ENABLE_GCOV option requested but gcov library is not found") - endif() - - add_compile_flags("C;CXX" "-fprofile-arcs" "-ftest-coverage") - set(EXE_LINKER_FLAGS "${EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") - set(SHARED_LINKER_FLAGS "${SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") - set(MODULE_LINKER_FLAGS "${MODULE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") - # add_library(gcov SHARED IMPORTED) - endif() - - if(ENABLE_GPROF) - add_compile_flags("C;CXX" "-pg") - endif() - - if(CMAKE_COMPILER_IS_GNUCC AND LTO_ENABLED) - add_compile_flags("C;CXX" ${GCC_LTO_CFLAGS}) - set(EXE_LINKER_FLAGS "${EXE_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm -fwhole-program") - set(SHARED_LINKER_FLAGS "${SHARED_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm") - set(MODULE_LINKER_FLAGS "${MODULE_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5) - # Pass the same optimization flags to the linker - set(compile_flags "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") - set(EXE_LINKER_FLAGS "${EXE_LINKER_FLAGS} ${compile_flags}") - set(SHARED_LINKER_FLAGS "${SHARED_LINKER_FLAGS} ${compile_flags}") - set(MODULE_LINKER_FLAGS "${MODULE_LINKER_FLAGS} ${compile_flags}") - unset(compile_flags) - else() - add_compile_flags("CXX" "-flto-odr-type-merging") - endif() - endif() - - if(MSVC AND NOT CMAKE_COMPILER_IS_CLANG AND LTO_ENABLED) - add_compile_flags("C;CXX" "/GL") - foreach(linkmode IN ITEMS EXE SHARED STATIC MODULE) - set(${linkmode}_LINKER_FLAGS "${${linkmode}_LINKER_FLAGS} /LTCG") - string(REGEX REPLACE "^(.*)(/INCREMENTAL:NO *)(.*)$" "\\1\\3" ${linkmode}_LINKER_FLAGS "${${linkmode}_LINKER_FLAGS}") - string(REGEX REPLACE "^(.*)(/INCREMENTAL:YES *)(.*)$" "\\1\\3" ${linkmode}_LINKER_FLAGS "${${linkmode}_LINKER_FLAGS}") - string(REGEX REPLACE "^(.*)(/INCREMENTAL *)(.*)$" "\\1\\3" ${linkmode}_LINKER_FLAGS "${${linkmode}_LINKER_FLAGS}") - string(STRIP "${${linkmode}_LINKER_FLAGS}" ${linkmode}_LINKER_FLAGS) - foreach(config IN LISTS CMAKE_CONFIGURATION_TYPES ITEMS Release MinSizeRel RelWithDebInfo Debug) - string(TOUPPER "${config}" config_uppercase) - if(DEFINED "CMAKE_${linkmode}_LINKER_FLAGS_${config_uppercase}") - string(REGEX REPLACE "^(.*)(/INCREMENTAL:NO *)(.*)$" "\\1\\3" altered_flags "${CMAKE_${linkmode}_LINKER_FLAGS_${config_uppercase}}") - string(REGEX REPLACE "^(.*)(/INCREMENTAL:YES *)(.*)$" "\\1\\3" altered_flags "${altered_flags}") - string(REGEX REPLACE "^(.*)(/INCREMENTAL *)(.*)$" "\\1\\3" altered_flags "${altered_flags}") - string(STRIP "${altered_flags}" altered_flags) - if(NOT "${altered_flags}" STREQUAL "${CMAKE_${linkmode}_LINKER_FLAGS_${config_uppercase}}") - set(CMAKE_${linkmode}_LINKER_FLAGS_${config_uppercase} "${altered_flags}" CACHE STRING "Altered: '/INCREMENTAL' removed for LTO" FORCE) - endif() - endif() - endforeach(config) - endforeach(linkmode) - unset(linkmode) - - foreach(config IN LISTS CMAKE_CONFIGURATION_TYPES ITEMS Release MinSizeRel RelWithDebInfo) - foreach(lang IN ITEMS C CXX) - string(TOUPPER "${config}" config_uppercase) - if(DEFINED "CMAKE_${lang}_FLAGS_${config_uppercase}") - string(REPLACE "/O2" "/Ox" altered_flags "${CMAKE_${lang}_FLAGS_${config_uppercase}}") - if(NOT "${altered_flags}" STREQUAL "${CMAKE_${lang}_FLAGS_${config_uppercase}}") - set(CMAKE_${lang}_FLAGS_${config_uppercase} "${altered_flags}" CACHE STRING "Altered: '/O2' replaced by '/Ox' for LTO" FORCE) - endif() - endif() - unset(config_uppercase) - endforeach(lang) - endforeach(config) - unset(altered_flags) - unset(lang) - unset(config) - endif() - - if(CMAKE_COMPILER_IS_CLANG AND OSX_ARCHITECTURES) - set(EXE_LINKER_FLAGS "${EXE_LINKER_FLAGS} -Wl,-keep_dwarf_unwind") - set(SHARED_LINKER_FLAGS "${SHARED_LINKER_FLAGS} -Wl,-keep_dwarf_unwind") - set(MODULE_LINKER_FLAGS "${MODULE_LINKER_FLAGS} -Wl,-keep_dwarf_unwind") - endif() - - if(CMAKE_COMPILER_IS_CLANG AND LTO_ENABLED) - if(CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 3.9) - set(CLANG_LTO_FLAG "-flto") - else() - set(CLANG_LTO_FLAG "-flto=thin") - endif() - add_compile_flags("C;CXX" ${CLANG_LTO_FLAG}) - if(NOT MSVC) - set(EXE_LINKER_FLAGS "${EXE_LINKER_FLAGS} ${CLANG_LTO_FLAG} -fverbose-asm -fwhole-program") - set(SHARED_LINKER_FLAGS "${SHARED_LINKER_FLAGS} ${CLANG_LTO_FLAG} -fverbose-asm") - set(MODULE_LINKER_FLAGS "${MODULE_LINKER_FLAGS} ${CLANG_LTO_FLAG} -fverbose-asm") - endif() - endif() - - # push C/CXX flags into the cache - if(CMAKE_CXX_COMPILER_LOADED) - set(CMAKE_CXX_FLAGS ${CXX_FLAGS} CACHE STRING "Flags used by the C++ compiler during all build types" FORCE) - unset(CXX_FLAGS) - endif() - if(CMAKE_C_COMPILER_LOADED) - set(CMAKE_C_FLAGS ${C_FLAGS} CACHE STRING "Flags used by the C compiler during all build types" FORCE) - unset(C_FLAGS) - endif() - set(CMAKE_EXE_LINKER_FLAGS ${EXE_LINKER_FLAGS} CACHE STRING "Flags used by the linker" FORCE) - set(CMAKE_SHARED_LINKER_FLAGS ${SHARED_LINKER_FLAGS} CACHE STRING "Flags used by the linker during the creation of dll's" FORCE) - set(CMAKE_STATIC_LINKER_FLAGS ${STATIC_LINKER_FLAGS} CACHE STRING "Flags used by the linker during the creation of static libraries" FORCE) - set(CMAKE_MODULE_LINKER_FLAGS ${MODULE_LINKER_FLAGS} CACHE STRING "Flags used by the linker during the creation of modules" FORCE) - unset(EXE_LINKER_FLAGS) - unset(SHARED_LINKER_FLAGS) - unset(STATIC_LINKER_FLAGS) - unset(MODULE_LINKER_FLAGS) -endmacro(setup_compile_flags) - -if(CMAKE_CXX_COMPILER_LOADED) - # determine library for for std::filesystem - set(LIBCXX_FILESYSTEM "") - if(CMAKE_COMPILER_IS_CLANG) - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) - set(LIBCXX_FILESYSTEM "c++experimental") - elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) - set(LIBCXX_FILESYSTEM "stdc++fs") - endif() - elseif(CMAKE_COMPILER_IS_GNUCXX) - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) - set(LIBCXX_FILESYSTEM "stdc++fs") - endif() - endif() -endif() - -cmake_policy(POP) diff --git a/libs/libmdbx/src/cmake/profile.cmake b/libs/libmdbx/src/cmake/profile.cmake deleted file mode 100644 index 66f4ed873d..0000000000 --- a/libs/libmdbx/src/cmake/profile.cmake +++ /dev/null @@ -1,48 +0,0 @@ -## Copyright (c) 2012-2021 Leonid Yuriev <leo@yuriev.ru>. -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## - -cmake_minimum_required(VERSION 3.8.2) -cmake_policy(PUSH) -cmake_policy(VERSION 3.8.2) - -include(CheckLibraryExists) -check_library_exists(gcov __gcov_flush "" HAVE_GCOV) - -option(ENABLE_GCOV - "Enable integration with gcov, a code coverage program" OFF) - -option(ENABLE_GPROF - "Enable integration with gprof, a performance analyzing tool" OFF) - -if(CMAKE_CXX_COMPILER_LOADED) - include(CheckIncludeFileCXX) - check_include_file_cxx(valgrind/memcheck.h HAVE_VALGRIND_MEMCHECK_H) -else() - include(CheckIncludeFile) - check_include_file(valgrind/memcheck.h HAVE_VALGRIND_MEMCHECK_H) -endif() - -option(MDBX_USE_VALGRIND "Enable integration with valgrind, a memory analyzing tool" OFF) -if(MDBX_USE_VALGRIND AND NOT HAVE_VALGRIND_MEMCHECK_H) - message(FATAL_ERROR "MDBX_USE_VALGRIND option is set but valgrind/memcheck.h is not found") -endif() - -option(ENABLE_ASAN - "Enable AddressSanitizer, a fast memory error detector based on compiler instrumentation" OFF) - -option(ENABLE_UBSAN - "Enable UndefinedBehaviorSanitizer, a fast undefined behavior detector based on compiler instrumentation" OFF) - -cmake_policy(POP) diff --git a/libs/libmdbx/src/cmake/utils.cmake b/libs/libmdbx/src/cmake/utils.cmake deleted file mode 100644 index daf4b39d28..0000000000 --- a/libs/libmdbx/src/cmake/utils.cmake +++ /dev/null @@ -1,216 +0,0 @@ -## Copyright (c) 2012-2021 Leonid Yuriev <leo@yuriev.ru>. -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## - -cmake_minimum_required(VERSION 3.8.2) -cmake_policy(PUSH) -cmake_policy(VERSION 3.8.2) - -macro(add_compile_flags languages) - foreach(_lang ${languages}) - string(REPLACE ";" " " _flags "${ARGN}") - if(CMAKE_CXX_COMPILER_LOADED AND _lang STREQUAL "CXX") - set("${_lang}_FLAGS" "${${_lang}_FLAGS} ${_flags}") - endif() - if(CMAKE_C_COMPILER_LOADED AND _lang STREQUAL "C") - set("${_lang}_FLAGS" "${${_lang}_FLAGS} ${_flags}") - endif() - endforeach() - unset(_lang) - unset(_flags) -endmacro(add_compile_flags) - -macro(set_source_files_compile_flags) - foreach(file ${ARGN}) - get_filename_component(_file_ext ${file} EXT) - set(_lang "") - if("${_file_ext}" STREQUAL ".m") - set(_lang OBJC) - # CMake believes that Objective C is a flavor of C++, not C, - # and uses g++ compiler for .m files. - # LANGUAGE property forces CMake to use CC for ${file} - set_source_files_properties(${file} PROPERTIES LANGUAGE C) - elseif("${_file_ext}" STREQUAL ".mm") - set(_lang OBJCXX) - endif() - - if(_lang) - get_source_file_property(_flags ${file} COMPILE_FLAGS) - if("${_flags}" STREQUAL "NOTFOUND") - set(_flags "${CMAKE_${_lang}_FLAGS}") - else() - set(_flags "${_flags} ${CMAKE_${_lang}_FLAGS}") - endif() - # message(STATUS "Set (${file} ${_flags}") - set_source_files_properties(${file} PROPERTIES COMPILE_FLAGS - "${_flags}") - endif() - endforeach() - unset(_file_ext) - unset(_lang) -endmacro(set_source_files_compile_flags) - -macro(fetch_version name source_root_directory parent_scope) - set(${name}_VERSION "") - set(${name}_GIT_DESCRIBE "") - set(${name}_GIT_TIMESTAMP "") - set(${name}_GIT_TREE "") - set(${name}_GIT_COMMIT "") - set(${name}_GIT_REVISION 0) - set(${name}_GIT_VERSION "") - if(GIT AND EXISTS "${source_root_directory}/.git") - execute_process(COMMAND ${GIT} describe --tags --long --dirty=-dirty - OUTPUT_VARIABLE ${name}_GIT_DESCRIBE - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc OR "${name}_GIT_DESCRIBE" STREQUAL "") - message(FATAL_ERROR "Please fetch tags and/or install latest version of git ('describe --tags --long --dirty' failed)") - endif() - - execute_process(COMMAND ${GIT} show --no-patch --format=%cI HEAD - OUTPUT_VARIABLE ${name}_GIT_TIMESTAMP - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc OR "${name}_GIT_TIMESTAMP" STREQUAL "%cI") - execute_process(COMMAND ${GIT} show --no-patch --format=%ci HEAD - OUTPUT_VARIABLE ${name}_GIT_TIMESTAMP - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc OR "${name}_GIT_TIMESTAMP" STREQUAL "%ci") - message(FATAL_ERROR "Please install latest version of git ('show --no-patch --format=%cI HEAD' failed)") - endif() - endif() - - execute_process(COMMAND ${GIT} show --no-patch --format=%T HEAD - OUTPUT_VARIABLE ${name}_GIT_TREE - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc OR "${name}_GIT_TREE" STREQUAL "") - message(FATAL_ERROR "Please install latest version of git ('show --no-patch --format=%T HEAD' failed)") - endif() - - execute_process(COMMAND ${GIT} show --no-patch --format=%H HEAD - OUTPUT_VARIABLE ${name}_GIT_COMMIT - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc OR "${name}_GIT_COMMIT" STREQUAL "") - message(FATAL_ERROR "Please install latest version of git ('show --no-patch --format=%H HEAD' failed)") - endif() - - execute_process(COMMAND ${GIT} describe --tags --abbrev=0 "--match=v[0-9]*" - OUTPUT_VARIABLE last_release_tag - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc) - message(FATAL_ERROR "Please install latest version of git ('describe --tags --abbrev=0 --match=v[0-9]*' failed)") - endif() - if (last_release_tag) - set(git_revlist_arg "${last_release_tag}..HEAD") - else() - execute_process(COMMAND ${GIT} tag --sort=-version:refname - OUTPUT_VARIABLE tag_list - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc) - message(FATAL_ERROR "Please install latest version of git ('tag --sort=-version:refname' failed)") - endif() - string(REGEX REPLACE "\n" ";" tag_list "${tag_list}") - set(git_revlist_arg "HEAD") - foreach(tag IN LISTS tag_list) - if(NOT last_release_tag) - string(REGEX MATCH "^v[0-9]+(\.[0-9]+)+" last_release_tag "${tag}") - set(git_revlist_arg "${tag}..HEAD") - endif() - endforeach(tag) - endif() - execute_process(COMMAND ${GIT} rev-list --count "${git_revlist_arg}" - OUTPUT_VARIABLE ${name}_GIT_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${source_root_directory} - RESULT_VARIABLE rc) - if(rc OR "${name}_GIT_REVISION" STREQUAL "") - message(FATAL_ERROR "Please install latest version of git ('rev-list --count ${git_revlist_arg}' failed)") - endif() - - string(REGEX MATCH "^(v)?([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)?" git_version_valid "${${name}_GIT_DESCRIBE}") - if(git_version_valid) - string(REGEX REPLACE "^(v)?([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)?" "\\2;\\3;\\4" ${name}_GIT_VERSION ${${name}_GIT_DESCRIBE}) - else() - string(REGEX MATCH "^(v)?([0-9]+)\\.([0-9]+)(.*)?" git_version_valid "${${name}_GIT_DESCRIBE}") - if(git_version_valid) - string(REGEX REPLACE "^(v)?([0-9]+)\\.([0-9]+)(.*)?" "\\2;\\3;0" ${name}_GIT_VERSION ${${name}_GIT_DESCRIBE}) - else() - message(AUTHOR_WARNING "Bad ${name} version \"${${name}_GIT_DESCRIBE}\"; falling back to 0.0.0 (have you made an initial release?)") - set(${name}_GIT_VERSION "0;0;0") - endif() - endif() - endif() - - if(NOT ${name}_GIT_VERSION OR NOT ${name}_GIT_TIMESTAMP OR ${name}_GIT_REVISION STREQUAL "") - if(GIT AND EXISTS "${source_root_directory}/.git") - message(WARNING "Unable to retrieve ${name} version from git.") - endif() - set(${name}_GIT_VERSION "0;0;0;0") - set(${name}_GIT_TIMESTAMP "") - set(${name}_GIT_REVISION 0) - - # Try to get version from VERSION file - set(version_file "${source_root_directory}/VERSION") - if(EXISTS "${version_file}") - file(STRINGS "${version_file}" ${name}_VERSION LIMIT_COUNT 1 LIMIT_INPUT 42) - endif() - - if(NOT ${name}_VERSION) - message(WARNING "Unable to retrieve ${name} version from \"${version_file}\" file.") - set(${name}_VERSION_LIST ${${name}_GIT_VERSION}) - string(REPLACE ";" "." ${name}_VERSION "${${name}_GIT_VERSION}") - else() - string(REPLACE "." ";" ${name}_VERSION_LIST ${${name}_VERSION}) - endif() - - else() - list(APPEND ${name}_GIT_VERSION ${${name}_GIT_REVISION}) - set(${name}_VERSION_LIST ${${name}_GIT_VERSION}) - string(REPLACE ";" "." ${name}_VERSION "${${name}_GIT_VERSION}") - endif() - - list(GET ${name}_VERSION_LIST 0 "${name}_VERSION_MAJOR") - list(GET ${name}_VERSION_LIST 1 "${name}_VERSION_MINOR") - list(GET ${name}_VERSION_LIST 2 "${name}_VERSION_RELEASE") - list(GET ${name}_VERSION_LIST 3 "${name}_VERSION_REVISION") - - if(${parent_scope}) - set(${name}_VERSION_MAJOR "${${name}_VERSION_MAJOR}" PARENT_SCOPE) - set(${name}_VERSION_MINOR "${${name}_VERSION_MINOR}" PARENT_SCOPE) - set(${name}_VERSION_RELEASE "${${name}_VERSION_RELEASE}" PARENT_SCOPE) - set(${name}_VERSION_REVISION "${${name}_VERSION_REVISION}" PARENT_SCOPE) - set(${name}_VERSION "${${name}_VERSION}" PARENT_SCOPE) - - set(${name}_GIT_DESCRIBE "${${name}_GIT_DESCRIBE}" PARENT_SCOPE) - set(${name}_GIT_TIMESTAMP "${${name}_GIT_TIMESTAMP}" PARENT_SCOPE) - set(${name}_GIT_TREE "${${name}_GIT_TREE}" PARENT_SCOPE) - set(${name}_GIT_COMMIT "${${name}_GIT_COMMIT}" PARENT_SCOPE) - set(${name}_GIT_REVISION "${${name}_GIT_REVISION}" PARENT_SCOPE) - set(${name}_GIT_VERSION "${${name}_GIT_VERSION}" PARENT_SCOPE) - endif() -endmacro(fetch_version) - -cmake_policy(POP) diff --git a/libs/libmdbx/src/man1/mdbx_chk.1 b/libs/libmdbx/src/man1/mdbx_chk.1 deleted file mode 100644 index 1c13a91310..0000000000 --- a/libs/libmdbx/src/man1/mdbx_chk.1 +++ /dev/null @@ -1,98 +0,0 @@ -.\" Copyright 2015-2021 Leonid Yuriev <leo@yuriev.ru>. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.TH MDBX_CHK 1 "2020-09-25" "MDBX 0.9.1" -.SH NAME -mdbx_chk \- MDBX checking tool -.SH SYNOPSIS -.B mdbx_chk -[\c -.BR \-V ] -[\c -.BR \-v [ v [ v ]]] -[\c -.BR \-n ] -[\c -.BR \-q ] -[\c -.BR \-c ] -[\c -.BR \-w ] -[\c -.BR \-d ] -[\c -.BR \-i ] -[\c -.BI \-s \ subdb\fR] -.BR \ dbpath -.SH DESCRIPTION -The -.B mdbx_chk -utility intended to check an MDBX database file. -.SH OPTIONS -.TP -.BR \-V -Write the library version number to the standard output, and exit. -.TP -.BR \-v -Produce verbose output, including summarize space and page usage statistics. -If \fB\-vv\fP is given, be more verbose, show summarized B-tree info -and space allocation. -If \fB\-vvv\fP is given, be more verbose, include summarized statistics -of leaf B-tree pages. -If \fB\-vvvv\fP is given, be even more verbose, show info of each page -during B-tree traversal and basic info of each GC record. -If \fB\-vvvvv\fP is given, turn maximal verbosity, display the full list -of page IDs in the GC records and size of each key-value pair of database(s). -.TP -.BR \-q -Be quiet; do not output anything even if an error was detected. -.TP -.BR \-c -Force using cooperative mode while opening environment, i.e. don't try to open -in exclusive/monopolistic mode. Only exclusive/monopolistic mode allow complete -check, including full check of all meta-pages and actual size of database file. -.TP -.BR \-w -Open environment in read-write mode and lock for writing while checking. -This could be impossible if environment already used by another process(s) -in an incompatible read-write mode. This allow rollback to last steady commit -(in case environment was not closed properly) and then check transaction IDs -of meta-pages. Otherwise, without \fB\-w\fP option environment will be -opened in read-only mode. -.TP -.BR \-d -Disable page-by-page traversal of B-tree. In this case, without B-tree -traversal, it is unable to check for lost-unused pages nor for double-used -pages. -.TP -.BR \-i -Ignore wrong order errors, which will likely false-positive if custom -comparator(s) was used. -.TP -.BR \-s \ subdb -Verify and show info only for a specific subdatabase. -.TP -.BR \-0 | \-1 | \-2 -Using specific meta-page 0, or 2 for checking. -.TP -.BR \-t -Turn to a specified meta-page on successful check. -.TP -.BR \-T -Turn to a specified meta-page EVEN ON UNSUCCESSFUL CHECK! -.TP -.BR \-n -Open MDBX environment(s) which do not use subdirectories. -This is legacy option. For now MDBX handles this automatically. - -.SH DIAGNOSTICS -Exit status is zero if no errors occur. Errors result in a non-zero exit status -and a diagnostic message being written to standard error -if no quiet mode was requested. -.SH "SEE ALSO" -.BR mdbx_stat (1), -.BR mdbx_copy (1), -.BR mdbx_dump (1), -.BR mdbx_load (1) -.SH AUTHOR -Leonid Yuriev <https://github.com/erthink> diff --git a/libs/libmdbx/src/man1/mdbx_copy.1 b/libs/libmdbx/src/man1/mdbx_copy.1 deleted file mode 100644 index 2a448cea8c..0000000000 --- a/libs/libmdbx/src/man1/mdbx_copy.1 +++ /dev/null @@ -1,67 +0,0 @@ -.\" Copyright 2015-2021 Leonid Yuriev <leo@yuriev.ru>. -.\" Copyright 2012-2015 Howard Chu, Symas Corp. All Rights Reserved. -.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.TH MDBX_COPY 1 "2020-09-25" "MDBX 0.9.1" -.SH NAME -mdbx_copy \- MDBX environment copy tool -.SH SYNOPSIS -.B mdbx_copy -[\c -.BR \-V ] -[\c -.BR \-q ] -[\c -.BR \-c ] -[\c -.BR \-n ] -.B src_path -[\c -.BR dest_path ] -.SH DESCRIPTION -The -.B mdbx_copy -utility copies an MDBX environment. The environment can -be copied regardless of whether it is currently in use. -No lockfile is created, since it gets recreated at need. - -If -.I dest_path -is specified it must be the path of an empty directory -for storing the backup. Otherwise, the backup will be -written to stdout. - -.SH OPTIONS -.TP -.BR \-V -Write the library version number to the standard output, and exit. -.TP -.BR \-q -Be quiet. -.TP -.BR \-c -Compact while copying. Only current data pages will be copied; freed -or unused pages will be omitted from the copy. This option will -slow down the backup process as it is more CPU-intensive. -Currently it fails if the environment has suffered a page leak. -.TP -.BR \-n -Open MDBX environment(s) which do not use subdirectories. -This is legacy option. For now MDBX handles this automatically. - -.SH DIAGNOSTICS -Exit status is zero if no errors occur. -Errors result in a non-zero exit status and -a diagnostic message being written to standard error. -.SH CAVEATS -This utility can trigger significant file size growth if run -in parallel with write transactions, because pages which they -free during copying cannot be reused until the copy is done. -.SH "SEE ALSO" -.BR mdbx_dump (1), -.BR mdbx_chk (1), -.BR mdbx_stat (1), -.BR mdbx_load (1) -.SH AUTHOR -Howard Chu of Symas Corporation <http://www.symas.com>, -Leonid Yuriev <https://github.com/erthink> diff --git a/libs/libmdbx/src/man1/mdbx_dump.1 b/libs/libmdbx/src/man1/mdbx_dump.1 deleted file mode 100644 index 5a940a9d35..0000000000 --- a/libs/libmdbx/src/man1/mdbx_dump.1 +++ /dev/null @@ -1,93 +0,0 @@ -.\" Copyright 2015-2021 Leonid Yuriev <leo@yuriev.ru>. -.\" Copyright 2014-2015 Howard Chu, Symas Corp. All Rights Reserved. -.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.TH MDBX_DUMP 1 "2020-09-25" "MDBX 0.9.1" -.SH NAME -mdbx_dump \- MDBX environment export tool -.SH SYNOPSIS -.B mdbx_dump -[\c -.BR \-V ] -[\c -.BR \-q ] -[\c -.BI \-f \ file\fR] -[\c -.BR \-l ] -[\c -.BR \-p ] -[\c -.BR \-a \ | -.BI \-s \ subdb\fR] -[\c -.BR \-r ] -[\c -.BR \-n ] -.BR \ dbpath -.SH DESCRIPTION -The -.B mdbx_dump -utility reads a database and writes its contents to the -standard output using a portable flat-text format -understood by the -.BR mdbx_load (1) -utility. -.SH OPTIONS -.TP -.BR \-V -Write the library version number to the standard output, and exit. -.TP -.BR \-q -Be quiet. -.TP -.BR \-f \ file -Write to the specified file instead of to the standard output. -.TP -.BR \-l -List the databases stored in the environment. Just the -names will be listed, no data will be output. -.TP -.BR \-p -If characters in either the key or data items are printing characters (as -defined by isprint(3)), output them directly. This option permits users to -use standard text editors and tools to modify the contents of databases. - -Note: different systems may have different notions about what characters -are considered printing characters, and databases dumped in this manner may -be less portable to external systems. -.TP -.BR \-a -Dump all of the subdatabases in the environment. -.TP -.BR \-s \ subdb -Dump a specific subdatabase. If no database is specified, only the main database is dumped. -.TP -.BR \-r -Rescure mode. Ignore some errors to dump corrupted DB. -.TP -.BR \-n -Dump an MDBX database which does not use subdirectories. -This is legacy option. For now MDBX handles this automatically. - -.SH DIAGNOSTICS -Exit status is zero if no errors occur. -Errors result in a non-zero exit status and -a diagnostic message being written to standard error. - -Dumping and reloading databases that use user-defined comparison functions -will result in new databases that use the default comparison functions. -\fBIn this case it is quite likely that the reloaded database will be -damaged beyond repair permitting neither record storage nor retrieval.\fP - -The only available workaround is to modify the source for the -.BR mdbx_load (1) -utility to load the database using the correct comparison functions. -.SH "SEE ALSO" -.BR mdbx_load (1), -.BR mdbx_copy (1), -.BR mdbx_chk (1), -.BR mdbx_stat (1) -.SH AUTHOR -Howard Chu of Symas Corporation <http://www.symas.com>, -Leonid Yuriev <https://github.com/erthink> diff --git a/libs/libmdbx/src/man1/mdbx_load.1 b/libs/libmdbx/src/man1/mdbx_load.1 deleted file mode 100644 index 88db9740e1..0000000000 --- a/libs/libmdbx/src/man1/mdbx_load.1 +++ /dev/null @@ -1,104 +0,0 @@ -.\" Copyright 2015-2021 Leonid Yuriev <leo@yuriev.ru>. -.\" Copyright 2014-2015 Howard Chu, Symas Corp. All Rights Reserved. -.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.TH MDBX_LOAD 1 "2020-09-25" "MDBX 0.9.1" -.SH NAME -mdbx_load \- MDBX environment import tool -.SH SYNOPSIS -.B mdbx_load -[\c -.BR \-V ] -[\c -.BR \-q ] -[\c -.BR \-a ] -[\c -.BI \-f \ file\fR] -[\c -.BI \-s \ subdb\fR] -[\c -.BR \-N ] -[\c -.BR \-T ] -[\c -.BR \-r ] -[\c -.BR \-n ] -.BR \ dbpath -.SH DESCRIPTION -The -.B mdbx_load -utility reads from the standard input and loads it into the -MDBX environment -.BR dbpath . - -The input to -.B mdbx_load -must be in the output format specified by the -.BR mdbx_dump (1) -utility or as specified by the -.B -T -option below. - -A simple escape mechanism, where newline and backslash (\\) characters are special, is -applied to the text input. Newline characters are interpreted as record separators. -Backslash characters in the text will be interpreted in one of two ways: If the backslash -character precedes another backslash character, the pair will be interpreted as a literal -backslash. If the backslash character precedes any other character, the two characters -following the backslash will be interpreted as a hexadecimal specification of a single -character; for example, \\0a is a newline character in the ASCII character set. - -For this reason, any backslash or newline characters that naturally occur in the text -input must be escaped to avoid misinterpretation by -.BR mdbx_load . - -.SH OPTIONS -.TP -.BR \-V -Write the library version number to the standard output, and exit. -.TP -.BR \-q -Be quiet. -.TP -.BR \-a -Append all records in the order they appear in the input. The input is assumed to already be -in correctly sorted order and no sorting or checking for redundant values will be performed. -This option must be used to reload data that was produced by running -.B mdbx_dump -on a database that uses custom compare functions. -.TP -.BR \-f \ file -Read from the specified file instead of from the standard input. -.TP -.BR \-s \ subdb -Load a specific subdatabase. If no database is specified, data is loaded into the main database. -.TP -.BR \-N -Don't overwrite existing records when loading into an already existing database; just skip them. -.TP -.BR \-T -Load data from simple text files. The input must be paired lines of text, where the first -line of the pair is the key item, and the second line of the pair is its corresponding -data item. -.TP -.BR \-r -Rescure mode. Ignore errors to load corrupted DB dump. -.TP -.BR \-n -Load an MDBX database which does not use subdirectories. -This is legacy option. For now MDBX handles this automatically. - -.SH DIAGNOSTICS -Exit status is zero if no errors occur. -Errors result in a non-zero exit status and -a diagnostic message being written to standard error. - -.SH "SEE ALSO" -.BR mdbx_dump (1), -.BR mdbx_chk (1), -.BR mdbx_stat (1), -.BR mdbx_copy (1) -.SH AUTHOR -Howard Chu of Symas Corporation <http://www.symas.com>, -Leonid Yuriev <https://github.com/erthink> diff --git a/libs/libmdbx/src/man1/mdbx_stat.1 b/libs/libmdbx/src/man1/mdbx_stat.1 deleted file mode 100644 index 5cb70c2b3a..0000000000 --- a/libs/libmdbx/src/man1/mdbx_stat.1 +++ /dev/null @@ -1,78 +0,0 @@ -.\" Copyright 2015-2021 Leonid Yuriev <leo@yuriev.ru>. -.\" Copyright 2012-2015 Howard Chu, Symas Corp. All Rights Reserved. -.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.TH MDBX_STAT 1 "2020-09-25" "MDBX 0.9.1" -.SH NAME -mdbx_stat \- MDBX environment status tool -.SH SYNOPSIS -.B mdbx_stat -[\c -.BR \-V ] -[\c -.BR \-q ] -[\c -.BR \-e ] -[\c -.BR \-f [ f [ f ]]] -[\c -.BR \-r [ r ]] -[\c -.BR \-a \ | -.BI \-s \ subdb\fR] -.BR \ dbpath -[\c -.BR \-n ] -.SH DESCRIPTION -The -.B mdbx_stat -utility displays the status of an MDBX environment. -.SH OPTIONS -.TP -.BR \-V -Write the library version number to the standard output, and exit. -.TP -.BR \-q -Be quiet. -.TP -.BR \-e -Display information about the database environment. -.TP -.BR \-f -Display information about the environment freelist. -If \fB\-ff\fP is given, summarize each freelist entry. -If \fB\-fff\fP is given, display the full list of page IDs in the freelist. -.TP -.BR \-r -Display information about the environment reader table. -Shows the process ID, thread ID, and transaction ID for each active -reader slot. The process ID and transaction ID are in decimal, the -thread ID is in hexadecimal. The transaction ID is displayed as "-" -if the reader does not currently have a read transaction open. -If \fB\-rr\fP is given, check for stale entries in the reader -table and clear them. The reader table will be printed again -after the check is performed. -.TP -.BR \-a -Display the status of all of the subdatabases in the environment. -.TP -.BR \-s \ subdb -Display the status of a specific subdatabase. -.TP -.BR \-n -Display the status of an MDBX database which does not use subdirectories. -This is legacy option. For now MDBX handles this automatically -for existing databases, but may be required while creating new. - -.SH DIAGNOSTICS -Exit status is zero if no errors occur. -Errors result in a non-zero exit status and -a diagnostic message being written to standard error. -.SH "SEE ALSO" -.BR mdbx_chk (1), -.BR mdbx_copy (1), -.BR mdbx_dump (1), -.BR mdbx_load (1) -.SH AUTHOR -Howard Chu of Symas Corporation <http://www.symas.com>, -Leonid Yuriev <https://github.com/erthink> diff --git a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj index 7d7dc2e57d..af69c1e243 100644 --- a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj +++ b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj @@ -18,11 +18,6 @@ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\libs\libmdbx\libmdbx.vcxproj">
- <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project>
- </ProjectReference>
- </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>Dbx_mdbx</ProjectName>
<ProjectGuid>{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}</ProjectGuid>
@@ -31,6 +26,9 @@ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
<ItemGroup>
+ <ClCompile Include="src\libmdbx\mdbx.c">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="src\dbcheck.cpp" />
<ClCompile Include="src\dbcontacts.cpp" />
<ClCompile Include="src\dbcrypt.cpp" />
@@ -53,6 +51,9 @@ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>MDBX_TXN_CHECKOWNER=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
diff --git a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters index bf803e0949..6419345804 100644 --- a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters +++ b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj.filters @@ -32,6 +32,9 @@ <ClCompile Include="src\dbcheck.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\libs\libmdbx\src\mdbx.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\dbintf.h">
diff --git a/libs/libmdbx/src/CMakeLists.txt b/plugins/Dbx_mdbx/src/libmdbx/CMakeLists.txt index 46afa66fca..46afa66fca 100644 --- a/libs/libmdbx/src/CMakeLists.txt +++ b/plugins/Dbx_mdbx/src/libmdbx/CMakeLists.txt diff --git a/libs/libmdbx/src/ChangeLog.md b/plugins/Dbx_mdbx/src/libmdbx/ChangeLog.md index 50b911f5a7..50b911f5a7 100644 --- a/libs/libmdbx/src/ChangeLog.md +++ b/plugins/Dbx_mdbx/src/libmdbx/ChangeLog.md diff --git a/libs/libmdbx/src/GNUmakefile b/plugins/Dbx_mdbx/src/libmdbx/GNUmakefile index da781606ee..da781606ee 100644 --- a/libs/libmdbx/src/GNUmakefile +++ b/plugins/Dbx_mdbx/src/libmdbx/GNUmakefile diff --git a/libs/libmdbx/src/LICENSE b/plugins/Dbx_mdbx/src/libmdbx/LICENSE index 05ad7571e4..05ad7571e4 100644 --- a/libs/libmdbx/src/LICENSE +++ b/plugins/Dbx_mdbx/src/libmdbx/LICENSE diff --git a/libs/libmdbx/src/Makefile b/plugins/Dbx_mdbx/src/libmdbx/Makefile index bb4aa0531f..bb4aa0531f 100644 --- a/libs/libmdbx/src/Makefile +++ b/plugins/Dbx_mdbx/src/libmdbx/Makefile diff --git a/libs/libmdbx/src/README.md b/plugins/Dbx_mdbx/src/libmdbx/README.md index 66da37c454..66da37c454 100644 --- a/libs/libmdbx/src/README.md +++ b/plugins/Dbx_mdbx/src/libmdbx/README.md diff --git a/libs/libmdbx/src/VERSION b/plugins/Dbx_mdbx/src/libmdbx/VERSION index ad5a80ff3c..ad5a80ff3c 100644 --- a/libs/libmdbx/src/VERSION +++ b/plugins/Dbx_mdbx/src/libmdbx/VERSION diff --git a/libs/libmdbx/src/config.h.in b/plugins/Dbx_mdbx/src/libmdbx/config.h.in index bb3eea07b4..bb3eea07b4 100644 --- a/libs/libmdbx/src/config.h.in +++ b/plugins/Dbx_mdbx/src/libmdbx/config.h.in diff --git a/libs/libmdbx/src/mdbx.c b/plugins/Dbx_mdbx/src/libmdbx/mdbx.c index 6ceafe5097..6ceafe5097 100644 --- a/libs/libmdbx/src/mdbx.c +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx.c diff --git a/libs/libmdbx/src/mdbx.c++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx.c++ index e29b579cef..e29b579cef 100644 --- a/libs/libmdbx/src/mdbx.c++ +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx.c++ diff --git a/libs/libmdbx/src/mdbx.h b/plugins/Dbx_mdbx/src/libmdbx/mdbx.h index 9d7dba99e9..9d7dba99e9 100644 --- a/libs/libmdbx/src/mdbx.h +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx.h diff --git a/libs/libmdbx/src/mdbx.h++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx.h++ index 5ae3838aeb..5ae3838aeb 100644 --- a/libs/libmdbx/src/mdbx.h++ +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx.h++ diff --git a/libs/libmdbx/src/mdbx_chk.c b/plugins/Dbx_mdbx/src/libmdbx/mdbx_chk.c index a30003be28..a30003be28 100644 --- a/libs/libmdbx/src/mdbx_chk.c +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx_chk.c diff --git a/libs/libmdbx/src/mdbx_copy.c b/plugins/Dbx_mdbx/src/libmdbx/mdbx_copy.c index faec17ac15..faec17ac15 100644 --- a/libs/libmdbx/src/mdbx_copy.c +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx_copy.c diff --git a/libs/libmdbx/src/mdbx_dump.c b/plugins/Dbx_mdbx/src/libmdbx/mdbx_dump.c index abf82b0d7c..abf82b0d7c 100644 --- a/libs/libmdbx/src/mdbx_dump.c +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx_dump.c diff --git a/libs/libmdbx/src/mdbx_load.c b/plugins/Dbx_mdbx/src/libmdbx/mdbx_load.c index fc0021bf1c..fc0021bf1c 100644 --- a/libs/libmdbx/src/mdbx_load.c +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx_load.c diff --git a/libs/libmdbx/src/mdbx_stat.c b/plugins/Dbx_mdbx/src/libmdbx/mdbx_stat.c index 30e9e5cc29..30e9e5cc29 100644 --- a/libs/libmdbx/src/mdbx_stat.c +++ b/plugins/Dbx_mdbx/src/libmdbx/mdbx_stat.c diff --git a/libs/libmdbx/src/ntdll.def b/plugins/Dbx_mdbx/src/libmdbx/ntdll.def index f974ea6380..f974ea6380 100644 --- a/libs/libmdbx/src/ntdll.def +++ b/plugins/Dbx_mdbx/src/libmdbx/ntdll.def diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h index 5cf483183f..7c5f564922 100644 --- a/plugins/Dbx_mdbx/src/stdafx.h +++ b/plugins/Dbx_mdbx/src/stdafx.h @@ -52,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_gui.h>
#include <m_skin.h>
-#include "../../Libs/libmdbx/src/mdbx.h"
+#include "libmdbx/mdbx.h"
#ifndef thread_local
# define thread_local __declspec(thread)
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index af531456a0..7af4a7fa33 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -521,6 +521,11 @@ static renameTable[] = { L"dbtool.exe", nullptr },
{ L"dbtool_sa.exe", nullptr },
{ L"dbchecker.bat", nullptr },
+ { L"fixme.cmd", nullptr },
+ { L"libmdbx.mir", nullptr },
+ { L"mdbx_chk.exe", nullptr },
+ { L"mdbx_dump.exe", nullptr },
+ { L"mdbx_load.exe", nullptr },
{ L"clist_mw.dll", L"Plugins\\clist_nicer.dll" },
{ L"bclist.dll", L"Plugins\\clist_blind.dll" },
{ L"otr.dll", L"Plugins\\mirotr.dll" },
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt index b6af5f900f..44e9e22897 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt @@ -1,9 +1,4 @@ hashes.txt -fixme.cmd -libmdbx.mir -mdbx_chk.exe -mdbx_load.exe -mdbx_dump.exe miranda32.exe pu_stub.exe sendlog.exe diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt index 856f0c26a3..1d747d3f7f 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt @@ -1,9 +1,4 @@ hashes.txt -fixme.cmd -libmdbx.mir -mdbx_chk.exe -mdbx_dump.exe -mdbx_load.exe miranda64.exe pu_stub.exe sendlog.exe diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt index 84ede15342..e2a1e8466f 100644 --- a/tools/build_scripts/bin15/z3_PackArchives.txt +++ b/tools/build_scripts/bin15/z3_PackArchives.txt @@ -41,12 +41,7 @@ Libs\api-ms-win-crt-utility-l1-1-0.dll Libs\msvcp140.dll Libs\ucrtbase.dll Libs\vcruntime140.dll -fixme.cmd -libmdbx.mir mirandaboot.ini -mdbx_chk.exe -mdbx_load.exe -mdbx_dump.exe pu_stub.exe Core\StdAutoAway.dll Core\StdAway.dll diff --git a/tools/build_scripts/z2_PackPluginUpdater.txt b/tools/build_scripts/z2_PackPluginUpdater.txt index 6937b37c1c..8921772be4 100644 --- a/tools/build_scripts/z2_PackPluginUpdater.txt +++ b/tools/build_scripts/z2_PackPluginUpdater.txt @@ -70,9 +70,4 @@ Plugins\DbChecker.dll Plugins\Dbx_mdbx.dll Plugins\Dbx_sqlite.dll Plugins\Dummy.dll -Plugins\Import.dll -fixme.cmd -libmdbx.mir -mdbx_chk.exe -mdbx_load.exe -mdbx_dump.exe
\ No newline at end of file +Plugins\Import.dll
\ No newline at end of file diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index 41355f334f..6ec06c7787 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -65,7 +65,6 @@ Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: cli ; Core and core modules
Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\libmdbx.mir"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\*.dll"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\FreeImage.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\libcrypto-1_1.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
@@ -127,10 +126,6 @@ Source: "Files\Plugins\Scriver.dll"; DestDir: "{app}\Plugins"; Components: messa ; DB drivers
Source: "Files\Plugins\Dbx_mdbx.dll"; DestDir: "{app}\Plugins"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\Dbx_sqlite.dll"; DestDir: "{app}\Plugins"; Components: dbx_sqlite; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\fixme.cmd"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\mdbx_chk.exe"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\mdbx_dump.exe"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\mdbx_load.exe"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
; Config files
Source: "Files\Settings\mirandaboot_default.ini"; DestDir: "{app}"; Components: program; DestName: "mirandaboot.ini"; Check: IsDefault(); Flags: ignoreversion onlyifdoesntexist; AfterInstall: ShowPercent()
diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss index c9235cd50b..fc02572c0e 100644 --- a/tools/installer_ng_stable/MirandaNG.iss +++ b/tools/installer_ng_stable/MirandaNG.iss @@ -65,7 +65,6 @@ Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: cli ; Core and core modules
Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\libmdbx.mir"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\*.dll"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\FreeImage.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Libs\libcrypto-1_1.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
@@ -127,10 +126,6 @@ Source: "Files\Plugins\Scriver.dll"; DestDir: "{app}\Plugins"; Components: messa ; DB drivers
Source: "Files\Plugins\Dbx_mdbx.dll"; DestDir: "{app}\Plugins"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\Dbx_sqlite.dll"; DestDir: "{app}\Plugins"; Components: dbx_sqlite; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\fixme.cmd"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\mdbx_chk.exe"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\mdbx_dump.exe"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
-Source: "Files\mdbx_load.exe"; DestDir: "{app}"; Components: dbx_mdbx; Flags: ignoreversion; AfterInstall: ShowPercent()
; Config files
Source: "Files\Settings\mirandaboot_default.ini"; DestDir: "{app}"; Components: program; DestName: "mirandaboot.ini"; Check: IsDefault(); Flags: ignoreversion onlyifdoesntexist; AfterInstall: ShowPercent()
|