erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-24 08:37:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #6719 from keymanapp/chore/windows/move-sentry

Browse source 
chore(windows): move ext/sentry to common 🎢
This commit is contained in:
Marc Durdin 2022-06-21 06:38:42 +10:00 • committed by GitHub
commit 39da83d82e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 90 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
windows/src/ext/sentry.txt → common/windows/delphi/ext/sentry.txt
View file

0
windows/src/ext/sentry/2.3/README.md → common/windows/delphi/ext/sentry/2.3/README.md
View file

0
windows/src/ext/sentry/2.3/crashpad_handler.exe → common/windows/delphi/ext/sentry/2.3/crashpad_handler.exe
View file

0
windows/src/ext/sentry/2.3/sentry.dll → common/windows/delphi/ext/sentry/2.3/sentry.dll
View file

0
windows/src/ext/sentry/2.3/sentry.x64.dll → common/windows/delphi/ext/sentry/2.3/sentry.x64.dll
View file

0
windows/src/ext/sentry/Sentry.Client.Console.pas → common/windows/delphi/ext/sentry/Sentry.Client.Console.pas
View file

0
windows/src/ext/sentry/Sentry.Client.Vcl.pas → common/windows/delphi/ext/sentry/Sentry.Client.Vcl.pas
View file

0
windows/src/ext/sentry/Sentry.Client.pas → common/windows/delphi/ext/sentry/Sentry.Client.pas
View file

0
windows/src/ext/sentry/build_sentry_for_keyman.bat → common/windows/delphi/ext/sentry/build_sentry_for_keyman.bat
View file

0
windows/src/ext/sentry/crashpad_handler.exe → common/windows/delphi/ext/sentry/crashpad_handler.exe
View file

0
windows/src/ext/sentry/sentry.dll → common/windows/delphi/ext/sentry/sentry.dll
View file

0
windows/src/ext/sentry/sentry.h → common/windows/delphi/ext/sentry/sentry.h
View file

0
windows/src/ext/sentry/sentry.lib → common/windows/delphi/ext/sentry/sentry.lib
View file

0
windows/src/ext/sentry/sentry.pas → common/windows/delphi/ext/sentry/sentry.pas
View file

0
windows/src/ext/sentry/sentry.x64.dll → common/windows/delphi/ext/sentry/sentry.x64.dll
View file

0
windows/src/ext/sentry/sentry.x64.lib → common/windows/delphi/ext/sentry/sentry.x64.lib
View file

0
windows/src/ext/sentry/test/Makefile → common/windows/delphi/ext/sentry/test/Makefile
View file

0
windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientTestMain.pas → common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientTestMain.pas
View file

0
windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.dfm → common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.dfm
View file

0
windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.pas → common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.pas
View file

0
windows/src/ext/sentry/test/SentryClientTest.dpr → common/windows/delphi/ext/sentry/test/SentryClientTest.dpr
View file

0
windows/src/ext/sentry/test/SentryClientTest.dproj → common/windows/delphi/ext/sentry/test/SentryClientTest.dproj
View file

0
windows/src/ext/sentry/test/SentryClientTest.res → common/windows/delphi/ext/sentry/test/SentryClientTest.res
View file

0
windows/src/ext/sentry/test/SentryClientVclTest.dfm → common/windows/delphi/ext/sentry/test/SentryClientVclTest.dfm
View file

0
windows/src/ext/sentry/test/SentryClientVclTest.dpr → common/windows/delphi/ext/sentry/test/SentryClientVclTest.dpr
View file

0
windows/src/ext/sentry/test/SentryClientVclTest.dproj → common/windows/delphi/ext/sentry/test/SentryClientVclTest.dproj
View file

0
windows/src/ext/sentry/test/SentryClientVclTest.res → common/windows/delphi/ext/sentry/test/SentryClientVclTest.res
View file

0
windows/src/ext/sentry/test/SentryTest.groupproj → common/windows/delphi/ext/sentry/test/SentryTest.groupproj
View file

6
developer/src/Makefile
View file

