Merge pull request #43 from adrianosantostreina/develop

Develop

.gitignore

@@ -74,3 +74,13 @@ Samples/# Default Sample/iOSDevice64/Debug/DefaultSample
 Samples/# Default Sample/iOSSimARM64/Debug/DefaultSample
 Samples/Linux/horse/bin/HorseLinux_MultiLog4D
 Samples/FMX/GUI/Linux64/Debug/GUI_MultiLog4D
+Samples/macOS/bin/macOS_MultiLog4D
+Samples/macOS/bin/macOS_MultiLog4D.dSYM
+Samples/macOS/bin/macOS_MultiLog4D.entitlements
+Samples/macOS/bin/macOS_MultiLog4D.info.plist
+Samples/macOS/libsystem_trace.dylib
+Samples/Linux/GUI/Linux64/Debug/GUI_Linux_MultiLog4D
+Samples/Linux/GUI/Linux64/Debug/GUI_MultiLog4D
+Samples/FMX/iOS/iOSDevice64/Debug/iOS_MultiLog4D
+Samples/FMX/iOS/iOSDevice64/Debug/iOS_MultiLog4D.dSYM
+Samples/VCL/desktop/bin/Log/Log.txt

MultiLog4D.groupproj

@@ -27,7 +27,10 @@
         <Projects Include="Samples\Linux\horse\HorseLinux_MultiLog4D.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Samples\FMX\GUI\GUI_MultiLog4D.dproj">
+        <Projects Include="Samples\Linux\GUI\GUI_Linux_MultiLog4D.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Samples\macOS\macOS_MultiLog4D.dproj">
             <Dependencies/>
         </Projects>
     </ItemGroup>
@@ -110,23 +113,32 @@
     <Target Name="HorseLinux_MultiLog4D:Make">
         <MSBuild Projects="Samples\Linux\horse\HorseLinux_MultiLog4D.dproj" Targets="Make"/>
     </Target>
-    <Target Name="GUI_MultiLog4D">
-        <MSBuild Projects="Samples\FMX\GUI\GUI_MultiLog4D.dproj"/>
+    <Target Name="GUI_Linux_MultiLog4D">
+        <MSBuild Projects="Samples\Linux\GUI\GUI_Linux_MultiLog4D.dproj"/>
+    </Target>
+    <Target Name="GUI_Linux_MultiLog4D:Clean">
+        <MSBuild Projects="Samples\Linux\GUI\GUI_Linux_MultiLog4D.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="GUI_Linux_MultiLog4D:Make">
+        <MSBuild Projects="Samples\Linux\GUI\GUI_Linux_MultiLog4D.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="macOS_MultiLog4D">
+        <MSBuild Projects="Samples\macOS\macOS_MultiLog4D.dproj"/>
     </Target>
-    <Target Name="GUI_MultiLog4D:Clean">
-        <MSBuild Projects="Samples\FMX\GUI\GUI_MultiLog4D.dproj" Targets="Clean"/>
+    <Target Name="macOS_MultiLog4D:Clean">
+        <MSBuild Projects="Samples\macOS\macOS_MultiLog4D.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="GUI_MultiLog4D:Make">
-        <MSBuild Projects="Samples\FMX\GUI\GUI_MultiLog4D.dproj" Targets="Make"/>
+    <Target Name="macOS_MultiLog4D:Make">
+        <MSBuild Projects="Samples\macOS\macOS_MultiLog4D.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="DefaultSample;Android_MultiLog4D;iOS_MultiLog4D;Horse_MultiLog4D;Console_MultiLog4D;VCL_MultiLog4D;Service_MultiLog4D;HorseLinux_MultiLog4D;GUI_MultiLog4D"/>
+        <CallTarget Targets="DefaultSample;Android_MultiLog4D;iOS_MultiLog4D;Horse_MultiLog4D;Console_MultiLog4D;VCL_MultiLog4D;Service_MultiLog4D;HorseLinux_MultiLog4D;GUI_Linux_MultiLog4D;macOS_MultiLog4D"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="DefaultSample:Clean;Android_MultiLog4D:Clean;iOS_MultiLog4D:Clean;Horse_MultiLog4D:Clean;Console_MultiLog4D:Clean;VCL_MultiLog4D:Clean;Service_MultiLog4D:Clean;HorseLinux_MultiLog4D:Clean;GUI_MultiLog4D:Clean"/>
+        <CallTarget Targets="DefaultSample:Clean;Android_MultiLog4D:Clean;iOS_MultiLog4D:Clean;Horse_MultiLog4D:Clean;Console_MultiLog4D:Clean;VCL_MultiLog4D:Clean;Service_MultiLog4D:Clean;HorseLinux_MultiLog4D:Clean;GUI_Linux_MultiLog4D:Clean;macOS_MultiLog4D:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="DefaultSample:Make;Android_MultiLog4D:Make;iOS_MultiLog4D:Make;Horse_MultiLog4D:Make;Console_MultiLog4D:Make;VCL_MultiLog4D:Make;Service_MultiLog4D:Make;HorseLinux_MultiLog4D:Make;GUI_MultiLog4D:Make"/>
+        <CallTarget Targets="DefaultSample:Make;Android_MultiLog4D:Make;iOS_MultiLog4D:Make;Horse_MultiLog4D:Make;Console_MultiLog4D:Make;VCL_MultiLog4D:Make;Service_MultiLog4D:Make;HorseLinux_MultiLog4D:Make;GUI_Linux_MultiLog4D:Make;macOS_MultiLog4D:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Samples/# Default Sample/DefaultSample.dproj

