diff --git a/windows/src/buildtools/buildpkg/buildpkg.dpr b/windows/src/buildtools/buildpkg/buildpkg.dpr index c545a8d84c..2dfeb19d7e 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dpr +++ b/windows/src/buildtools/buildpkg/buildpkg.dpr @@ -73,8 +73,7 @@ uses Keyman.System.Standards.NRSIAllTagsRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.NRSIAllTagsRegistry.pas', Keyman.System.CanonicalLanguageCodeUtils in '..\..\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas', Keyman.System.LexicalModelUtils in '..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas', - Keyman.System.PackageInfoRefreshLexicalModels in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas', - utilxml in '..\..\global\delphi\general\utilxml.pas'; + Keyman.System.PackageInfoRefreshLexicalModels in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas'; begin Run; diff --git a/windows/src/buildtools/buildpkg/buildpkg.dproj b/windows/src/buildtools/buildpkg/buildpkg.dproj index 39ae20b881..54d459a1c8 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dproj +++ b/windows/src/buildtools/buildpkg/buildpkg.dproj @@ -7,7 +7,7 @@ 1 Console None - 18.8 + 18.4 Win32 @@ -161,7 +161,6 @@ - Cfg_2 Base @@ -242,11 +241,6 @@ true - - - true - - buildpkg.exe @@ -258,6 +252,7 @@ 1 + Contents\MacOS 0 @@ -266,20 +261,6 @@ classes 1 - - classes - 1 - - - - - res\xml - 1 - - - res\xml - 1 - @@ -292,242 +273,90 @@ library\lib\armeabi 1 - - library\lib\armeabi - 1 - - - - - library\lib\armeabi-v7a - 1 - library\lib\mips 1 - - library\lib\mips - 1 - library\lib\armeabi-v7a 1 - - library\lib\arm64-v8a - 1 - - - - - library\lib\armeabi-v7a - 1 - res\drawable 1 - - res\drawable - 1 - res\values 1 - - res\values - 1 - - - - - res\values-v21 - 1 - - - res\values-v21 - 1 - - - - - res\values - 1 - - - res\values - 1 - res\drawable 1 - - res\drawable - 1 - res\drawable-xxhdpi 1 - - res\drawable-xxhdpi - 1 - res\drawable-ldpi 1 - - res\drawable-ldpi - 1 - res\drawable-mdpi 1 - - res\drawable-mdpi - 1 - res\drawable-hdpi 1 - - res\drawable-hdpi - 1 - res\drawable-xhdpi 1 - - res\drawable-xhdpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-xxxhdpi - 1 - - - res\drawable-xxxhdpi - 1 - res\drawable-small 1 - - res\drawable-small - 1 - res\drawable-normal 1 - - res\drawable-normal - 1 - res\drawable-large 1 - - res\drawable-large - 1 - res\drawable-xlarge 1 - - res\drawable-xlarge - 1 - - - - - res\values - 1 - - - res\values - 1 - @@ -545,10 +374,6 @@ 1 .framework - - 1 - .framework - 0 @@ -558,10 +383,6 @@ 1 .dylib - - 1 - .dylib - 0 .dll;.bpl @@ -584,10 +405,6 @@ 1 .dylib - - 1 - .dylib - 0 .bpl @@ -597,9 +414,6 @@ 0 - - 0 - 0 @@ -612,9 +426,6 @@ 0 - - 0 - 0 @@ -630,17 +441,6 @@ 1 - - - 1 - - - 1 - - - 1 - - 1 @@ -652,39 +452,6 @@ 1 - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - 1 @@ -696,61 +463,6 @@ 1 - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - 1 @@ -762,116 +474,6 @@ 1 - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - 1 @@ -905,35 +507,10 @@ 1 - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - 1 - - 1 - @@ -959,7 +536,6 @@ 1 - @@ -967,20 +543,12 @@ Contents\Resources 1 - - Contents\Resources - 1 - library\lib\armeabi-v7a 1 - - library\lib\arm64-v8a - 1 - 1 @@ -996,19 +564,10 @@ 1 - - 1 - 0 - - - library\lib\armeabi-v7a - 1 - - 1 @@ -1044,9 +603,7 @@ - - 12 diff --git a/windows/src/desktop/kmshell/util/utilkmshell.pas b/windows/src/desktop/kmshell/util/utilkmshell.pas index dd04b43037..728bbf16b2 100644 --- a/windows/src/desktop/kmshell/util/utilkmshell.pas +++ b/windows/src/desktop/kmshell/util/utilkmshell.pas @@ -105,11 +105,22 @@ function GetLongFileName(const fname: string): string; function WaitForElevatedConfiguration(WindowHandle: THandle; const Parameters: WideString; FWait: Boolean = True): Cardinal; function RunConfiguration(WindowHandle: THandle; const Parameters: WideString): Boolean; +function DefaultServersXMLTags: string; +function DefaultVersionXMLTags: string; implementation -uses ShellApi, KLog, Forms, ActiveX, getosversion, ErrorControlledRegistry, - utilexecute; +uses + ShellApi, + KLog, + Forms, + ActiveX, + getosversion, + ErrorControlledRegistry, + KeymanVersion, + utilexecute, + Upload_Settings, + utilxml; function IsKeyboardPackage(const FileName: string): Boolean; begin @@ -666,5 +677,23 @@ begin ShowMessage(SysErrorMessage(GetLastError)); end; +function DefaultServersXMLTags: string; +begin + Result := Format('%s%s', [ + XMLEncode(KeymanCom_Protocol_Server), + XMLEncode(MakeAPIURL('')) + ]); +end; + +function DefaultVersionXMLTags: string; +begin + with CKeymanVersionInfo do + Result := Format( + '', + [Version, VersionWin, VersionRelease, VersionMajor, VersionMinor, + VersionPatch, Tier, Tag, VersionWithTag, Environment]); +end; + end. diff --git a/windows/src/desktop/kmshell/web/Keyman.Configuration.System.HttpServer.App.pas b/windows/src/desktop/kmshell/web/Keyman.Configuration.System.HttpServer.App.pas index e48b2dc578..fb59308538 100644 --- a/windows/src/desktop/kmshell/web/Keyman.Configuration.System.HttpServer.App.pas +++ b/windows/src/desktop/kmshell/web/Keyman.Configuration.System.HttpServer.App.pas @@ -74,6 +74,7 @@ uses OptionsXMLRenderer, SupportXMLRenderer, Upload_Settings, + utilkmshell, utilxml; { THttpServerApp } diff --git a/windows/src/developer/kmcomp/kmcomp.dpr b/windows/src/developer/kmcomp/kmcomp.dpr index d9eb7d523e..1eea5732e4 100644 --- a/windows/src/developer/kmcomp/kmcomp.dpr +++ b/windows/src/developer/kmcomp/kmcomp.dpr @@ -113,13 +113,12 @@ uses Keyman.Developer.System.Project.modelTsProjectFileAction in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas', Keyman.Developer.System.LexicalModelCompile in '..\..\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas', Keyman.System.LexicalModelUtils in '..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas', - Keyman.Developer.System.Project.ProjectLogConsole in 'Keyman.Developer.System.Project.ProjectLogConsole.pas', + Keyman.Developer.System.Project.ProjectLogConsole in 'Keyman.Developer.System.Project.ProjectLogConsole.pas' {$R icons.RES}, Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas', Sentry.Client.Console in '..\..\ext\sentry\Sentry.Client.Console.pas', sentry in '..\..\ext\sentry\sentry.pas', Keyman.System.KeymanSentryClient in '..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas', - KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas', - utilxml in '..\..\global\delphi\general\utilxml.pas'; + KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas'; {$R icons.RES} {$R version.res} diff --git a/windows/src/developer/kmcomp/kmcomp.dproj b/windows/src/developer/kmcomp/kmcomp.dproj index e7fad7397d..5cbeafeb82 100644 --- a/windows/src/developer/kmcomp/kmcomp.dproj +++ b/windows/src/developer/kmcomp/kmcomp.dproj @@ -276,7 +276,6 @@ - Cfg_2 Base @@ -354,12 +353,6 @@ true - - - kmcomp.exe - true - - true diff --git a/windows/src/global/delphi/general/KeymanVersion.pas b/windows/src/global/delphi/general/KeymanVersion.pas index 3921dc8eed..c3e0aca917 100644 --- a/windows/src/global/delphi/general/KeymanVersion.pas +++ b/windows/src/global/delphi/general/KeymanVersion.pas @@ -66,21 +66,6 @@ const SKeymanDesktopName = 'Keyman'; // Keyman Desktop was renamed to Keyman [for Windows] in 14.0 -function DefaultVersionXMLTags: string; - implementation -uses - System.SysUtils; - -function DefaultVersionXMLTags: string; -begin - with CKeymanVersionInfo do - Result := Format( - '', - [Version, VersionWin, VersionRelease, VersionMajor, VersionMinor, - VersionPatch, Tier, Tag, VersionWithTag, Environment]); -end; - end. diff --git a/windows/src/global/delphi/general/Upload_Settings.pas b/windows/src/global/delphi/general/Upload_Settings.pas index 9c59bdfa54..a674968e5e 100644 --- a/windows/src/global/delphi/general/Upload_Settings.pas +++ b/windows/src/global/delphi/general/Upload_Settings.pas @@ -1,18 +1,18 @@ (* Name: Upload_Settings Copyright: Copyright (C) SIL International. - Documentation: - Description: + Documentation: + Description: Create Date: 1 Aug 2006 Modified Date: 15 Apr 2015 Authors: mcdurdin - Related Files: - Dependencies: + Related Files: + Dependencies: - Bugs: - Todo: - Notes: + Bugs: + Todo: + Notes: History: 01 Aug 2006 - mcdurdin - Initial version 14 Sep 2006 - mcdurdin - Add CRM callbacks 04 Dec 2006 - mcdurdin - Add Activate and ViewCustomer URLs @@ -74,8 +74,6 @@ function MakeAPIURL(path: string): string; function MakeKeymanURL(const path: string): string; -function DefaultServersXMLTags: string; - implementation uses @@ -84,7 +82,6 @@ uses DebugPaths, ErrorControlledRegistry, RegistryKeys, - utilxml, VersionInfo; const