@ -79,9 +79,9 @@ test: .virtual
# ----------------------------------------------------------------------
redist:
copy $(WINDOWS_ROOT)\src\ext\sentry\sentry.dll $(DEVELOPER_ROOT)\bin
copy $(WINDOWS_ROOT)\src\ext\sentry\sentry.x64.dll $(DEVELOPER_ROOT)\bin
copy $(WINDOWS_ROOT)\src\ext\sentry\crashpad_handler.exe $(DEVELOPER_ROOT)\bin
copy $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.dll $(DEVELOPER_ROOT)\bin
copy $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.dll $(DEVELOPER_ROOT)\bin
copy $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\crashpad_handler.exe $(DEVELOPER_ROOT)\bin
# ----------------------------------------------------------------------

2
developer/src/inst/kmdev.wxs
View file

@ -223,7 +223,7 @@
</ComponentGroup>
<!-- Sentry -->
<ComponentGroup Id="KeymanDevSentryComponents" Directory="dir_sentry_0.4.9" Source="..\..\..\windows\src\ext\sentry">
<ComponentGroup Id="KeymanDevSentryComponents" Directory="dir_sentry_0.4.9" Source="..\..\..\common\windows\delphi\ext\sentry">
<Component>
<File Id="sentry.dll" KeyPath="yes" />
</Component>

26
developer/src/kmanalyze/kmanalyze.vcxproj
View file

@ -72,25 +72,25 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry</IncludePath>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry</IncludePath>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry</IncludePath>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry</IncludePath>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry</IncludePath>
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
@ -104,12 +104,12 @@
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(KEYMAN_ROOT)\windows\src\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
@ -123,12 +123,12 @@
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(KEYMAN_ROOT)\windows\src\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
@ -144,14 +144,14 @@
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(KEYMAN_ROOT)\windows\src\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
@ -167,19 +167,19 @@
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(KEYMAN_ROOT)\windows\src\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\windows\src\ext\sentry\sentry.h" />
<ClInclude Include="..\..\..\common\windows\delphi\ext\sentry\sentry.h" />
<ClInclude Include="..\..\..\windows\src\global\inc\keyman64.h" />
<ClInclude Include="..\..\..\windows\src\global\inc\keymansentry.h" />
<ClInclude Include="pch.h" />

2
developer/src/kmanalyze/kmanalyze.vcxproj.filters
View file

@ -21,7 +21,7 @@
<ClInclude Include="..\..\..\windows\src\global\inc\keymansentry.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\windows\src\ext\sentry\sentry.h">
<ClInclude Include="..\..\..\common\windows\delphi\ext\sentry\sentry.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\windows\src\global\inc\keyman64.h">

6
developer/src/kmcomp/kmcomp.dpr
View file

@ -111,9 +111,9 @@ uses
Keyman.Developer.System.LexicalModelCompile in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas',
Keyman.System.LexicalModelUtils in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
Keyman.Developer.System.Project.ProjectLogConsole in 'Keyman.Developer.System.Project.ProjectLogConsole.pas',
Sentry.Client in '..\..\..\windows\src\ext\sentry\Sentry.Client.pas',
Sentry.Client.Console in '..\..\..\windows\src\ext\sentry\Sentry.Client.Console.pas',
sentry in '..\..\..\windows\src\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
Sentry.Client.Console in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas',
sentry in '..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.KeymanSentryClient in '..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
KeymanPaths in '..\..\..\windows\src\global\delphi\general\KeymanPaths.pas',
Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\windows\src\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',

6
developer/src/kmcomp/kmcomp.dproj
View file

@ -262,9 +262,9 @@
<DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
<DCCReference Include="Keyman.Developer.System.Project.ProjectLogConsole.pas"/>
<DCCReference Include="..\..\..\windows\src\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\windows\src\ext\sentry\Sentry.Client.Console.pas"/>
<DCCReference Include="..\..\..\windows\src\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>

6
developer/src/kmconvert/kmconvert.dpr
View file

@ -82,9 +82,9 @@ uses
Keyman.Developer.System.ModelProjectTemplate in 'Keyman.Developer.System.ModelProjectTemplate.pas',
Keyman.Developer.System.Project.modelTsProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas',
Keyman.Developer.System.Project.wordlistTsvProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.wordlistTsvProjectFile.pas',
Sentry.Client in '..\..\..\windows\src\ext\sentry\Sentry.Client.pas',
Sentry.Client.Console in '..\..\..\windows\src\ext\sentry\Sentry.Client.Console.pas',
sentry in '..\..\..\windows\src\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
Sentry.Client.Console in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas',
sentry in '..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.KeymanSentryClient in '..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
KeymanPaths in '..\..\..\windows\src\global\delphi\general\KeymanPaths.pas',
Keyman.System.Standards.LangTagsRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',