@@ -356,6 +356,9 @@
         <Android_DarkBackgroundColor>#000000</Android_DarkBackgroundColor>
         <IncludeAndroid_NotificationAccentColor>false</IncludeAndroid_NotificationAccentColor>
         <IncludeAndroid_VectorizedNotificationIcon>true</IncludeAndroid_VectorizedNotificationIcon>
+        <DCC_ExeOutput>.\bin</DCC_ExeOutput>
+        <DCC_DcuOutput>.\dcu</DCC_DcuOutput>
+        <DCC_UnitSearchPath>..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>

Samples/FMX/GUI/GUI_MultiLog4D.dpr → Samples/Linux/GUI/GUI_Linux_MultiLog4D.dpr

@@ -1,4 +1,4 @@
-program GUI_MultiLog4D;
+program GUI_Linux_MultiLog4D;
 
 uses
   MultiLog4D.Util,

Samples/FMX/GUI/GUI_MultiLog4D.dproj → Samples/Linux/GUI/GUI_Linux_MultiLog4D.dproj

@@ -8,7 +8,7 @@
         <Platform Condition="'$(Platform)'==''">Linux64</Platform>
         <TargetedPlatforms>693395</TargetedPlatforms>
         <AppType>Application</AppType>
-        <MainSource>GUI_MultiLog4D.dpr</MainSource>
+        <MainSource>GUI_Linux_MultiLog4D.dpr</MainSource>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -117,7 +117,7 @@
         <AUP_READ_PHONE_STATE>true</AUP_READ_PHONE_STATE>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
         <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
-        <SanitizedProjectName>GUI_MultiLog4D</SanitizedProjectName>
+        <SanitizedProjectName>GUI_Linux_MultiLog4D</SanitizedProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
         <DCC_UsePackage>SampleListViewMultiDetailAppearancePackage;fmx;DbxCommonDriver;bindengine;IndyIPCommon;emsclient;IndyProtocols;dbxcds;FmxTeeUI;FireDACSqliteDriver;DbxClientDriver;soapmidas;dbexpress;inet;FireDACDBXDriver;CustomIPTransport;ZCore;ZParseSql;IndySystem;FireDACCommon;ZComponent;bindcompdbx;rtl;DBXSqliteDriver;DataSnapFireDAC;FireDAC;xmlrtl;dsnap;DataSnapNativeClient;WindowsToast;FireDACCommonDriver;IndyIPClient;bindcompfmx;fmxFireDAC;DataSnapCommon;fmxase;dbrtl;DBXInterBaseDriver;GridSystem;MaterialDesign;Hermes;bindcomp;IndyCore;RESTBackendComponents;ZPlain;RESTComponents;IndyIPServer;dsnapxml;DataSnapClient;DataSnapProviderClient;FMX.Material;emsclientfiredac;FireDACDSDriver;tethering;FiremonkeyNetworkState;ZDbc;CloudService;FMXTee;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
@@ -339,7 +339,7 @@
         <BorlandProject>
             <Delphi.Personality>
                 <Source>
-                    <Source Name="MainSource">GUI_MultiLog4D.dpr</Source>
+                    <Source Name="MainSource">GUI_Linux_MultiLog4D.dpr</Source>
                 </Source>
                 <Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
