From 06734475e97a7d8645ec625cd8c83de6dd0210cf Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Thu, 6 Jul 2017 16:58:29 +0200 Subject: [PATCH] Support for Delphi 10.2 Tokyo Added packages Changed deprecated Stream.Seek to Stream.Position --- .gitignore | 14 +- Packages/D10/X2Log.dpk | 63 + Packages/D10/X2Log.dproj | 187 + Packages/{X2LogDXE2.res => D10/X2Log.res} | Bin Packages/D10/X2Log.stat | 10 + Packages/D10/X2LogForms.dpk | 42 + Packages/D10/X2LogForms.dproj | 185 + .../X2LogForms.res} | Bin Packages/D10/X2LogForms.stat | 10 + Packages/D10/X2LogGroup.groupproj | 72 + Packages/D10/X2LogJson.dpk | 41 + Packages/D10/X2LogJson.dproj | 592 ++ .../{X2LogJsonDXE2.res => D10/X2LogJson.res} | Bin Packages/D10/X2LogJson.stat | 10 + Packages/D10/X2LogMadExcept.dpk | 43 + Packages/D10/X2LogMadExcept.dproj | 569 ++ .../X2LogMadExcept.res} | Bin Packages/D10/X2LogMadExcept.stat | 10 + Packages/DXE2/X2LogDXE2.dpk | 62 + Packages/{ => DXE2}/X2LogDXE2.dproj | 44 +- Packages/DXE2/X2LogDXE2.res | Bin 0 -> 448 bytes Packages/{ => DXE2}/X2LogDXE2Group.groupproj | 0 Packages/{ => DXE2}/X2LogFormsDXE2.dpk | 2 +- Packages/{ => DXE2}/X2LogFormsDXE2.dproj | 2 +- Packages/DXE2/X2LogFormsDXE2.res | Bin 0 -> 448 bytes Packages/{ => DXE2}/X2LogJsonDXE2.dpk | 79 +- Packages/{ => DXE2}/X2LogJsonDXE2.dproj | 375 +- Packages/DXE2/X2LogJsonDXE2.res | Bin 0 -> 448 bytes Packages/{ => DXE2}/X2LogMadExceptDXE2.dpk | 2 +- Packages/{ => DXE2}/X2LogMadExceptDXE2.dproj | 2 +- Packages/DXE2/X2LogMadExceptDXE2.res | Bin 0 -> 448 bytes Packages/X2LogDXE2.dpk | 62 - X2Log.Client.NamedPipe.pas | 2 +- X2Log.Details.Default.pas | 2 +- X2Log.Intf.NamedPipe.pas | 74 +- X2Log.JsonDataObjects.pas | 7904 +++++++++++++++++ X2Log.TextFormatter.Default.pas | 156 +- X2Log.TextFormatter.Intf.pas | 40 +- X2Log.TextFormatter.Json.pas | 254 +- 39 files changed, 10325 insertions(+), 585 deletions(-) create mode 100644 Packages/D10/X2Log.dpk create mode 100644 Packages/D10/X2Log.dproj rename Packages/{X2LogDXE2.res => D10/X2Log.res} (100%) create mode 100644 Packages/D10/X2Log.stat create mode 100644 Packages/D10/X2LogForms.dpk create mode 100644 Packages/D10/X2LogForms.dproj rename Packages/{X2LogFormsDXE2.res => D10/X2LogForms.res} (100%) create mode 100644 Packages/D10/X2LogForms.stat create mode 100644 Packages/D10/X2LogGroup.groupproj create mode 100644 Packages/D10/X2LogJson.dpk create mode 100644 Packages/D10/X2LogJson.dproj rename Packages/{X2LogJsonDXE2.res => D10/X2LogJson.res} (100%) create mode 100644 Packages/D10/X2LogJson.stat create mode 100644 Packages/D10/X2LogMadExcept.dpk create mode 100644 Packages/D10/X2LogMadExcept.dproj rename Packages/{X2LogMadExceptDXE2.res => D10/X2LogMadExcept.res} (100%) create mode 100644 Packages/D10/X2LogMadExcept.stat create mode 100644 Packages/DXE2/X2LogDXE2.dpk rename Packages/{ => DXE2}/X2LogDXE2.dproj (81%) create mode 100644 Packages/DXE2/X2LogDXE2.res rename Packages/{ => DXE2}/X2LogDXE2Group.groupproj (100%) rename Packages/{ => DXE2}/X2LogFormsDXE2.dpk (82%) rename Packages/{ => DXE2}/X2LogFormsDXE2.dproj (96%) create mode 100644 Packages/DXE2/X2LogFormsDXE2.res rename Packages/{ => DXE2}/X2LogJsonDXE2.dpk (75%) rename Packages/{ => DXE2}/X2LogJsonDXE2.dproj (96%) create mode 100644 Packages/DXE2/X2LogJsonDXE2.res rename Packages/{ => DXE2}/X2LogMadExceptDXE2.dpk (84%) rename Packages/{ => DXE2}/X2LogMadExceptDXE2.dproj (96%) create mode 100644 Packages/DXE2/X2LogMadExceptDXE2.res delete mode 100644 Packages/X2LogDXE2.dpk create mode 100644 X2Log.JsonDataObjects.pas diff --git a/.gitignore b/.gitignore index 54f2f6f..1b886ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -__history/ -Test/lib/ -Test/bin/ -*.tvsconfig -*.local -*.identcache -*.dcu +__history/ +Test/lib/ +Test/bin/ +*.tvsconfig +*.local +*.identcache +*.dcu diff --git a/Packages/D10/X2Log.dpk b/Packages/D10/X2Log.dpk new file mode 100644 index 0000000..0df7d2f --- /dev/null +++ b/Packages/D10/X2Log.dpk @@ -0,0 +1,63 @@ +package X2Log; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'X²Log'} +{$LIBSUFFIX 'D10'} +{$RUNONLY} +{$IMPLICITBUILD ON} + +requires + rtl, + vcl; + +contains + X2Log.Client.Base in '..\..\X2Log.Client.Base.pas', + X2Log.Client.NamedPipe in '..\..\X2Log.Client.NamedPipe.pas', + X2Log.Constants in '..\..\X2Log.Constants.pas', + X2Log.Exception.Default in '..\..\X2Log.Exception.Default.pas', + X2Log.Global in '..\..\X2Log.Global.pas', + X2Log.Intf in '..\..\X2Log.Intf.pas', + X2Log.Observer.Custom in '..\..\X2Log.Observer.Custom.pas', + X2Log.Observer.CustomThreaded in '..\..\X2Log.Observer.CustomThreaded.pas', + X2Log.Observer.Event in '..\..\X2Log.Observer.Event.pas', + X2Log.Observer.LogFile in '..\..\X2Log.Observer.LogFile.pas', + X2Log.Observer.NamedPipe in '..\..\X2Log.Observer.NamedPipe.pas', + X2Log in '..\..\X2Log.pas', + X2Log.Details.Default in '..\..\X2Log.Details.Default.pas', + X2Log.Details.Intf in '..\..\X2Log.Details.Intf.pas', + X2Log.Details.Registry in '..\..\X2Log.Details.Registry.pas', + X2Log.Util.Stream in '..\..\X2Log.Util.Stream.pas', + X2Log.Translations.Dutch in '..\..\X2Log.Translations.Dutch.pas', + X2Log.Decorator in '..\..\X2Log.Decorator.pas', + X2Log.Observer.RollingLogFile in '..\..\X2Log.Observer.RollingLogFile.pas', + X2Log.TextFormatter.Default in '..\..\X2Log.TextFormatter.Default.pas', + X2Log.TextFormatter.Intf in '..\..\X2Log.TextFormatter.Intf.pas', + X2Log.Intf.NamedPipe in '..\..\X2Log.Intf.NamedPipe.pas'; + +end. + + diff --git a/Packages/D10/X2Log.dproj b/Packages/D10/X2Log.dproj new file mode 100644 index 0000000..01f7ae8 --- /dev/null +++ b/Packages/D10/X2Log.dproj @@ -0,0 +1,187 @@ + + + {AF9DEBC5-230F-475E-9A0C-87A16F7A76A5} + X2Log.dpk + 18.2 + VCL + True + Build + Win32 + 3 + Package + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + false + All + true + X²Log + $(DELPHIBIN) + System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + $(DELPHIBIN) + 1043 + true + true + $(DELPHILIB) + .\$(Platform)\$(Config) + X2Log + D10 + + + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + Debug + android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + + + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + $(DELPHIBIN64) + $(DELPHIBIN64) + $(DELPHILIB64) + 1033 + + + DEBUG;$(DCC_Define) + false + true + true + true + + + true + 1033 + false + + + true + 1033 + + + + MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + True + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1043 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + X2Log.dpk + + + + + False + True + True + + + 12 + + + + + diff --git a/Packages/X2LogDXE2.res b/Packages/D10/X2Log.res similarity index 100% rename from Packages/X2LogDXE2.res rename to Packages/D10/X2Log.res diff --git a/Packages/D10/X2Log.stat b/Packages/D10/X2Log.stat new file mode 100644 index 0000000..3d64bf5 --- /dev/null +++ b/Packages/D10/X2Log.stat @@ -0,0 +1,10 @@ +[Stats] +EditorSecs=56 +DesignerSecs=1 +InspectorSecs=1 +CompileSecs=2158 +OtherSecs=101 +StartTime=6-7-2017 16:01:04 +RealKeys=0 +EffectiveKeys=0 +DebugSecs=1 diff --git a/Packages/D10/X2LogForms.dpk b/Packages/D10/X2LogForms.dpk new file mode 100644 index 0000000..4cbdf92 --- /dev/null +++ b/Packages/D10/X2LogForms.dpk @@ -0,0 +1,42 @@ +package X2LogForms; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'X²Log - Forms'} +{$LIBSUFFIX 'D10'} +{$RUNONLY} +{$IMPLICITBUILD ON} + +requires + rtl, + X2Log, + vcl, + VirtualTreesR; + +contains + X2Log.Observer.MonitorForm in '..\..\X2Log.Observer.MonitorForm.pas' {X2LogObserverMonitorForm}; + +end. diff --git a/Packages/D10/X2LogForms.dproj b/Packages/D10/X2LogForms.dproj new file mode 100644 index 0000000..a35de05 --- /dev/null +++ b/Packages/D10/X2LogForms.dproj @@ -0,0 +1,185 @@ + + + {E09901D8-F644-4C49-AF42-2C5A4EE2118A} + X2LogForms.dpk + 18.2 + VCL + True + Debug + Win32 + 3 + Package + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + false + All + true + $(DELPHIBIN) + System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) + X²Log - Forms + $(DELPHIBIN) + 1043 + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + true + $(DELPHILIB) + .\$(Platform)\$(Config) + X2LogForms + D10 + + + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + Debug + android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + + + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + $(DELPHIBIN64) + $(DELPHIBIN64) + $(DELPHILIB64) + 1033 + + + DEBUG;$(DCC_Define) + false + true + true + true + + + true + 1033 + false + + + true + 1033 + + + false + RELEASE;$(DCC_Define) + 0 + 0 + + + + MainSource + + + + + + +
X2LogObserverMonitorForm
+ + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + True + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1043 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + X2LogForms.dpk + + + + + False + True + True + + + 12 + + + + + diff --git a/Packages/X2LogFormsDXE2.res b/Packages/D10/X2LogForms.res similarity index 100% rename from Packages/X2LogFormsDXE2.res rename to Packages/D10/X2LogForms.res diff --git a/Packages/D10/X2LogForms.stat b/Packages/D10/X2LogForms.stat new file mode 100644 index 0000000..1fd283a --- /dev/null +++ b/Packages/D10/X2LogForms.stat @@ -0,0 +1,10 @@ +[Stats] +EditorSecs=9 +DesignerSecs=1 +InspectorSecs=1 +CompileSecs=1224 +OtherSecs=29 +StartTime=6-7-2017 16:08:37 +RealKeys=0 +EffectiveKeys=0 +DebugSecs=1 diff --git a/Packages/D10/X2LogGroup.groupproj b/Packages/D10/X2LogGroup.groupproj new file mode 100644 index 0000000..60b6592 --- /dev/null +++ b/Packages/D10/X2LogGroup.groupproj @@ -0,0 +1,72 @@ + + + {16A1D415-5191-4718-97C3-669CCA175F4F} + + + + + + + + + + + + + + + + + Default.Personality.12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Packages/D10/X2LogJson.dpk b/Packages/D10/X2LogJson.dpk new file mode 100644 index 0000000..0f12821 --- /dev/null +++ b/Packages/D10/X2LogJson.dpk @@ -0,0 +1,41 @@ +package X2LogJson; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$DEFINE $(DELPHIBIN)} +{$ENDIF IMPLICITBUILDING} +{$LIBSUFFIX 'D10'} +{$IMPLICITBUILD ON} + +requires + rtl, + X2Log; + +contains + X2Log.TextFormatter.Json in '..\..\X2Log.TextFormatter.Json.pas', + X2Log.JsonDataObjects in '..\..\X2Log.JsonDataObjects.pas'; + +end. + diff --git a/Packages/D10/X2LogJson.dproj b/Packages/D10/X2LogJson.dproj new file mode 100644 index 0000000..dd62c7c --- /dev/null +++ b/Packages/D10/X2LogJson.dproj @@ -0,0 +1,592 @@ + + + {5742A326-C831-4737-AA01-900CC5C18CCA} + X2LogJson.dpk + 18.2 + None + True + Debug + Win32 + 3 + Package + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + 1043 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + All + true + true + System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) + false + false + false + false + false + X2LogJson + D10 + + + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + Debug + android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + + + $(DELPHIBIN);$(DCC_Define) + $(DELPHILIB) + $(DELPHIBIN) + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + true + $(DELPHIBIN64);$(DCC_Define) + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + $(DELPHIBIN64) + $(DELPHILIB64) + 1033 + + + DEBUG;$(DCC_Define) + false + true + true + true + + + true + false + 1033 + false + D10 + + + true + 1033 + + + false + RELEASE;$(DCC_Define) + 0 + 0 + + + true + 1033 + + + true + 1033 + + + + MainSource + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + X2LogJson.dpk + + + True + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1043 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + + + true + + + + + true + + + + + true + + + + + true + + + + + X2LogJson.bpl + true + + + + + 1 + + + Contents\MacOS + 0 + + + + + classes + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\armeabi + 1 + + + + + library\lib\mips + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable + 1 + + + + + res\values + 1 + + + + + res\drawable + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-ldpi + 1 + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-large + 1 + + + + + res\drawable-xlarge + 1 + + + + + 1 + + + 1 + + + 0 + + + + + 1 + .framework + + + 0 + + + + + 1 + .dylib + + + 0 + .dll;.bpl + + + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .bpl + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + + + + 1 + + + 1 + + + 1 + + + + + + + Contents\Resources + 1 + + + + + library\lib\armeabi-v7a + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 0 + + + + + 1 + + + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + + + + + + + + + False + False + True + True + + + 12 + + + + + diff --git a/Packages/X2LogJsonDXE2.res b/Packages/D10/X2LogJson.res similarity index 100% rename from Packages/X2LogJsonDXE2.res rename to Packages/D10/X2LogJson.res diff --git a/Packages/D10/X2LogJson.stat b/Packages/D10/X2LogJson.stat new file mode 100644 index 0000000..5b20d3c --- /dev/null +++ b/Packages/D10/X2LogJson.stat @@ -0,0 +1,10 @@ +[Stats] +EditorSecs=19 +DesignerSecs=1 +InspectorSecs=1 +CompileSecs=847 +OtherSecs=18 +StartTime=6-7-2017 16:09:29 +RealKeys=0 +EffectiveKeys=0 +DebugSecs=1 diff --git a/Packages/D10/X2LogMadExcept.dpk b/Packages/D10/X2LogMadExcept.dpk new file mode 100644 index 0000000..15b7573 --- /dev/null +++ b/Packages/D10/X2LogMadExcept.dpk @@ -0,0 +1,43 @@ +package X2LogMadExcept; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'X²Log - madExcept'} +{$LIBSUFFIX 'D10'} +{$RUNONLY} +{$IMPLICITBUILD ON} + +requires + rtl, + madBasic_, + madDisAsm_, + madExcept_, + X2Log; + +contains + X2Log.Exception.madExceptHandler in '..\..\X2Log.Exception.madExceptHandler.pas'; + +end. diff --git a/Packages/D10/X2LogMadExcept.dproj b/Packages/D10/X2LogMadExcept.dproj new file mode 100644 index 0000000..8032bd5 --- /dev/null +++ b/Packages/D10/X2LogMadExcept.dproj @@ -0,0 +1,569 @@ + + + {DF06C136-DD6E-4481-967D-BF73C5B75BDA} + X2LogMadExcept.dpk + 18.2 + None + True + Debug + Win32 + 3 + Package + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + false + All + true + $(DELPHIBIN) + System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) + X²Log - madExcept + $(DELPHIBIN) + 1043 + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + true + $(DELPHILIB) + .\$(Platform)\$(Config) + X2LogMadExcept + D10 + + + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + Debug + android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + + + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + $(DELPHIBIN64) + $(DELPHIBIN64) + $(DELPHILIB64) + 1033 + + + DEBUG;$(DCC_Define) + false + true + true + true + + + true + 1033 + false + + + true + 1033 + + + false + RELEASE;$(DCC_Define) + 0 + 0 + + + + MainSource + + + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + X2LogMadExcept.dpk + + + True + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1043 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + + + true + + + + + true + + + + + true + + + + + true + + + + + X2LogMadExcept.bpl + true + + + + + 1 + + + Contents\MacOS + 0 + + + + + classes + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\armeabi + 1 + + + + + library\lib\mips + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable + 1 + + + + + res\values + 1 + + + + + res\drawable + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-ldpi + 1 + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-large + 1 + + + + + res\drawable-xlarge + 1 + + + + + 1 + + + 1 + + + 0 + + + + + 1 + .framework + + + 0 + + + + + 1 + .dylib + + + 0 + .dll;.bpl + + + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .bpl + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + + + + 1 + + + 1 + + + 1 + + + + + + + Contents\Resources + 1 + + + + + library\lib\armeabi-v7a + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 0 + + + + + 1 + + + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + + + + + + + + + False + False + True + True + + + 12 + + + + + diff --git a/Packages/X2LogMadExceptDXE2.res b/Packages/D10/X2LogMadExcept.res similarity index 100% rename from Packages/X2LogMadExceptDXE2.res rename to Packages/D10/X2LogMadExcept.res diff --git a/Packages/D10/X2LogMadExcept.stat b/Packages/D10/X2LogMadExcept.stat new file mode 100644 index 0000000..be8a9ec --- /dev/null +++ b/Packages/D10/X2LogMadExcept.stat @@ -0,0 +1,10 @@ +[Stats] +EditorSecs=29 +DesignerSecs=1 +InspectorSecs=1 +CompileSecs=2753 +OtherSecs=47 +StartTime=6-7-2017 16:05:33 +RealKeys=0 +EffectiveKeys=0 +DebugSecs=1 diff --git a/Packages/DXE2/X2LogDXE2.dpk b/Packages/DXE2/X2LogDXE2.dpk new file mode 100644 index 0000000..d061b89 --- /dev/null +++ b/Packages/DXE2/X2LogDXE2.dpk @@ -0,0 +1,62 @@ +package X2LogDXE2; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO ON} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'X²Log'} +{$RUNONLY} +{$IMPLICITBUILD ON} + +requires + rtl, + vcl; + +contains + X2Log.Client.Base in '..\..\X2Log.Client.Base.pas', + X2Log.Client.NamedPipe in '..\..\X2Log.Client.NamedPipe.pas', + X2Log.Constants in '..\..\X2Log.Constants.pas', + X2Log.Exception.Default in '..\..\X2Log.Exception.Default.pas', + X2Log.Global in '..\..\X2Log.Global.pas', + X2Log.Intf in '..\..\X2Log.Intf.pas', + X2Log.Observer.Custom in '..\..\X2Log.Observer.Custom.pas', + X2Log.Observer.CustomThreaded in '..\..\X2Log.Observer.CustomThreaded.pas', + X2Log.Observer.Event in '..\..\X2Log.Observer.Event.pas', + X2Log.Observer.LogFile in '..\..\X2Log.Observer.LogFile.pas', + X2Log.Observer.NamedPipe in '..\..\X2Log.Observer.NamedPipe.pas', + X2Log in '..\..\X2Log.pas', + X2Log.Details.Default in '..\..\X2Log.Details.Default.pas', + X2Log.Details.Intf in '..\..\X2Log.Details.Intf.pas', + X2Log.Details.Registry in '..\..\X2Log.Details.Registry.pas', + X2Log.Util.Stream in '..\..\X2Log.Util.Stream.pas', + X2Log.Translations.Dutch in '..\..\X2Log.Translations.Dutch.pas', + X2Log.Decorator in '..\..\X2Log.Decorator.pas', + X2Log.Observer.RollingLogFile in '..\..\X2Log.Observer.RollingLogFile.pas', + X2Log.TextFormatter.Default in '..\..\X2Log.TextFormatter.Default.pas', + X2Log.TextFormatter.Intf in '..\..\X2Log.TextFormatter.Intf.pas', + X2Log.Intf.NamedPipe in '..\..\X2Log.Intf.NamedPipe.pas'; + +end. + + diff --git a/Packages/X2LogDXE2.dproj b/Packages/DXE2/X2LogDXE2.dproj similarity index 81% rename from Packages/X2LogDXE2.dproj rename to Packages/DXE2/X2LogDXE2.dproj index eb66afa..bc59b94 100644 --- a/Packages/X2LogDXE2.dproj +++ b/Packages/DXE2/X2LogDXE2.dproj @@ -90,28 +90,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + Base diff --git a/Packages/DXE2/X2LogDXE2.res b/Packages/DXE2/X2LogDXE2.res new file mode 100644 index 0000000000000000000000000000000000000000..27efe49b5f5b31b0c6298daa89904be58dbfef3a GIT binary patch literal 448 zcmZ9I%Sr=55Jk`EEQ~8Z!G&uXVK#!01bh(iMKWY7LwpdB3?#bqWBd{S#=U>wc)G_X znu6-CuDbVDbph<_ZQHrwKO1DJz9+_qR?y26XpohLQzqPbo-sBWal^Imk>|N_u#f!f z8v?)6NOwP0Aqb|*Z;JProAAPtISZatoAbZM$ptONLZ&XJf96hVJviA60I(v%kCFHuVGYJ2#pD literal 0 HcmV?d00001 diff --git a/Packages/X2LogDXE2Group.groupproj b/Packages/DXE2/X2LogDXE2Group.groupproj similarity index 100% rename from Packages/X2LogDXE2Group.groupproj rename to Packages/DXE2/X2LogDXE2Group.groupproj diff --git a/Packages/X2LogFormsDXE2.dpk b/Packages/DXE2/X2LogFormsDXE2.dpk similarity index 82% rename from Packages/X2LogFormsDXE2.dpk rename to Packages/DXE2/X2LogFormsDXE2.dpk index b992cc9..6d1151a 100644 --- a/Packages/X2LogFormsDXE2.dpk +++ b/Packages/DXE2/X2LogFormsDXE2.dpk @@ -36,6 +36,6 @@ requires VirtualTreesR; contains - X2Log.Observer.MonitorForm in '..\X2Log.Observer.MonitorForm.pas' {X2LogObserverMonitorForm}; + X2Log.Observer.MonitorForm in '..\..\X2Log.Observer.MonitorForm.pas' {X2LogObserverMonitorForm}; end. diff --git a/Packages/X2LogFormsDXE2.dproj b/Packages/DXE2/X2LogFormsDXE2.dproj similarity index 96% rename from Packages/X2LogFormsDXE2.dproj rename to Packages/DXE2/X2LogFormsDXE2.dproj index b423e99..d50855f 100644 --- a/Packages/X2LogFormsDXE2.dproj +++ b/Packages/DXE2/X2LogFormsDXE2.dproj @@ -104,7 +104,7 @@ - +
X2LogObserverMonitorForm
 diff --git a/Packages/DXE2/X2LogFormsDXE2.res b/Packages/DXE2/X2LogFormsDXE2.res new file mode 100644 index 0000000000000000000000000000000000000000..27efe49b5f5b31b0c6298daa89904be58dbfef3a GIT binary patch literal 448 zcmZ9I%Sr=55Jk`EEQ~8Z!G&uXVK#!01bh(iMKWY7LwpdB3?#bqWBd{S#=U>wc)G_X znu6-CuDbVDbph<_ZQHrwKO1DJz9+_qR?y26XpohLQzqPbo-sBWal^Imk>|N_u#f!f z8v?)6NOwP0Aqb|*Z;JProAAPtISZatoAbZM$ptONLZ&XJf96hVJviA60I(v%kCFHuVGYJ2#pD literal 0 HcmV?d00001 diff --git a/Packages/X2LogJsonDXE2.dpk b/Packages/DXE2/X2LogJsonDXE2.dpk similarity index 75% rename from Packages/X2LogJsonDXE2.dpk rename to Packages/DXE2/X2LogJsonDXE2.dpk index ba6e72a..231d32c 100644 --- a/Packages/X2LogJsonDXE2.dpk +++ b/Packages/DXE2/X2LogJsonDXE2.dpk @@ -1,39 +1,40 @@ -package X2LogJsonDXE2; - -{$R *.res} -{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} -{$ALIGN 8} -{$ASSERTIONS ON} -{$BOOLEVAL OFF} -{$DEBUGINFO ON} -{$EXTENDEDSYNTAX ON} -{$IMPORTEDDATA ON} -{$IOCHECKS ON} -{$LOCALSYMBOLS ON} -{$LONGSTRINGS ON} -{$OPENSTRINGS ON} -{$OPTIMIZATION OFF} -{$OVERFLOWCHECKS OFF} -{$RANGECHECKS OFF} -{$REFERENCEINFO ON} -{$SAFEDIVIDE OFF} -{$STACKFRAMES ON} -{$TYPEDADDRESS OFF} -{$VARSTRINGCHECKS ON} -{$WRITEABLECONST OFF} -{$MINENUMSIZE 1} -{$IMAGEBASE $400000} -{$DEFINE DEBUG} -{$DEFINE $(DELPHIBIN64)} -{$ENDIF IMPLICITBUILDING} -{$IMPLICITBUILD ON} - -requires - rtl, - X2LogDXE2; - -contains - X2Log.TextFormatter.Json in '..\X2Log.TextFormatter.Json.pas'; - -end. - +package X2LogJsonDXE2; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO ON} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$DEFINE $(DELPHIBIN)} +{$ENDIF IMPLICITBUILDING} +{$IMPLICITBUILD ON} + +requires + rtl, + X2LogDXE2; + +contains + X2Log.TextFormatter.Json in '..\..\X2Log.TextFormatter.Json.pas', + X2Log.JsonDataObjects in '..\..\X2Log.JsonDataObjects.pas'; + +end. + diff --git a/Packages/X2LogJsonDXE2.dproj b/Packages/DXE2/X2LogJsonDXE2.dproj similarity index 96% rename from Packages/X2LogJsonDXE2.dproj rename to Packages/DXE2/X2LogJsonDXE2.dproj index 6d26e67..63fae2e 100644 --- a/Packages/X2LogJsonDXE2.dproj +++ b/Packages/DXE2/X2LogJsonDXE2.dproj @@ -1,187 +1,188 @@ - - - {5742A326-C831-4737-AA01-900CC5C18CCA} - X2LogJsonDXE2.dpk - 13.4 - None - True - Debug - Win32 - 3 - Package - - - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Cfg_1 - true - true - - - true - Cfg_1 - true - true - - - true - Base - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - 1043 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - All - true - true - System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) - .\$(Platform)\$(Config) - .\$(Platform)\$(Config) - false - false - false - false - false - - - true - $(DELPHIBIN64);$(DCC_Define) - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - $(DELPHIBIN64) - $(DELPHILIB64) - 1033 - - - $(DELPHIBIN);$(DCC_Define) - $(DELPHILIB) - $(DELPHIBIN) - true - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - 1033 - - - DEBUG;$(DCC_Define) - false - true - true - true - - - true - 1033 - - - true - false - 1033 - false - - - false - RELEASE;$(DCC_Define) - 0 - false - - - true - 1033 - - - true - 1033 - - - - MainSource - - - - - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - - - - Delphi.Personality.12 - Package - - - - X2LogJsonDXE2.dpk - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1043 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - True - True - - - 12 - - - - + + + {5742A326-C831-4737-AA01-900CC5C18CCA} + X2LogJsonDXE2.dpk + 13.4 + None + True + Debug + Win32 + 3 + Package + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + 1043 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + All + true + true + System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) + false + false + false + false + false + + + true + $(DELPHIBIN64);$(DCC_Define) + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + $(DELPHIBIN64) + $(DELPHILIB64) + 1033 + + + $(DELPHIBIN);$(DCC_Define) + $(DELPHILIB) + $(DELPHIBIN) + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + DEBUG;$(DCC_Define) + false + true + true + true + + + true + 1033 + + + true + false + 1033 + false + + + false + RELEASE;$(DCC_Define) + 0 + false + + + true + 1033 + + + true + 1033 + + + + MainSource + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + X2LogJsonDXE2.dpk + + + True + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1043 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + True + True + + + 12 + + + + diff --git a/Packages/DXE2/X2LogJsonDXE2.res b/Packages/DXE2/X2LogJsonDXE2.res new file mode 100644 index 0000000000000000000000000000000000000000..27efe49b5f5b31b0c6298daa89904be58dbfef3a GIT binary patch literal 448 zcmZ9I%Sr=55Jk`EEQ~8Z!G&uXVK#!01bh(iMKWY7LwpdB3?#bqWBd{S#=U>wc)G_X znu6-CuDbVDbph<_ZQHrwKO1DJz9+_qR?y26XpohLQzqPbo-sBWal^Imk>|N_u#f!f z8v?)6NOwP0Aqb|*Z;JProAAPtISZatoAbZM$ptONLZ&XJf96hVJviA60I(v%kCFHuVGYJ2#pD literal 0 HcmV?d00001 diff --git a/Packages/X2LogMadExceptDXE2.dpk b/Packages/DXE2/X2LogMadExceptDXE2.dpk similarity index 84% rename from Packages/X2LogMadExceptDXE2.dpk rename to Packages/DXE2/X2LogMadExceptDXE2.dpk index 454fab3..3614ba5 100644 --- a/Packages/X2LogMadExceptDXE2.dpk +++ b/Packages/DXE2/X2LogMadExceptDXE2.dpk @@ -37,6 +37,6 @@ requires X2LogDXE2; contains - X2Log.Exception.madExceptHandler in '..\X2Log.Exception.madExceptHandler.pas'; + X2Log.Exception.madExceptHandler in '..\..\X2Log.Exception.madExceptHandler.pas'; end. diff --git a/Packages/X2LogMadExceptDXE2.dproj b/Packages/DXE2/X2LogMadExceptDXE2.dproj similarity index 96% rename from Packages/X2LogMadExceptDXE2.dproj rename to Packages/DXE2/X2LogMadExceptDXE2.dproj index 7c35289..805fa43 100644 --- a/Packages/X2LogMadExceptDXE2.dproj +++ b/Packages/DXE2/X2LogMadExceptDXE2.dproj @@ -104,7 +104,7 @@ - + Cfg_2 Base diff --git a/Packages/DXE2/X2LogMadExceptDXE2.res b/Packages/DXE2/X2LogMadExceptDXE2.res new file mode 100644 index 0000000000000000000000000000000000000000..27efe49b5f5b31b0c6298daa89904be58dbfef3a GIT binary patch literal 448 zcmZ9I%Sr=55Jk`EEQ~8Z!G&uXVK#!01bh(iMKWY7LwpdB3?#bqWBd{S#=U>wc)G_X znu6-CuDbVDbph<_ZQHrwKO1DJz9+_qR?y26XpohLQzqPbo-sBWal^Imk>|N_u#f!f z8v?)6NOwP0Aqb|*Z;JProAAPtISZatoAbZM$ptONLZ&XJf96hVJviA60I(v%kCFHuVGYJ2#pD literal 0 HcmV?d00001 diff --git a/Packages/X2LogDXE2.dpk b/Packages/X2LogDXE2.dpk deleted file mode 100644 index 541bb7a..0000000 --- a/Packages/X2LogDXE2.dpk +++ /dev/null @@ -1,62 +0,0 @@ -package X2LogDXE2; - -{$R *.res} -{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} -{$ALIGN 8} -{$ASSERTIONS ON} -{$BOOLEVAL OFF} -{$DEBUGINFO ON} -{$EXTENDEDSYNTAX ON} -{$IMPORTEDDATA ON} -{$IOCHECKS ON} -{$LOCALSYMBOLS ON} -{$LONGSTRINGS ON} -{$OPENSTRINGS ON} -{$OPTIMIZATION OFF} -{$OVERFLOWCHECKS OFF} -{$RANGECHECKS OFF} -{$REFERENCEINFO ON} -{$SAFEDIVIDE OFF} -{$STACKFRAMES ON} -{$TYPEDADDRESS OFF} -{$VARSTRINGCHECKS ON} -{$WRITEABLECONST OFF} -{$MINENUMSIZE 1} -{$IMAGEBASE $400000} -{$DEFINE DEBUG} -{$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'X²Log'} -{$RUNONLY} -{$IMPLICITBUILD ON} - -requires - rtl, - vcl; - -contains - X2Log.Client.Base in '..\X2Log.Client.Base.pas', - X2Log.Client.NamedPipe in '..\X2Log.Client.NamedPipe.pas', - X2Log.Constants in '..\X2Log.Constants.pas', - X2Log.Exception.Default in '..\X2Log.Exception.Default.pas', - X2Log.Global in '..\X2Log.Global.pas', - X2Log.Intf in '..\X2Log.Intf.pas', - X2Log.Observer.Custom in '..\X2Log.Observer.Custom.pas', - X2Log.Observer.CustomThreaded in '..\X2Log.Observer.CustomThreaded.pas', - X2Log.Observer.Event in '..\X2Log.Observer.Event.pas', - X2Log.Observer.LogFile in '..\X2Log.Observer.LogFile.pas', - X2Log.Observer.NamedPipe in '..\X2Log.Observer.NamedPipe.pas', - X2Log in '..\X2Log.pas', - X2Log.Details.Default in '..\X2Log.Details.Default.pas', - X2Log.Details.Intf in '..\X2Log.Details.Intf.pas', - X2Log.Details.Registry in '..\X2Log.Details.Registry.pas', - X2Log.Util.Stream in '..\X2Log.Util.Stream.pas', - X2Log.Translations.Dutch in '..\X2Log.Translations.Dutch.pas', - X2Log.Decorator in '..\X2Log.Decorator.pas', - X2Log.Observer.RollingLogFile in '..\X2Log.Observer.RollingLogFile.pas', - X2Log.TextFormatter.Default in '..\X2Log.TextFormatter.Default.pas', - X2Log.TextFormatter.Intf in '..\X2Log.TextFormatter.Intf.pas', - X2Log.Intf.NamedPipe in '..\X2Log.Intf.NamedPipe.pas'; - -end. - - diff --git a/X2Log.Client.NamedPipe.pas b/X2Log.Client.NamedPipe.pas index e090e88..21473c8 100644 --- a/X2Log.Client.NamedPipe.pas +++ b/X2Log.Client.NamedPipe.pas @@ -394,7 +394,7 @@ begin FreeAndNil(detailsStream); end; end else - MessageData.Seek(detailsSize, soFromCurrent); + MessageData.Position := MessageData.Position + detailsSize; end; end; diff --git a/X2Log.Details.Default.pas b/X2Log.Details.Default.pas index dad4ab2..476275b 100644 --- a/X2Log.Details.Default.pas +++ b/X2Log.Details.Default.pas @@ -724,7 +724,7 @@ begin FloatValue: valueClass := TX2LogDictionaryFloatValue; DateTimeValue: valueClass := TX2LogDictionaryDateTimeValue; else - AStream.Seek(payloadSize, soFromCurrent); + AStream.Position := AStream.Position + payloadSize; end; if Assigned(valueClass) then diff --git a/X2Log.Intf.NamedPipe.pas b/X2Log.Intf.NamedPipe.pas index 73413d7..4bacce4 100644 --- a/X2Log.Intf.NamedPipe.pas +++ b/X2Log.Intf.NamedPipe.pas @@ -1,37 +1,37 @@ -unit X2Log.Intf.NamedPipe; - -interface -uses - X2Log.Intf; - -type - TX2LogMessageHeaderV1 = packed record - ID: Word; - Version: Byte; - Size: Word; - DateTime: TDateTime; - Level: TX2LogLevel; - - { - Payload: - - CategoryLength: Cardinal - Category: WideString - MessageLength: Cardinal - Message: WideString - DetailsLength: Cardinal - Details: WideString - } - end; - - - TX2LogMessageHeader = TX2LogMessageHeaderV1; - -const - X2LogMessageHeader: Word = $B258; - X2LogMessageVersion: Byte = 1; - - -implementation - -end. +unit X2Log.Intf.NamedPipe; + +interface +uses + X2Log.Intf; + +type + TX2LogMessageHeaderV1 = packed record + ID: Word; + Version: Byte; + Size: Word; + DateTime: TDateTime; + Level: TX2LogLevel; + + { + Payload: + + CategoryLength: Cardinal + Category: WideString + MessageLength: Cardinal + Message: WideString + DetailsLength: Cardinal + Details: WideString + } + end; + + + TX2LogMessageHeader = TX2LogMessageHeaderV1; + +const + X2LogMessageHeader: Word = $B258; + X2LogMessageVersion: Byte = 1; + + +implementation + +end. diff --git a/X2Log.JsonDataObjects.pas b/X2Log.JsonDataObjects.pas new file mode 100644 index 0000000..3ecef83 --- /dev/null +++ b/X2Log.JsonDataObjects.pas @@ -0,0 +1,7904 @@ +(***************************************************************************** +The MIT License (MIT) + +Copyright (c) 2015-2016 Andreas Hausladen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*****************************************************************************) + +{$A8,B-,C+,E-,F-,G+,H+,I+,J-,K-,M-,N-,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Z1} +{$WARN WIDECHAR_REDUCED OFF} // All sets only use ASCII chars (<=#127) and the compiler generates the >=#128 check itself +{$STRINGCHECKS OFF} // It only slows down Delphi strings, doesn't help C++Builder migration and is finally gone in XE+ +{$WARN SYMBOL_DEPRECATED OFF} // for StrLen/StrLComp +{$POINTERMATH ON} + +unit X2Log.JsonDataObjects; + +{$IFDEF VER200} + // Delphi 2009's ErrorInsight parser uses the CompilerVersion's memory address instead of 20.0, failing all the + // IF CompilerVersion compiler directives + {$DEFINE CPUX86} +{$ELSE} + {$IF CompilerVersion >= 24.0} // XE3 or newer + {$LEGACYIFEND ON} + {$IFEND} + {$IF CompilerVersion >= 23.0} + {$DEFINE HAS_UNIT_SCOPE} + {$DEFINE HAS_RETURN_ADDRESS} + {$IFEND} + {$IF CompilerVersion <= 22.0} // XE or older + {$DEFINE CPUX86} + {$IFEND} +{$ENDIF VER200} + +{$IFDEF NEXTGEN} + {$IF CompilerVersion >= 31.0} // 10.1 Berlin or newer + {$DEFINE SUPPORTS_UTF8STRING} // Delphi 10.1 Berlin supports UTF8String for mobile compilers + {$IFEND} +{$ELSE} + {$DEFINE SUPPORTS_UTF8STRING} +{$ENDIF} + +{$IFDEF CPUX64} + {$IFNDEF LINUX64} // Linux 64 compiler doesn't support ASM for x64 code => LLVM + {$DEFINE ASMSUPPORT} + {$ENDIF ~LINUX64} +{$ENDIF CPUX64} +{$IFDEF CPUX86} + {$DEFINE ASMSUPPORT} +{$ENDIF CPUX86} +{$IFDEF EXTERNALLINKER} // implicates LLVM + {$UNDEF ASMSUPPORT} +{$ENDIF EXTERNALLINKER} + +// Enables the progress callback feature +{$DEFINE SUPPORT_PROGRESS} + +// Sanity checks all array index accesses and raise an EListError exception. +{$DEFINE CHECK_ARRAY_INDEX} + +// JSON allows the slash to be escaped. This is only necessary if you plan to put the JSON string +// into a