6
developer/src/kmconvert/kmconvert.dproj
View file

@ -191,9 +191,9 @@
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.wordlistTsvProjectFile.pas">
<Form>$R icons.RES</Form>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\windows\src\ext\sentry\Sentry.Client.Console.pas"/>
<DCCReference Include="..\..\..\windows\src\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>

8
developer/src/kmdecomp/kmdecomp.vcxproj
View file

@ -68,7 +68,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -87,7 +87,7 @@
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalDependencies>$(KEYMAN_ROOT)\windows\src\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
<Bscmake>
@ -104,7 +104,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -123,7 +123,7 @@
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalDependencies>$(KEYMAN_ROOT)\windows\src\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
<Bscmake>

6
developer/src/tike/Tike.dpr
View file

@ -274,9 +274,9 @@ uses
Keyman.Developer.UI.UfrmWordlistEditor in 'child\Keyman.Developer.UI.UfrmWordlistEditor.pas' {frmWordlistEditor},
Keyman.Developer.UI.dmActionsModelEditor in 'actions\Keyman.Developer.UI.dmActionsModelEditor.pas' {modActionsModelEditor: TDataModule},
UfrmMustIncludeDebug in 'dialogs\UfrmMustIncludeDebug.pas' {frmMustIncludeDebug},
Sentry.Client in '..\..\..\windows\src\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\..\windows\src\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\..\windows\src\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.KeymanSentryClient in '..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
Keyman.System.Standards.LangTagsRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
Keyman.Developer.System.Project.UrlRenderer in 'project\Keyman.Developer.System.Project.UrlRenderer.pas',

6
developer/src/tike/Tike.dproj
View file

@ -533,9 +533,9 @@
<DCCReference Include="dialogs\UfrmMustIncludeDebug.pas">
<Form>frmMustIncludeDebug</Form>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\windows\src\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\..\windows\src\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
<DCCReference Include="project\Keyman.Developer.System.Project.UrlRenderer.pas"/>

2
windows/src/desktop/inst/keymandesktop.wxs
View file

@ -223,7 +223,7 @@
</Directory>
<ComponentGroup Id="KeymanSentryComponents" Directory="dir_sentry_0.4.9" Source="..\..\ext\sentry">
<ComponentGroup Id="KeymanSentryComponents" Directory="dir_sentry_0.4.9" Source="..\..\..\..\common\windows\delphi\ext\sentry">
<Component>
<File Id="sentry.dll" KeyPath="yes" />
</Component>

4
windows/src/desktop/kmbrowserhost/kmbrowserhost.dpr
View file

@ -16,8 +16,8 @@ uses
GetOsVersion in '..\..\global\delphi\general\GetOsVersion.pas',
klog in '..\..\global\delphi\general\klog.pas',
utildir in '..\..\global\delphi\general\utildir.pas',
Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas',
sentry in '..\..\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
sentry in '..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.KeymanSentryClient in '..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas';
{R icons.res}

4
windows/src/desktop/kmbrowserhost/kmbrowserhost.dproj
View file

@ -126,8 +126,8 @@
<DCCReference Include="..\..\global\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\global\delphi\general\klog.pas"/>
<DCCReference Include="..\..\global\delphi\general\utildir.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>

6
windows/src/desktop/kmconfig/kmconfig.dpr
View file

@ -7,9 +7,9 @@ uses
KeymanVersion in '..\..\global\delphi\general\KeymanVersion.pas',
Keyman.System.Settings in '..\..\global\delphi\general\Keyman.System.Settings.pas',
Keyman.System.KeymanSentryClient in '..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
Sentry.Client.Console in '..\..\ext\sentry\Sentry.Client.Console.pas',
Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas',
sentry in '..\..\ext\sentry\sentry.pas',
Sentry.Client.Console in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas',
Sentry.Client in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
sentry in '..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas',
DebugPaths in '..\..\global\delphi\general\DebugPaths.pas',
utilexecute in '..\..\global\delphi\general\utilexecute.pas',