@@ -362,15 +362,15 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Linux64\Debug\GUI_MultiLog4D" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="Linux64\Debug\GUI_Linux_MultiLog4D" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Linux64">
-                        <RemoteName>GUI_MultiLog4D</RemoteName>
+                        <RemoteName>GUI_Linux_MultiLog4D</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Win32\Debug\GUI_MultiLog4D.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="Win32\Debug\GUI_Linux_MultiLog4D.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
-                        <RemoteName>GUI_MultiLog4D.exe</RemoteName>
+                        <RemoteName>GUI_Linux_MultiLog4D.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>

Samples/FMX/GUI/Unit4.fmx → Samples/Linux/GUI/Unit4.fmx

@@ -27,25 +27,25 @@ object Form4: TForm4
     object rbInformation: TRadioButton
       Position.X = 16.000000000000000000
       Position.Y = 24.000000000000000000
-      TabOrder = 38
+      TabOrder = 37
       Text = 'Information'
     end
     object rbWarning: TRadioButton
       Position.X = 16.000000000000000000
       Position.Y = 50.000000000000000000
-      TabOrder = 39
+      TabOrder = 38
       Text = 'Warning'
     end
     object rbFatalError: TRadioButton
       Position.X = 16.000000000000000000
       Position.Y = 104.000000000000000000
-      TabOrder = 40
+      TabOrder = 39
       Text = 'FatalError'
     end
     object rbError: TRadioButton
       Position.X = 16.000000000000000000
       Position.Y = 77.000000000000000000
-      TabOrder = 41
+      TabOrder = 40
       Text = 'Error'
     end
   end

Samples/FMX/GUI/Unit4.pas → Samples/Linux/GUI/Unit4.pas

@@ -6,9 +6,21 @@ interface
   MultiLog4D.Util,
   MultiLog4D.Types,
 
-  System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants,
-  FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, UI.Standard, UI.Edit, UI.Base,
-  FMX.Controls.Presentation, FMX.StdCtrls;
+  System.SysUtils,
+  System.Types,
+  System.UITypes,
+  System.Classes,
+  System.Variants,
+  FMX.Types,
+  FMX.Controls,
+  FMX.Forms,
+  FMX.Graphics,
+  FMX.Dialogs,
+  UI.Standard,
+  UI.Edit,
+  UI.Base,
+  FMX.Controls.Presentation,
+  FMX.StdCtrls;
 
 type
   TForm4 = class(TForm)
@@ -40,10 +52,11 @@ implementation
 
 {$R *.fmx}
 
+
 procedure TForm4.Button1Click(Sender: TObject);
 var
-  LStrTypeMsg : string;
-  LTypeMsg : TLogType; //Uses MultiLog4D.Types
+  LStrTypeMsg: string;
+  LTypeMsg: TLogType; // Uses MultiLog4D.Types
 begin
   if rbInformation.IsChecked then
   begin
@@ -67,8 +80,8 @@ procedure TForm4.Button1Click(Sender: TObject);
   end;
 
   TMultiLog4DUtil
-   .Logger
-   .LogWrite(Format('LogWrite Type: %s', [LStrTypeMsg]), LTypeMsg);
+    .Logger
+    .LogWrite(Format('LogWrite Type: %s', [LStrTypeMsg]), LTypeMsg);
 end;
 
 procedure TForm4.Button2Click(Sender: TObject);

Samples/VCL/desktop/Unit1.dfm

@@ -2,7 +2,7 @@ object Form3: TForm3
   Left = 0
   Top = 0
   Caption = 'MultiLog4D'
-  ClientHeight = 322
+  ClientHeight = 454
   ClientWidth = 398
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -92,4 +92,34 @@ object Form3: TForm3
     TabOrder = 6
     OnClick = RadioGroup2Click
   end
+  object GroupBox1: TGroupBox
+    Left = 8
+    Top = 311
+    Width = 382
+    Height = 122
+    Caption = 'Settings'
+    TabOrder = 7
+    object lbleditDateTimeFormat: TLabeledEdit
+      Left = 11
+      Top = 40
+      Width = 358
+      Height = 23
+      EditLabel.Width = 91
+      EditLabel.Height = 15
+      EditLabel.Caption = 'DateTime Format'
+      TabOrder = 0
+      Text = 'YYYY-MM-DD hh:nn:ss'
+    end
+    object lbleditLogFormat: TLabeledEdit
+      Left = 11
+      Top = 88
+      Width = 358
+      Height = 23
+      EditLabel.Width = 61
+      EditLabel.Height = 15
+      EditLabel.Caption = 'Log Format'
+      TabOrder = 1
+      Text = '${time} ${username} ${eventid} [${log_type}] - ${message}'
+    end
+  end
 end

