From 4c29e74e4caa63e1c2eb4658720344ade0e6ce6d Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Mon, 6 Jun 2022 15:13:53 +1000 Subject: [PATCH 1/2] chore(windows): move ext/sentry to common --- .../src => common/windows/delphi}/ext/sentry.txt | 0 .../windows/delphi}/ext/sentry/2.3/README.md | 0 .../delphi}/ext/sentry/2.3/crashpad_handler.exe | Bin .../windows/delphi}/ext/sentry/2.3/sentry.dll | Bin .../windows/delphi}/ext/sentry/2.3/sentry.x64.dll | Bin .../delphi}/ext/sentry/Sentry.Client.Console.pas | 0 .../delphi}/ext/sentry/Sentry.Client.Vcl.pas | 0 .../windows/delphi}/ext/sentry/Sentry.Client.pas | 0 .../delphi}/ext/sentry/build_sentry_for_keyman.bat | 0 .../windows/delphi}/ext/sentry/crashpad_handler.exe | Bin .../windows/delphi}/ext/sentry/sentry.dll | Bin .../windows/delphi}/ext/sentry/sentry.h | 0 .../windows/delphi}/ext/sentry/sentry.lib | Bin .../windows/delphi}/ext/sentry/sentry.pas | 0 .../windows/delphi}/ext/sentry/sentry.x64.dll | Bin .../windows/delphi}/ext/sentry/sentry.x64.lib | Bin .../windows/delphi}/ext/sentry/test/Makefile | 0 .../Sentry.Client.Test.SentryClientTestMain.pas | 0 .../Sentry.Client.Test.SentryClientVclTestMain.dfm | 0 .../Sentry.Client.Test.SentryClientVclTestMain.pas | 0 .../delphi}/ext/sentry/test/SentryClientTest.dpr | 0 .../delphi}/ext/sentry/test/SentryClientTest.dproj | 0 .../delphi}/ext/sentry/test/SentryClientTest.res | Bin .../delphi}/ext/sentry/test/SentryClientVclTest.dfm | 0 .../delphi}/ext/sentry/test/SentryClientVclTest.dpr | 0 .../ext/sentry/test/SentryClientVclTest.dproj | 0 .../delphi}/ext/sentry/test/SentryClientVclTest.res | Bin .../delphi}/ext/sentry/test/SentryTest.groupproj | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename {windows/src => common/windows/delphi}/ext/sentry.txt (100%) rename {windows/src => common/windows/delphi}/ext/sentry/2.3/README.md (100%) rename {windows/src => common/windows/delphi}/ext/sentry/2.3/crashpad_handler.exe (100%) rename {windows/src => common/windows/delphi}/ext/sentry/2.3/sentry.dll (100%) rename {windows/src => common/windows/delphi}/ext/sentry/2.3/sentry.x64.dll (100%) rename {windows/src => common/windows/delphi}/ext/sentry/Sentry.Client.Console.pas (100%) rename {windows/src => common/windows/delphi}/ext/sentry/Sentry.Client.Vcl.pas (100%) rename {windows/src => common/windows/delphi}/ext/sentry/Sentry.Client.pas (100%) rename {windows/src => common/windows/delphi}/ext/sentry/build_sentry_for_keyman.bat (100%) rename {windows/src => common/windows/delphi}/ext/sentry/crashpad_handler.exe (100%) rename {windows/src => common/windows/delphi}/ext/sentry/sentry.dll (100%) rename {windows/src => common/windows/delphi}/ext/sentry/sentry.h (100%) rename {windows/src => common/windows/delphi}/ext/sentry/sentry.lib (100%) rename {windows/src => common/windows/delphi}/ext/sentry/sentry.pas (100%) rename {windows/src => common/windows/delphi}/ext/sentry/sentry.x64.dll (100%) rename {windows/src => common/windows/delphi}/ext/sentry/sentry.x64.lib (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/Makefile (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/Sentry.Client.Test.SentryClientTestMain.pas (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.dfm (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.pas (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryClientTest.dpr (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryClientTest.dproj (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryClientTest.res (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryClientVclTest.dfm (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryClientVclTest.dpr (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryClientVclTest.dproj (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryClientVclTest.res (100%) rename {windows/src => common/windows/delphi}/ext/sentry/test/SentryTest.groupproj (100%) diff --git a/windows/src/ext/sentry.txt b/common/windows/delphi/ext/sentry.txt similarity index 100% rename from windows/src/ext/sentry.txt rename to common/windows/delphi/ext/sentry.txt diff --git a/windows/src/ext/sentry/2.3/README.md b/common/windows/delphi/ext/sentry/2.3/README.md similarity index 100% rename from windows/src/ext/sentry/2.3/README.md rename to common/windows/delphi/ext/sentry/2.3/README.md diff --git a/windows/src/ext/sentry/2.3/crashpad_handler.exe b/common/windows/delphi/ext/sentry/2.3/crashpad_handler.exe similarity index 100% rename from windows/src/ext/sentry/2.3/crashpad_handler.exe rename to common/windows/delphi/ext/sentry/2.3/crashpad_handler.exe diff --git a/windows/src/ext/sentry/2.3/sentry.dll b/common/windows/delphi/ext/sentry/2.3/sentry.dll similarity index 100% rename from windows/src/ext/sentry/2.3/sentry.dll rename to common/windows/delphi/ext/sentry/2.3/sentry.dll diff --git a/windows/src/ext/sentry/2.3/sentry.x64.dll b/common/windows/delphi/ext/sentry/2.3/sentry.x64.dll similarity index 100% rename from windows/src/ext/sentry/2.3/sentry.x64.dll rename to common/windows/delphi/ext/sentry/2.3/sentry.x64.dll diff --git a/windows/src/ext/sentry/Sentry.Client.Console.pas b/common/windows/delphi/ext/sentry/Sentry.Client.Console.pas similarity index 100% rename from windows/src/ext/sentry/Sentry.Client.Console.pas rename to common/windows/delphi/ext/sentry/Sentry.Client.Console.pas diff --git a/windows/src/ext/sentry/Sentry.Client.Vcl.pas b/common/windows/delphi/ext/sentry/Sentry.Client.Vcl.pas similarity index 100% rename from windows/src/ext/sentry/Sentry.Client.Vcl.pas rename to common/windows/delphi/ext/sentry/Sentry.Client.Vcl.pas diff --git a/windows/src/ext/sentry/Sentry.Client.pas b/common/windows/delphi/ext/sentry/Sentry.Client.pas similarity index 100% rename from windows/src/ext/sentry/Sentry.Client.pas rename to common/windows/delphi/ext/sentry/Sentry.Client.pas diff --git a/windows/src/ext/sentry/build_sentry_for_keyman.bat b/common/windows/delphi/ext/sentry/build_sentry_for_keyman.bat similarity index 100% rename from windows/src/ext/sentry/build_sentry_for_keyman.bat rename to common/windows/delphi/ext/sentry/build_sentry_for_keyman.bat diff --git a/windows/src/ext/sentry/crashpad_handler.exe b/common/windows/delphi/ext/sentry/crashpad_handler.exe similarity index 100% rename from windows/src/ext/sentry/crashpad_handler.exe rename to common/windows/delphi/ext/sentry/crashpad_handler.exe diff --git a/windows/src/ext/sentry/sentry.dll b/common/windows/delphi/ext/sentry/sentry.dll similarity index 100% rename from windows/src/ext/sentry/sentry.dll rename to common/windows/delphi/ext/sentry/sentry.dll diff --git a/windows/src/ext/sentry/sentry.h b/common/windows/delphi/ext/sentry/sentry.h similarity index 100% rename from windows/src/ext/sentry/sentry.h rename to common/windows/delphi/ext/sentry/sentry.h diff --git a/windows/src/ext/sentry/sentry.lib b/common/windows/delphi/ext/sentry/sentry.lib similarity index 100% rename from windows/src/ext/sentry/sentry.lib rename to common/windows/delphi/ext/sentry/sentry.lib diff --git a/windows/src/ext/sentry/sentry.pas b/common/windows/delphi/ext/sentry/sentry.pas similarity index 100% rename from windows/src/ext/sentry/sentry.pas rename to common/windows/delphi/ext/sentry/sentry.pas diff --git a/windows/src/ext/sentry/sentry.x64.dll b/common/windows/delphi/ext/sentry/sentry.x64.dll similarity index 100% rename from windows/src/ext/sentry/sentry.x64.dll rename to common/windows/delphi/ext/sentry/sentry.x64.dll diff --git a/windows/src/ext/sentry/sentry.x64.lib b/common/windows/delphi/ext/sentry/sentry.x64.lib similarity index 100% rename from windows/src/ext/sentry/sentry.x64.lib rename to common/windows/delphi/ext/sentry/sentry.x64.lib diff --git a/windows/src/ext/sentry/test/Makefile b/common/windows/delphi/ext/sentry/test/Makefile similarity index 100% rename from windows/src/ext/sentry/test/Makefile rename to common/windows/delphi/ext/sentry/test/Makefile diff --git a/windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientTestMain.pas b/common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientTestMain.pas similarity index 100% rename from windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientTestMain.pas rename to common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientTestMain.pas diff --git a/windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.dfm b/common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.dfm similarity index 100% rename from windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.dfm rename to common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.dfm diff --git a/windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.pas b/common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.pas similarity index 100% rename from windows/src/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.pas rename to common/windows/delphi/ext/sentry/test/Sentry.Client.Test.SentryClientVclTestMain.pas diff --git a/windows/src/ext/sentry/test/SentryClientTest.dpr b/common/windows/delphi/ext/sentry/test/SentryClientTest.dpr similarity index 100% rename from windows/src/ext/sentry/test/SentryClientTest.dpr rename to common/windows/delphi/ext/sentry/test/SentryClientTest.dpr diff --git a/windows/src/ext/sentry/test/SentryClientTest.dproj b/common/windows/delphi/ext/sentry/test/SentryClientTest.dproj similarity index 100% rename from windows/src/ext/sentry/test/SentryClientTest.dproj rename to common/windows/delphi/ext/sentry/test/SentryClientTest.dproj diff --git a/windows/src/ext/sentry/test/SentryClientTest.res b/common/windows/delphi/ext/sentry/test/SentryClientTest.res similarity index 100% rename from windows/src/ext/sentry/test/SentryClientTest.res rename to common/windows/delphi/ext/sentry/test/SentryClientTest.res diff --git a/windows/src/ext/sentry/test/SentryClientVclTest.dfm b/common/windows/delphi/ext/sentry/test/SentryClientVclTest.dfm similarity index 100% rename from windows/src/ext/sentry/test/SentryClientVclTest.dfm rename to common/windows/delphi/ext/sentry/test/SentryClientVclTest.dfm diff --git a/windows/src/ext/sentry/test/SentryClientVclTest.dpr b/common/windows/delphi/ext/sentry/test/SentryClientVclTest.dpr similarity index 100% rename from windows/src/ext/sentry/test/SentryClientVclTest.dpr rename to common/windows/delphi/ext/sentry/test/SentryClientVclTest.dpr diff --git a/windows/src/ext/sentry/test/SentryClientVclTest.dproj b/common/windows/delphi/ext/sentry/test/SentryClientVclTest.dproj similarity index 100% rename from windows/src/ext/sentry/test/SentryClientVclTest.dproj rename to common/windows/delphi/ext/sentry/test/SentryClientVclTest.dproj diff --git a/windows/src/ext/sentry/test/SentryClientVclTest.res b/common/windows/delphi/ext/sentry/test/SentryClientVclTest.res similarity index 100% rename from windows/src/ext/sentry/test/SentryClientVclTest.res rename to common/windows/delphi/ext/sentry/test/SentryClientVclTest.res diff --git a/windows/src/ext/sentry/test/SentryTest.groupproj b/common/windows/delphi/ext/sentry/test/SentryTest.groupproj similarity index 100% rename from windows/src/ext/sentry/test/SentryTest.groupproj rename to common/windows/delphi/ext/sentry/test/SentryTest.groupproj From 1006be89146b88dc050e171e6c673a6965c5709f Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Mon, 6 Jun 2022 15:48:24 +1000 Subject: [PATCH 2/2] chore(windows): update sentry references --- developer/src/Makefile | 6 ++-- developer/src/inst/kmdev.wxs | 2 +- developer/src/kmanalyze/kmanalyze.vcxproj | 26 +++++++++--------- .../src/kmanalyze/kmanalyze.vcxproj.filters | 2 +- developer/src/kmcomp/kmcomp.dpr | 6 ++-- developer/src/kmcomp/kmcomp.dproj | 6 ++-- developer/src/kmconvert/kmconvert.dpr | 6 ++-- developer/src/kmconvert/kmconvert.dproj | 6 ++-- developer/src/kmdecomp/kmdecomp.vcxproj | 8 +++--- developer/src/tike/Tike.dpr | 6 ++-- developer/src/tike/Tike.dproj | 6 ++-- windows/src/desktop/inst/keymandesktop.wxs | 2 +- .../desktop/kmbrowserhost/kmbrowserhost.dpr | 4 +-- .../desktop/kmbrowserhost/kmbrowserhost.dproj | 4 +-- windows/src/desktop/kmconfig/kmconfig.dpr | 6 ++-- windows/src/desktop/kmconfig/kmconfig.dproj | 6 ++-- windows/src/desktop/kmshell/kmshell.dpr | 6 ++-- windows/src/desktop/kmshell/kmshell.dproj | 6 ++-- windows/src/desktop/kmshell/kmshell.res | Bin 7036 -> 7036 bytes windows/src/engine/Makefile | 6 ++-- windows/src/engine/inst/components.wxs | 8 +++--- windows/src/engine/keyman/keyman.dpr | 6 ++-- windows/src/engine/keyman/keyman.dproj | 6 ++-- .../src/engine/keymanx64/keymanx64.vcxproj | 8 +++--- windows/src/engine/mcompile/mcompile.vcxproj | 8 +++--- windows/src/engine/tsysinfo/tsysinfo.dpr | 6 ++-- windows/src/engine/tsysinfo/tsysinfo.dproj | 6 ++-- .../src/engine/tsysinfox64/tsysinfox64.dpr | 4 +-- .../src/engine/tsysinfox64/tsysinfox64.dproj | 4 +-- .../Keyman.System.KeymanSentryClient.pas | 4 +-- 30 files changed, 90 insertions(+), 90 deletions(-) diff --git a/developer/src/Makefile b/developer/src/Makefile index 954bd74985..cbaee79a20 100644 --- a/developer/src/Makefile +++ b/developer/src/Makefile @@ -76,9 +76,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 # ---------------------------------------------------------------------- diff --git a/developer/src/inst/kmdev.wxs b/developer/src/inst/kmdev.wxs index c4897c4f00..1994f73b23 100644 --- a/developer/src/inst/kmdev.wxs +++ b/developer/src/inst/kmdev.wxs @@ -223,7 +223,7 @@ - + diff --git a/developer/src/kmanalyze/kmanalyze.vcxproj b/developer/src/kmanalyze/kmanalyze.vcxproj index cfe9be23c8..c5acb1de70 100644 --- a/developer/src/kmanalyze/kmanalyze.vcxproj +++ b/developer/src/kmanalyze/kmanalyze.vcxproj @@ -72,25 +72,25 @@ true - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry $(ProjectDir)bin\$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ true - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry $(ProjectDir)bin\$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry $(ProjectDir)bin\$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry $(ProjectDir)bin\$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ @@ -104,12 +104,12 @@ true pch.h MultiThreadedDebug - $(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories) + $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) Console true - $(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) + $(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) sentry.dll @@ -123,12 +123,12 @@ true pch.h MultiThreaded - $(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories) + $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) Console true - $(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) + $(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) sentry.dll @@ -144,14 +144,14 @@ true pch.h MultiThreaded - $(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories) + $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) Console true true true - $(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) + $(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) sentry.dll @@ -167,19 +167,19 @@ true pch.h MultiThreaded - $(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories) + $(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) Console true true true - $(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) + $(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) sentry.dll - + diff --git a/developer/src/kmanalyze/kmanalyze.vcxproj.filters b/developer/src/kmanalyze/kmanalyze.vcxproj.filters index 25c35a4499..f04f4556ff 100644 --- a/developer/src/kmanalyze/kmanalyze.vcxproj.filters +++ b/developer/src/kmanalyze/kmanalyze.vcxproj.filters @@ -21,7 +21,7 @@ Header Files - + Header Files diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr index 033c7d7efc..197bc81e33 100644 --- a/developer/src/kmcomp/kmcomp.dpr +++ b/developer/src/kmcomp/kmcomp.dpr @@ -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', diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj index db17bbad7f..302ab96010 100644 --- a/developer/src/kmcomp/kmcomp.dproj +++ b/developer/src/kmcomp/kmcomp.dproj @@ -262,9 +262,9 @@ - - - + + + diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr index fbb83b0d0d..707e1c8e30 100644 --- a/developer/src/kmconvert/kmconvert.dpr +++ b/developer/src/kmconvert/kmconvert.dpr @@ -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', diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj index 64759ae639..c2e0ac5f39 100644 --- a/developer/src/kmconvert/kmconvert.dproj +++ b/developer/src/kmconvert/kmconvert.dproj @@ -191,9 +191,9 @@
$R icons.RES
 - - - + + + diff --git a/developer/src/kmdecomp/kmdecomp.vcxproj b/developer/src/kmdecomp/kmdecomp.vcxproj index 004b6cdb97..7660d7743d 100644 --- a/developer/src/kmdecomp/kmdecomp.vcxproj +++ b/developer/src/kmdecomp/kmdecomp.vcxproj @@ -68,7 +68,7 @@ Disabled - $(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories) + $(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -87,7 +87,7 @@ Console MachineX86 true - $(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) + $(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) sentry.dll @@ -104,7 +104,7 @@ MaxSpeed OnlyExplicitInline - $(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\windows\src\ext\sentry;%(AdditionalIncludeDirectories) + $(KEYMAN_ROOT)\windows\src\global\inc;$(KEYMAN_ROOT)\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreaded @@ -123,7 +123,7 @@ Console MachineX86 true - $(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) + $(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) sentry.dll diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr index da9eb22c74..55937cf788 100644 --- a/developer/src/tike/Tike.dpr +++ b/developer/src/tike/Tike.dpr @@ -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', diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj index ef96ab0fa4..8bb8292602 100644 --- a/developer/src/tike/Tike.dproj +++ b/developer/src/tike/Tike.dproj @@ -533,9 +533,9 @@
frmMustIncludeDebug
 - - - + + + diff --git a/windows/src/desktop/inst/keymandesktop.wxs b/windows/src/desktop/inst/keymandesktop.wxs index a0b8650328..0fcb24a413 100644 --- a/windows/src/desktop/inst/keymandesktop.wxs +++ b/windows/src/desktop/inst/keymandesktop.wxs @@ -223,7 +223,7 @@ - + diff --git a/windows/src/desktop/kmbrowserhost/kmbrowserhost.dpr b/windows/src/desktop/kmbrowserhost/kmbrowserhost.dpr index 3a48275a9b..da7c00ce28 100644 --- a/windows/src/desktop/kmbrowserhost/kmbrowserhost.dpr +++ b/windows/src/desktop/kmbrowserhost/kmbrowserhost.dpr @@ -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} diff --git a/windows/src/desktop/kmbrowserhost/kmbrowserhost.dproj b/windows/src/desktop/kmbrowserhost/kmbrowserhost.dproj index 5629daff4b..d75d675172 100644 --- a/windows/src/desktop/kmbrowserhost/kmbrowserhost.dproj +++ b/windows/src/desktop/kmbrowserhost/kmbrowserhost.dproj @@ -126,8 +126,8 @@ - - + + Cfg_2 diff --git a/windows/src/desktop/kmconfig/kmconfig.dpr b/windows/src/desktop/kmconfig/kmconfig.dpr index dc9b15843d..218adc47ae 100644 --- a/windows/src/desktop/kmconfig/kmconfig.dpr +++ b/windows/src/desktop/kmconfig/kmconfig.dpr @@ -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', diff --git a/windows/src/desktop/kmconfig/kmconfig.dproj b/windows/src/desktop/kmconfig/kmconfig.dproj index 8689cb632a..a5679d0071 100644 --- a/windows/src/desktop/kmconfig/kmconfig.dproj +++ b/windows/src/desktop/kmconfig/kmconfig.dproj @@ -119,9 +119,9 @@ - - - + + + diff --git a/windows/src/desktop/kmshell/kmshell.dpr b/windows/src/desktop/kmshell/kmshell.dpr index a568bca23c..4a76a48b28 100644 --- a/windows/src/desktop/kmshell/kmshell.dpr +++ b/windows/src/desktop/kmshell/kmshell.dpr @@ -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', diff --git a/windows/src/desktop/kmshell/kmshell.dproj b/windows/src/desktop/kmshell/kmshell.dproj index 1da3e82dd7..acd20a6eee 100644 --- a/windows/src/desktop/kmshell/kmshell.dproj +++ b/windows/src/desktop/kmshell/kmshell.dproj @@ -290,9 +290,9 @@
frmHelp
dfm - - - + + + diff --git a/windows/src/desktop/kmshell/kmshell.res b/windows/src/desktop/kmshell/kmshell.res index f558bcc403f46cff413859cf99a5161f6469ed02..6671b9f017d6304147ea66b611efd529342db23e 100644 GIT binary patch delta 15 Wcmexk_Qz~O3Cr^v3 delta 15 Wcmexk_Qz~O2@7xR8o7-XEYbis*9GYS diff --git a/windows/src/engine/Makefile b/windows/src/engine/Makefile index 2b5c923330..b783c2faf9 100644 --- a/windows/src/engine/Makefile +++ b/windows/src/engine/Makefile @@ -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 # ---------------------------------------------------------------------- diff --git a/windows/src/engine/inst/components.wxs b/windows/src/engine/inst/components.wxs index aa5572e9a8..27824789e3 100644 --- a/windows/src/engine/inst/components.wxs +++ b/windows/src/engine/inst/components.wxs @@ -110,17 +110,17 @@ - + - + - + @@ -243,7 +243,7 @@ - + diff --git a/windows/src/engine/keyman/keyman.dpr b/windows/src/engine/keyman/keyman.dpr index 71070c0fcc..3310e7b149 100644 --- a/windows/src/engine/keyman/keyman.dpr +++ b/windows/src/engine/keyman/keyman.dpr @@ -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'; diff --git a/windows/src/engine/keyman/keyman.dproj b/windows/src/engine/keyman/keyman.dproj index f7de634bd1..42c0fbb9df 100644 --- a/windows/src/engine/keyman/keyman.dproj +++ b/windows/src/engine/keyman/keyman.dproj @@ -238,9 +238,9 @@ - - - + + + diff --git a/windows/src/engine/keymanx64/keymanx64.vcxproj b/windows/src/engine/keymanx64/keymanx64.vcxproj index 08d1bca87e..0958b352d3 100644 --- a/windows/src/engine/keymanx64/keymanx64.vcxproj +++ b/windows/src/engine/keymanx64/keymanx64.vcxproj @@ -63,7 +63,7 @@ Disabled - ..\..\global\inc;..\..\ext\sentry;%(AdditionalIncludeDirectories) + ..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false true @@ -77,7 +77,7 @@ true - ..\..\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies) + ..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmtd.lib;%(AdditionalDependencies) ..\..\..\lib;%(AdditionalLibraryDirectories) false true @@ -102,7 +102,7 @@ X64 - ..\..\global\inc;..\..\ext\sentry;%(AdditionalIncludeDirectories) + ..\..\global\inc;..\..\..\..\common\windows\delphi\ext\sentry;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false MultiThreaded @@ -114,7 +114,7 @@ true - ..\..\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies) + ..\..\..\..\common\windows\delphi\ext\sentry\sentry.x64.lib;keyman64.lib;libcmt.lib;%(AdditionalDependencies) ..\..\..\lib;%(AdditionalLibraryDirectories) false true diff --git a/windows/src/engine/mcompile/mcompile.vcxproj b/windows/src/engine/mcompile/mcompile.vcxproj index c99214ef87..05a33dac36 100644 --- a/windows/src/engine/mcompile/mcompile.vcxproj +++ b/windows/src/engine/mcompile/mcompile.vcxproj @@ -61,13 +61,13 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - ..\..\ext\sentry;..\..\global\inc + ..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc pch.h Console true - ..\..\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) + ..\..\..\..\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) sentry.dll @@ -80,7 +80,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded - ..\..\ext\sentry;..\..\global\inc + ..\..\..\..\common\windows\delphi\ext\sentry;..\..\global\inc pch.h @@ -88,7 +88,7 @@ true true true - ..\..\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) + ..\..\..\..\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) sentry.dll diff --git a/windows/src/engine/tsysinfo/tsysinfo.dpr b/windows/src/engine/tsysinfo/tsysinfo.dpr index 48e4dd1a6d..239147edf4 100644 --- a/windows/src/engine/tsysinfo/tsysinfo.dpr +++ b/windows/src/engine/tsysinfo/tsysinfo.dpr @@ -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} diff --git a/windows/src/engine/tsysinfo/tsysinfo.dproj b/windows/src/engine/tsysinfo/tsysinfo.dproj index 61c4159557..74c08fa50a 100644 --- a/windows/src/engine/tsysinfo/tsysinfo.dproj +++ b/windows/src/engine/tsysinfo/tsysinfo.dproj @@ -207,9 +207,9 @@ - - - + + + Cfg_2 diff --git a/windows/src/engine/tsysinfox64/tsysinfox64.dpr b/windows/src/engine/tsysinfox64/tsysinfox64.dpr index 947a8cf969..129195482a 100644 --- a/windows/src/engine/tsysinfox64/tsysinfox64.dpr +++ b/windows/src/engine/tsysinfox64/tsysinfox64.dpr @@ -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', diff --git a/windows/src/engine/tsysinfox64/tsysinfox64.dproj b/windows/src/engine/tsysinfox64/tsysinfox64.dproj index dc2c9fafcb..63071fc62c 100644 --- a/windows/src/engine/tsysinfox64/tsysinfox64.dproj +++ b/windows/src/engine/tsysinfox64/tsysinfox64.dproj @@ -129,8 +129,8 @@ - - + + diff --git a/windows/src/global/delphi/general/Keyman.System.KeymanSentryClient.pas b/windows/src/global/delphi/general/Keyman.System.KeymanSentryClient.pas index 7256fed654..81b92c0b6f 100644 --- a/windows/src/global/delphi/general/Keyman.System.KeymanSentryClient.pas +++ b/windows/src/global/delphi/general/Keyman.System.KeymanSentryClient.pas @@ -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 }