6
windows/src/desktop/kmconfig/kmconfig.dproj
View file

@ -119,9 +119,9 @@
<DCCReference Include="..\..\global\delphi\general\KeymanVersion.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.Settings.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.Console.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Console.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\global\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\global\delphi\general\DebugPaths.pas"/>
<DCCReference Include="..\..\global\delphi\general\utilexecute.pas"/>

6
windows/src/desktop/kmshell/kmshell.dpr
View file

@ -144,9 +144,9 @@ uses
Keyman.System.CEFManager in '..\..\global\delphi\chromium\Keyman.System.CEFManager.pas',
Keyman.UI.UframeCEFHost in '..\..\global\delphi\chromium\Keyman.UI.UframeCEFHost.pas',
UfrmHelp in 'help\UfrmHelp.pas' {frmHelp},
Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.LanguageCodeUtils in '..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
Keyman.System.Standards.LCIDToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',

6
windows/src/desktop/kmshell/kmshell.dproj
View file

@ -290,9 +290,9 @@
<Form>frmHelp</Form>
<FormType>dfm</FormType>
</DCCReference>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
<DCCReference Include="..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
<DCCReference Include="..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>

BIN
windows/src/desktop/kmshell/kmshell.res
View file

Binary file not shown.

6
windows/src/engine/Makefile
View file

@ -91,9 +91,9 @@ keyman64-install:
# ----------------------------------------------------------------------
redist:
copy $(ROOT)\src\ext\sentry\sentry.dll $(ROOT)\bin\engine
copy $(ROOT)\src\ext\sentry\sentry.x64.dll $(ROOT)\bin\engine
copy $(ROOT)\src\ext\sentry\crashpad_handler.exe $(ROOT)\bin\engine
copy $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.dll $(ROOT)\bin\engine
copy $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\sentry.x64.dll $(ROOT)\bin\engine
copy $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry\crashpad_handler.exe $(ROOT)\bin\engine
# ----------------------------------------------------------------------

8
windows/src/engine/inst/components.wxs
View file

@ -110,17 +110,17 @@
<Component Guid="{A7115FEE-A904-4C68-B093-AA5F1EF027B7}">
<!-- #5166: This should *always* be version 2.3 of sentry.dll -->
<File Id="sentry.2.3.dll" KeyPath="yes" Source="..\..\ext\sentry\2.3\sentry.dll" />
<File Id="sentry.2.3.dll" KeyPath="yes" Source="..\..\..\..\common\windows\delphi\ext\sentry\2.3\sentry.dll" />
</Component>
<Component Guid="{909DABBB-914F-4ADF-8391-BB293778D70E}">
<!-- #5166: This should *always* be version 2.3 of sentry.x64.dll -->
<File Id="sentry.x64.2.3.dll" KeyPath="yes" Source="..\..\ext\sentry\2.3\sentry.x64.dll" />
<File Id="sentry.x64.2.3.dll" KeyPath="yes" Source="..\..\..\..\common\windows\delphi\ext\sentry\2.3\sentry.x64.dll" />
</Component>
<Component Guid="{AF7C9288-7085-4C02-AA79-9DA4F152BDBB}">
<!-- #5166: This should *always* be version 2.3 of crashpad_handler.exe -->
<File Id="crashpad_handler.2.3.exe" KeyPath="yes" Source="..\..\ext\sentry\2.3\crashpad_handler.exe" />
<File Id="crashpad_handler.2.3.exe" KeyPath="yes" Source="..\..\..\..\common\windows\delphi\ext\sentry\2.3\crashpad_handler.exe" />
</Component>
<Component Guid="{B8867245-9570-4B63-B631-00F1474F71D4}">
@ -243,7 +243,7 @@
</ComponentGroup>
<ComponentGroup Id="KeymanEngineSentryComponents" Directory="dir_sentry_0.4.9" Source="..\..\ext\sentry">
<ComponentGroup Id="KeymanEngineSentryComponents" Directory="dir_sentry_0.4.9" Source="..\..\..\..\common\windows\delphi\ext\sentry">
<Component Guid="{95AB1B5C-2556-4282-B327-E2E417B26926}">
<File Id="sentry.dll" KeyPath="yes" />
</Component>

6
windows/src/engine/keyman/keyman.dpr
View file