Samples/VCL/desktop/Unit1.pas

@@ -15,7 +15,7 @@ interface
   Vcl.Forms,
   Vcl.Dialogs,
   Vcl.StdCtrls,
-  Vcl.ExtCtrls;
+  Vcl.ExtCtrls, Vcl.Mask;
 
 type
   TForm3 = class(TForm)
@@ -27,6 +27,9 @@   TForm3 = class(TForm)
     Button5: TButton;
     Bevel1: TBevel;
     RadioGroup2: TRadioGroup;
+    GroupBox1: TGroupBox;
+    lbleditDateTimeFormat: TLabeledEdit;
+    lbleditLogFormat: TLabeledEdit;
     procedure Button1Click(Sender: TObject);
     procedure Button2Click(Sender: TObject);
     procedure Button3Click(Sender: TObject);
@@ -79,6 +82,10 @@ procedure TForm3.Button1Click(Sender: TObject);
   TMultiLog4DUtil
    .Logger
    .Output(FOutputLog)
+   .SetLogFormat(lbleditLogFormat.Text) //Mask Format
+   .SetDateTimeFormat(lbleditDateTimeFormat.Text) //Format DateTime
+   .UserName('adrianosantos')
+   .EventID(Random(1000))
    .LogWrite(Format('LogWrite Type: %s', [LStrTypeMsg]), LTypeMsg);
 
   ShowMessage(Format('LogWrite Type: %s', [LStrTypeMsg]));
@@ -89,6 +96,10 @@ procedure TForm3.Button2Click(Sender: TObject);
   TMultiLog4DUtil
    .Logger
    .Output(FOutputLog)
+   .SetLogFormat(lbleditLogFormat.Text) //Mask Format
+   .SetDateTimeFormat(lbleditDateTimeFormat.Text) //Format DateTime
+   .UserName('adrianosantos')
+   .EventID(1000)
    .LogWriteInformation('LogWrite Type Information');
 
   ShowMessage('LogWrite Type Information');
@@ -99,6 +110,10 @@ procedure TForm3.Button3Click(Sender: TObject);
   TMultiLog4DUtil
    .Logger
    .Output(FOutputLog)
+   .SetLogFormat(lbleditLogFormat.Text) //Mask Format
+   .SetDateTimeFormat(lbleditDateTimeFormat.Text) //Format DateTime
+   .UserName('adrianosantos')
+   .EventID(1000)
    .LogWriteInformation('LogWrite Type Warning');
 
   ShowMessage('LogWrite Type Warning');
@@ -109,6 +124,10 @@ procedure TForm3.Button4Click(Sender: TObject);
   TMultiLog4DUtil
    .Logger
    .Output(FOutputLog)
+   .SetLogFormat(lbleditLogFormat.Text) //Mask Format
+   .SetDateTimeFormat(lbleditDateTimeFormat.Text) //Format DateTime
+   .UserName('adrianosantos')
+   .EventID(1000)
    .LogWriteInformation('LogWrite Type Error');
 
   ShowMessage('LogWrite Type Error');
@@ -119,6 +138,10 @@ procedure TForm3.Button5Click(Sender: TObject);
   TMultiLog4DUtil
    .Logger
    .Output(FOutputLog)
+   .SetLogFormat(lbleditLogFormat.Text) //Mask Format
+   .SetDateTimeFormat(lbleditDateTimeFormat.Text) //Format DateTime
+   .UserName('adrianosantos')
+   .EventID(Random(1000))
    .LogWriteInformation('LogWrite Type Fatal Error');
 
   ShowMessage('LogWrite Type Fatal Error');

Samples/VCL/desktop/VCL_MultiLog4D.dpr

@@ -21,6 +21,8 @@ begin
     .Logger
     .Tag('MultiLog4D')
     .FileName(TPath.Combine(LOutputLogPath, 'Log.txt'))
+    .UserName('adrianosantos')
+    .EventID(1)
     .LogWriteInformation('>>>>>>>>>> Starting <<<<<<<<<<');
 
   Application.Initialize;

Samples/macOS/Entitlement.TemplateOSX.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<%appSandboxKeys%>
+</dict>
+</plist>