diff --git a/LOGGERPRO-BUILD-TIMESTAMP.TXT b/LOGGERPRO-BUILD-TIMESTAMP.TXT index 6985ca3..009d6a8 100644 --- a/LOGGERPRO-BUILD-TIMESTAMP.TXT +++ b/LOGGERPRO-BUILD-TIMESTAMP.TXT @@ -1 +1 @@ -09/01/2019 9:28:42 +13/04/2019 11:02:52 diff --git a/VERSION.TXT b/VERSION.TXT index 8a6a60b..68fc0b6 100644 --- a/VERSION.TXT +++ b/VERSION.TXT @@ -1,2 +1,2 @@ -VERSION 1_3_1 -BUILD DATETIME 2019-01-09T09:28:42.304694 +VERSION v1.3.2 +BUILD DATETIME 2019-04-13T11:02:52.318668 diff --git a/dodo.py b/dodo.py index a558891..8ed42e3 100644 --- a/dodo.py +++ b/dodo.py @@ -24,11 +24,11 @@ ('samples\\60_logging_inside_dll\\MainProgram.dproj','Win32'), ('samples\\60_logging_inside_dll\\mydll.dproj','Win32'), ('samples\\70_isapi_sample\\loggerproisapisample.dproj','Win32'), - ('samples\\90_remote_logging_with_redis\\RemoteRedisAppenderSample.dproj','Win32'), - ('samples\\90_remote_logging_with_redis\\redis_logs_viewer\\RedisLogsViewer.dproj','Win32'), + ('samples\\90_remote_logging_with_redis\\REDISAppenderSample.dproj','Win32'), + ('samples\\90_remote_logging_with_redis\\redis_logs_viewer\\REDISLogsViewer.dproj','Win32'), ('samples\\100_udp_syslog\\udp_syslog.dproj','Win32'), ('samples\\110_rest_appender\RESTAppenderSample.dproj','Win32'), - ('samples\\110_rest_appender_mobile\MobileRESTAppenderSample.dproj','Android'), + ('samples\\110_rest_appender_mobile\RESTAppenderMobileSample.dproj','Android'), ('samples\\120_elastic_search_appender\\ElasticSearchAppenderSample.dproj','Win32'), ('samples\\rest_logs_collector\RESTLogsCollector.dproj','Win32') ] diff --git a/samples/110_rest_appender_mobile/Android/Debug/AndroidManifest.xml b/samples/110_rest_appender_mobile/Android/Debug/AndroidManifest.xml new file mode 100644 index 0000000..b9901b4 --- /dev/null +++ b/samples/110_rest_appender_mobile/Android/Debug/AndroidManifest.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/90_remote_logging_with_redis/RemoteRedisAppenderSample.dpr b/samples/90_remote_logging_with_redis/REDISAppenderSample.dpr similarity index 90% rename from samples/90_remote_logging_with_redis/RemoteRedisAppenderSample.dpr rename to samples/90_remote_logging_with_redis/REDISAppenderSample.dpr index be4a3f8..d9fd562 100644 --- a/samples/90_remote_logging_with_redis/RemoteRedisAppenderSample.dpr +++ b/samples/90_remote_logging_with_redis/REDISAppenderSample.dpr @@ -1,4 +1,4 @@ -program RemoteRedisAppenderSample; +program REDISAppenderSample; uses Vcl.Forms, diff --git a/samples/90_remote_logging_with_redis/RemoteRedisAppenderSample.dproj b/samples/90_remote_logging_with_redis/REDISAppenderSample.dproj similarity index 89% rename from samples/90_remote_logging_with_redis/RemoteRedisAppenderSample.dproj rename to samples/90_remote_logging_with_redis/REDISAppenderSample.dproj index 6f74edc..08abe28 100644 --- a/samples/90_remote_logging_with_redis/RemoteRedisAppenderSample.dproj +++ b/samples/90_remote_logging_with_redis/REDISAppenderSample.dproj @@ -1,9 +1,9 @@  - {3EC88B82-7B27-4D69-8E7E-632D33F11C42} - 18.2 + {48FD3533-AD48-4DE8-9F28-77C93385E6B1} + 18.6 VCL - RemoteRedisAppenderSample.dpr + REDISAppenderSample.dpr True Debug Win32 @@ -47,7 +47,7 @@ System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) - RemoteRedisAppenderSample + REDISAppenderSample $(BDS)\bin\delphi_PROJECTICON.ico .\$(Platform)\$(Config) .\$(Platform)\$(Config) @@ -84,10 +84,12 @@ Debug 1033 - true true true false + PerMonitor + ..\..\..\delphiredisclient\sources;$(DCC_UnitSearchPath) + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) false @@ -96,8 +98,8 @@ 0 - true true + PerMonitor @@ -127,77 +129,92 @@ - RemoteRedisAppenderSample.dpr + REDISAppenderSample.dpr - Embarcadero C++Builder Office 2000 Servers Package - Embarcadero C++Builder Office XP Servers Package - Microsoft Office 2000 Sample Automation Server Wrapper Components + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components - + - RemoteRedisAppenderSample.exe + REDISAppenderSample.exe true - - - 0 - .dll;.bpl - - + + 1 - .dylib Contents\MacOS 1 - .dylib - + + 0 + + + + + classes 1 - .dylib - + + + + res\xml 1 - .dylib - - - Contents\Resources + + + library\lib\armeabi-v7a 1 - + - classes + library\lib\armeabi 1 - - - Contents\MacOS - 0 + + + library\lib\mips + 1 - + + + + + library\lib\armeabi-v7a 1 - - Contents\MacOS + + + + res\drawable 1 - - + + + res\values 1 - + + + + res\values-v21 1 - + + + + res\drawable 1 @@ -207,346 +224,384 @@ 1 - + - library\lib\mips + res\drawable-ldpi 1 - - + + + res\drawable-mdpi 1 - + + + + res\drawable-hdpi 1 - - 0 + + + + res\drawable-xhdpi + 1 - + + + + res\drawable-small 1 - - Contents\MacOS + + + + res\drawable-normal 1 + + - library\lib\armeabi-v7a + res\drawable-large 1 - + + + + res\drawable-xlarge 1 - + + + 1 + + + Contents\MacOS + 1 + 0 + + Contents\MacOS 1 .framework - - - + + Contents\MacOS 1 + .framework - - 1 + + 0 - - + + 1 + .dylib 1 + .dylib - - 1 - - - 1 + .dylib - + + Contents\MacOS 1 + .dylib - + + Contents\MacOS 1 + .dylib + + + 0 + .dll;.bpl - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + 1 + .dylib - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + .dylib - - - 1 + .dylib - + + Contents\MacOS 1 + .dylib - + + Contents\MacOS 1 + .dylib + + + 0 + .bpl - - - 1 + + + 0 + + + 0 - 1 + 0 - - 1 + + 0 - - - - library\lib\armeabi - 1 + + Contents\Resources\StartUp\ + 0 + + + Contents\Resources\StartUp\ + 0 - - 0 - + + + 1 - - Contents\MacOS + + 1 + + 1 - + 1 1 - + 1 - - - res\drawable-normal + + 1 - - - - res\drawable-xhdpi + 1 - - - - res\drawable-large + 1 - - + + 1 1 - + 1 - - - Assets + + 1 - - Assets + + 1 + + 1 - + + + 1 + - ..\ 1 - - ..\ + 1 - - - res\drawable-hdpi + + 1 - - - - library\lib\armeabi-v7a + 1 - - - - Contents + 1 - - - ..\ + + 1 - - - Assets + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - Assets + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - + + 1 1 + + + ..\ 1 - - - - res\values + + ..\ 1 - - - res\drawable-small + + 1 - - - - res\drawable + + 1 + + 1 - + 1 1 - + 1 - - + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - res\drawable + + + ..\ 1 - - - - 0 - - - 0 + + ..\ + 1 + + - Contents\Resources\StartUp\ - 0 + Contents + 1 - - 0 + + Contents + 1 - - 0 + + + + Contents\Resources + 1 - - 0 + + Contents\Resources + 1 - + library\lib\armeabi-v7a 1 - - - - 0 - .bpl + + 1 1 - .dylib + + + 1 + + + 1 Contents\MacOS 1 - .dylib - + + Contents\MacOS 1 - .dylib - - 1 - .dylib + + 0 - - - res\drawable-mdpi + + 1 - - - - res\drawable-xlarge + 1 - - - res\drawable-ldpi + + + Assets + 1 + + + Assets 1 - - + + + Assets 1 - + + Assets 1 @@ -557,6 +612,7 @@ + diff --git a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dpr b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dpr index 9fe07d1..7c718ca 100644 --- a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dpr +++ b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dpr @@ -1,4 +1,4 @@ -program RedisLogsViewer; +program REDISLogsViewer; uses Vcl.Forms, diff --git a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dproj b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dproj index ed30639..2cb6482 100644 --- a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dproj +++ b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.dproj @@ -1,13 +1,13 @@  {0BE5E328-2DC7-416B-9C68-58DFC8223C46} - RedisLogsViewer.dpr + REDISLogsViewer.dpr True Debug 1025 Application VCL - 18.2 + 18.6 Win32 @@ -55,7 +55,7 @@ Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) false 00400000 - RedisLogsViewer + REDISLogsViewer false false CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= @@ -85,7 +85,7 @@ true - true + PerMonitor true @@ -102,7 +102,8 @@ CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) Debug true - true + PerMonitor + ..\..\..\..\delphiredisclient\sources;$(DCC_UnitSearchPath) @@ -129,13 +130,13 @@ - RedisLogsViewer.dpr + REDISLogsViewer.dpr - Embarcadero C++Builder Office 2000 Servers Package - Embarcadero C++Builder Office XP Servers Package - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components @@ -144,25 +145,23 @@ False - + - RedisLogsViewer.exe + REDISLogsViewer.exe true - - - 1 - - + + 1 - - - Contents\Resources + Contents\MacOS 1 + + 0 + @@ -170,391 +169,445 @@ 1 - - - Contents\MacOS - 0 - - + + + res\xml 1 - - Contents\MacOS + + + + library\lib\armeabi-v7a 1 - - + + + library\lib\armeabi 1 - + + + + library\lib\mips 1 - + + + + library\lib\armeabi-v7a 1 - + - res\drawable-xxhdpi + res\drawable 1 - + - library\lib\mips + res\values 1 - - + + + res\values-v21 1 - + + + + res\drawable 1 - - 0 + + + + res\drawable-xxhdpi + 1 - + + + + res\drawable-ldpi 1 - - Contents\MacOS + + + + res\drawable-mdpi 1 + + - library\lib\armeabi-v7a + res\drawable-hdpi 1 - + + + + res\drawable-xhdpi 1 - - - 0 + + + res\drawable-small + 1 - - Contents\MacOS + + + + res\drawable-normal 1 - .framework - - + + + res\drawable-large 1 - + + + + res\drawable-xlarge 1 - + 1 - + + Contents\MacOS 1 - - 1 + + 0 - - + + + Contents\MacOS 1 + .framework - + + Contents\MacOS 1 + .framework + + + 0 + + 1 + .dylib - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 + .dylib - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + .dylib - - - + + Contents\MacOS 1 + .dylib - + + Contents\MacOS 1 + .dylib + + 0 + .dll;.bpl + + + 1 + .dylib + + + 1 + .dylib - - 1 + .dylib - + + Contents\MacOS 1 + .dylib - + + Contents\MacOS 1 + .dylib + + + 0 + .bpl - + - library\lib\armeabi - 1 + 0 - - - + + 0 + + 0 - 1 + 0 - Contents\MacOS + Contents\Resources\StartUp\ + 0 + + + Contents\Resources\StartUp\ + 0 + + + 0 + + + + + 1 + + + 1 + + 1 - + 1 1 - + 1 - - - res\drawable-normal + + 1 - - - - res\drawable-xhdpi + 1 - - - - res\drawable-large + 1 - - + + 1 1 - + 1 - - - Assets + + 1 - - Assets + + 1 + + 1 - + + + 1 + - ..\ 1 - - ..\ + 1 - - - res\drawable-hdpi + + 1 - - - - library\lib\armeabi-v7a + 1 - - - - Contents + 1 - - - ..\ + + 1 - - - Assets + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - Assets + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - + + 1 1 + + + ..\ 1 - - - - res\values + + ..\ 1 - - - res\drawable-small + + 1 - - - - res\drawable + + 1 + + 1 - + 1 1 - + 1 - - + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - res\drawable + + + ..\ 1 - - - - 0 - - - 0 + + ..\ + 1 + + - Contents\Resources\StartUp\ - 0 + Contents + 1 - - 0 + + Contents + 1 - - 0 + + + + Contents\Resources + 1 - - 0 + + Contents\Resources + 1 - + library\lib\armeabi-v7a 1 - - - - 0 - .bpl + + 1 1 - .dylib - - Contents\MacOS + 1 - .dylib - + 1 - .dylib - + + Contents\MacOS 1 - .dylib - - - - res\drawable-mdpi + + Contents\MacOS 1 + + 0 + - - - res\drawable-xlarge + + 1 - - - - res\drawable-ldpi + 1 - + - 0 - .dll;.bpl - - + Assets 1 - .dylib - - Contents\MacOS + + Assets 1 - .dylib - + + + + Assets 1 - .dylib - + + Assets 1 - .dylib @@ -564,6 +617,7 @@ + diff --git a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.res b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.res index 714ba47..22f47f7 100644 Binary files a/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.res and b/samples/90_remote_logging_with_redis/redis_logs_viewer/RedisLogsViewer.res differ diff --git a/samples/SampleLoggerGroup.groupproj b/samples/SampleLoggerGroup.groupproj index b836636..d4827f0 100644 --- a/samples/SampleLoggerGroup.groupproj +++ b/samples/SampleLoggerGroup.groupproj @@ -39,6 +39,12 @@ + + + + + + Default.Personality.12 @@ -155,14 +161,32 @@ + + + + + + + + + + + + + + + + + + - + - + - +