@ -114,9 +114,9 @@ uses
Keyman.System.Security in '..\..\global\delphi\general\Keyman.System.Security.pas',
Keyman.Winapi.VersionHelpers in '..\..\global\delphi\winapi\Keyman.Winapi.VersionHelpers.pas',
Keyman.System.FrameworkInputPane in 'touchkeyboard\Keyman.System.FrameworkInputPane.pas',
Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.KeymanSentryClient in '..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
Keyman.System.LocaleStrings in '..\..\global\delphi\cust\Keyman.System.LocaleStrings.pas';

6
windows/src/engine/keyman/keyman.dproj
View file

@ -238,9 +238,9 @@
<DCCReference Include="..\..\global\delphi\general\Keyman.System.Security.pas"/>
<DCCReference Include="..\..\global\delphi\winapi\Keyman.Winapi.VersionHelpers.pas"/>
<DCCReference Include="touchkeyboard\Keyman.System.FrameworkInputPane.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<DCCReference Include="..\..\global\delphi\cust\Keyman.System.LocaleStrings.pas"/>
<None Include="Profiling\AQtimeModule1.aqt"/>

8
windows/src/engine/keymanx64/keymanx64.vcxproj
View file

@ -63,7 +63,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\global\inc;..\..\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<MinimalRebuild>true</MinimalRebuild>
@ -77,7 +77,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<AdditionalDependencies>..\..\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -102,7 +102,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\global\inc;..\..\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -114,7 +114,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<AdditionalDependencies>..\..\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>

8
windows/src/engine/mcompile/mcompile.vcxproj
View file

@ -61,13 +61,13 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>..\..\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
@ -80,7 +80,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
@ -88,7 +88,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>..\..\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\common\windows\delphi\ext\sentry\sentry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>sentry.dll</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>

6
windows/src/engine/tsysinfo/tsysinfo.dpr
View file

@ -56,9 +56,9 @@ uses
Keyman.UI.UframeCEFHost in '..\..\global\delphi\chromium\Keyman.UI.UframeCEFHost.pas' {frameCEFHost},
UserMessages in '..\..\global\delphi\general\UserMessages.pas',
KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas',
Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
Sentry.Client.Vcl in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas',
sentry in '..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.KeymanSentryClient in '..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas';
{$R *.res}

6
windows/src/engine/tsysinfo/tsysinfo.dproj
View file

@ -207,9 +207,9 @@
</DCCReference>
<DCCReference Include="..\..\global\delphi\general\UserMessages.pas"/>
<DCCReference Include="..\..\global\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.Vcl.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>

4
windows/src/engine/tsysinfox64/tsysinfox64.dpr
View file

@ -7,8 +7,8 @@ uses
si_processes in 'si_processes.pas',
sysinfo_util in 'sysinfo_util.pas',
main in 'main.pas',
Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas',
sentry in '..\..\ext\sentry\sentry.pas',
Sentry.Client in '..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas',
sentry in '..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas',
Keyman.System.KeymanSentryClient in '..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas',
DebugPaths in '..\..\global\delphi\general\DebugPaths.pas',

4
windows/src/engine/tsysinfox64/tsysinfox64.dproj
View file

@ -129,8 +129,8 @@
<DCCReference Include="si_processes.pas"/>
<DCCReference Include="sysinfo_util.pas"/>
<DCCReference Include="main.pas"/>
<DCCReference Include="..\..\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\Sentry.Client.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\ext\sentry\sentry.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<DCCReference Include="..\..\global\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\global\delphi\general\DebugPaths.pas"/>

4
windows/src/global/delphi/general/Keyman.System.KeymanSentryClient.pas
View file

@ -88,9 +88,9 @@ const
KEYMAN_ROOT = 'KEYMAN_ROOT'; // environment variable
{$IFDEF WIN64}
DEV_SENTRY_PATH = 'windows\src\ext\sentry\sentry.x64.dll';
DEV_SENTRY_PATH = 'common\windows\delphi\ext\sentry\sentry.x64.dll';
{$ELSE WIN64}
DEV_SENTRY_PATH = 'windows\src\ext\sentry\sentry.dll';
DEV_SENTRY_PATH = 'common\windows\delphi\ext\sentry\sentry.dll';
{$ENDIF}
{ TKeymanSentryClient }