erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-16 20:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge pull request #6830 from keymanapp/chore/windows/move-general-developer-files

Browse source 
chore(windows): move general developer files to developer/ 🎢
This commit is contained in:
Marc Durdin 2022-06-25 05:42:59 +10:00 • committed by GitHub
commit de0ad2fe7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 646 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
windows/src/global/delphi/cust/StockFileNames.pas → common/windows/delphi/general/StockFileNames.pas
View file

119
developer/src/README.md
View file

@ -1,79 +1,114 @@
# Keyman Developer for Windows
# Keyman Developer
This is the current home for Keyman Developer.
# Transition steps
# Cross-dependencies
1. Split .kps and model compilers into separate paths
We do not have 100% clean separation between Keyman Developer and Keyman for
Windows. Shared units are intended to live in common, however the following
projects will need to be updated in the future.
* buildpkg in Windows depends on various compiler units in multiple folders.
* kmbrowserhost in Windows is included as part of Keyman Developer.
# Folders
## src/common
## inst
Units shared among Keyman Developer projects, Delphi
Contains a minimal distribution of node.js intended just for compiling
lexical models. If more dependencies are required, then the
developer will be expected to install node.js themselves; this gets
users going without requiring a large installer or a full node.js
install.
## src/ext
## kmlmc
3rd party code and components, mostly Delphi
Source files for node-based compilers kmlmc, kmlmi, and kmlmp
## src/inst - keymandeveloper.msi
## inst - keymandeveloper.msi
Building and signing of the installation archive keymandeveloper.msi.
Building and signing of the installation archive keymandeveloper.msi
### src/inst/node
## kmanalyze - kmanalyze.exe
Contains a minimal distribution of node.js intended just for compiling lexical
models. If more dependencies are required, then the developer will be expected
to install node.js themselves; this gets users going without requiring a large
installer or a full node.js install.
A keyboard source analysis and automated regression test tool. Testing for logical errors of a keyboard.
## src/kmanalyze - kmanalyze.exe
A keyboard source analysis and automated regression test tool. Testing for
logical errors of a keyboard.
## kcmpdll - kmcmpdll.dll & kmcmpdll.x64.dll
## src/kmcmpdll - kmcmpdll.dll & kmcmpdll.x64.dll
This is the main source code for the keyboard compiler, packaged as dynamic linked library. The consumers will call 'CompileKeyboardFile'
This is the main source code for the keyboard compiler, packaged as a dynamic
linked library for Windows. The consumers will call 'CompileKeyboardFile'.
## kcframe.exe & kcframe.x64.exe
### src/kmcmpdll/kcframe - kcframe.exe & kcframe.x64.exe
Located under kmcomp folder this is used for debugging in Visual Studio. A command line program compiler for a keyboard file 'kmn' into a binary format 'kmx'. Has hardcoded default arguments.
Located under kmcmpdll folder this is used for debugging in Visual Studio. A
command line program compiler for a keyboard file 'kmn' into a binary format
'kmx'. Has hardcoded default arguments.
## kmcomp - kmcomp.exe & kmcomp.x64.exe
## src/kmcomp - kmcomp.exe & kmcomp.x64.exe
The main command line compiler for a keyboard. It compiles keyboards (.kmn), packages (.kps), and projects (.kpj).
The main command line compiler for a keyboard. It compiles keyboards (.kmn),
packages (.kps), and projects (.kpj).
## kmconvert - kmconvert.exe & kmconvert.x64.exe
## src/kmconvert - kmconvert.exe & kmconvert.x64.exe
KMConvert converts keyboard layouts between different formats. KMConvert will generate a full Keyman template project from the imported layout or data, in a new folder named with the ID of the keyboard. It will not overwrite an existing folder.
KMConvert converts keyboard layouts between different formats. KMConvert will
generate a full Keyman template project from the imported layout or data, in a
new folder named with the ID of the keyboard. It will not overwrite an existing
folder. Also used to generate new projects from templates.
## kmdecomp - kmdecomp.exe
## src/kmdecomp - kmdecomp.exe
Unsupported utility decompiles a Keyman .kmx keyboard. It will produce a .kmn source file and optionally a .ico or
.bmp image. see kmdecomp/kmdecomp.md for details.
Unsupported utility decompiles a Keyman .kmx keyboard. It will produce a .kmn
source file and optionally a .ico or .bmp image. see kmdecomp/kmdecomp.md for
details.
## samples
## src/kmlmc
Contains sample keyboards and sample developer projects. See readme.txt for details.
node-based compilers for lexical models
## setup - setup.exe
### src/kmlmc/kmlmc - Lexical Model Compiler
Installation program for Keyman Developer.
The Lexical Model Compiler, kmlmc, runs on nodeJS on all supported desktop
platforms.
## TIKE - Tavultesoft Integrated Keyboard Editor
### src/kmlmc/kmlmp - Package Compiler
This is the designer side of the Developer. Used for designing, developing, testing and packing keyboards for distribution.
The package compiler is broadly compatible with the kmcomp .kps package
compiler. However at this stage it is only tested with lexical models, and use
with keyboards (either .js or .kmx) is not tested or supported. It is likely in
the future that the kmcomp .kps compiler will be deprecated in favour of this
one.
# kmlmc - Lexical Model Compiler
### src/kmlmc/kmlmi - Model Info Compiler
The Lexical Model Compiler, kmlmc, and the node-based
Package Compiler run on nodeJS on all supported desktop platforms.
Merges .model_info files for use on the Keyman Cloud lexical model repository
at https://github.com/keymanapp/lexical-models.
## kmlmc/kmlmp - Package Compiler
## src/samples
The package compiler is broadly compatible with the kmcomp .kps
package compiler. However at this stage it is only tested with
lexical models, and use with keyboards (either .js or .kmx) is not
tested or supported. It is likely in the future that the kmcomp
.kps compiler will be deprecated in favour of this one.
Contains sample keyboards and sample developer projects. See readme.txt for
details.
## kmlmc/kmlmi - Model Info Compiler
## src/server
Keyman Developer Server. Node-based, cross platform host app for Keyman
Developer. Used currently for web-based test and deployment. In future, will
be the foundation for a web-based Keyman Developer project.
## src/setup - setup.exe
Installation program for Keyman Developer for Windows. Bundles with
keymandeveloper.msi to generate single deployable installer executable.
## src/tike - "Tavultesoft Integrated Keyboard Editor"
This is the designer side of the Developer. Used for designing, developing,
testing and packing keyboards for distribution.
## src/tools
Various build-time tools for Keyman Developer.

0
windows/src/global/delphi/general/CompileErrorCodes.pas → developer/src/common/delphi/compiler/CompileErrorCodes.pas
View file

0
windows/src/global/delphi/general/CompilePackage.pas → developer/src/common/delphi/compiler/CompilePackage.pas
View file

0
windows/src/global/delphi/general/CompilePackageInstaller.pas → developer/src/common/delphi/compiler/CompilePackageInstaller.pas
View file

0
windows/src/global/delphi/general/Keyman.Developer.System.ValidateKpsFile.pas → developer/src/common/delphi/compiler/Keyman.Developer.System.ValidateKpsFile.pas
View file

0
windows/src/global/delphi/general/compile.pas → developer/src/common/delphi/compiler/compile.pas
View file

0
windows/src/global/delphi/general/KeyboardFonts.pas → developer/src/common/delphi/general/KeyboardFonts.pas
View file

0
windows/src/global/delphi/general/UKeymanTargets.pas → developer/src/common/delphi/general/UKeymanTargets.pas
View file

0
windows/src/global/delphi/general/WindowsLanguages.pas → developer/src/common/delphi/general/WindowsLanguages.pas
View file

0
windows/src/global/delphi/general/kpsfile.pas → developer/src/common/delphi/packages/kpsfile.pas
View file

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

@ -5,13 +5,13 @@ program kmcomp;
uses
System.SysUtils,
main in 'main.pas',
compile in '..\..\..\windows\src\global\delphi\general\compile.pas',
compile in '..\common\delphi\compiler\compile.pas',
VersionInfo in '..\..\..\common\windows\delphi\general\VersionInfo.pas',
RegistryKeys in '..\..\..\common\windows\delphi\general\RegistryKeys.pas',
kccompilepackage in 'kccompilepackage.pas',
CompilePackage in '..\..\..\windows\src\global\delphi\general\CompilePackage.pas',
CompilePackage in '..\common\delphi\compiler\CompilePackage.pas',
CRC32 in '..\..\..\common\windows\delphi\general\CRC32.pas',
kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas',
kpsfile in '..\common\delphi\packages\kpsfile.pas',
PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas',
PackageFileFormats in '..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
kmpinffile in '..\..\..\common\windows\delphi\packages\kmpinffile.pas',
@ -20,10 +20,9 @@ uses
httpuploader in '..\..\..\common\windows\delphi\general\httpuploader.pas',
httpuploader_messageprocessor_forms in '..\..\..\common\windows\delphi\general\httpuploader_messageprocessor_forms.pas',
utilfiletypes in '..\..\..\common\windows\delphi\general\utilfiletypes.pas',
CustomisationStorage in '..\..\..\windows\src\global\delphi\cust\CustomisationStorage.pas',
klog in '..\..\..\common\windows\delphi\general\klog.pas',
KeyNames in '..\..\..\common\windows\delphi\general\KeyNames.pas',
StockFileNames in '..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\common\windows\delphi\general\StockFileNames.pas',
KeymanDeveloperOptions in '..\tike\main\KeymanDeveloperOptions.pas',
Upload_Settings in '..\..\..\common\windows\delphi\general\Upload_Settings.pas',
utilstr in '..\..\..\common\windows\delphi\general\utilstr.pas',
@ -34,7 +33,7 @@ uses
utilhttp in '..\..\..\common\windows\delphi\general\utilhttp.pas',
GetOsVersion in '..\..\..\common\windows\delphi\general\GetOsVersion.pas',
UfrmTike in '..\tike\main\UfrmTike.pas' {TikeForm: TTntForm},
CompilePackageInstaller in '..\..\..\windows\src\global\delphi\general\CompilePackageInstaller.pas',
CompilePackageInstaller in '..\common\delphi\compiler\CompilePackageInstaller.pas',
UTikeDebugMode in '..\tike\main\UTikeDebugMode.pas',
CompileKeymanWeb in '..\tike\compile\CompileKeymanWeb.pas',
VisualKeyboard in '..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas',
@ -51,13 +50,13 @@ uses
kmxfile in '..\..\..\common\windows\delphi\keyboards\kmxfile.pas',
Glossary in '..\..\..\common\windows\delphi\general\Glossary.pas',
VKeys in '..\..\..\common\windows\delphi\general\VKeys.pas',
CompileErrorCodes in '..\..\..\windows\src\global\delphi\general\CompileErrorCodes.pas',
CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas',
TouchLayout in '..\tike\oskbuilder\TouchLayout.pas',
TouchLayoutDefinitions in '..\tike\oskbuilder\TouchLayoutDefinitions.pas',
TouchLayoutUtils in '..\tike\oskbuilder\TouchLayoutUtils.pas',
KeyboardFonts in '..\..\..\windows\src\global\delphi\general\KeyboardFonts.pas',
KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas',
KeyboardParser in '..\tike\main\KeyboardParser.pas',
WindowsLanguages in '..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas',
WindowsLanguages in '..\common\delphi\general\WindowsLanguages.pas',
TempFileManager in '..\..\..\common\windows\delphi\general\TempFileManager.pas',
JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas',
TikeUnicodeData in '..\tike\main\TikeUnicodeData.pas',
@ -65,7 +64,7 @@ uses
ttinfo in '..\..\..\common\windows\delphi\general\ttinfo.pas',
ADODB_TLB in '..\..\..\common\windows\delphi\tlb\ADODB_TLB.pas',
ADOX_TLB in '..\..\..\common\windows\delphi\tlb\ADOX_TLB.pas',
UKeymanTargets in '..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas',
UKeymanTargets in '..\common\delphi\general\UKeymanTargets.pas',
kccompileproject in 'kccompileproject.pas',
Keyman.Developer.System.Project.ProjectFile in '..\tike\project\Keyman.Developer.System.Project.ProjectFile.pas',
mrulist in '..\tike\main\mrulist.pas',
@ -119,7 +118,7 @@ uses
Keyman.Developer.System.Project.UrlRenderer in '..\tike\project\Keyman.Developer.System.Project.UrlRenderer.pas',
Keyman.Developer.System.ValidateRepoChanges in 'Keyman.Developer.System.ValidateRepoChanges.pas',
Keyman.Developer.System.KeymanDeveloperPaths in '..\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas',
Keyman.Developer.System.ValidateKpsFile in '..\..\..\windows\src\global\delphi\general\Keyman.Developer.System.ValidateKpsFile.pas';
Keyman.Developer.System.ValidateKpsFile in '..\common\delphi\compiler\Keyman.Developer.System.ValidateKpsFile.pas';
{$R icons.RES}
{$R version.res}

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

@ -62,7 +62,6 @@
<Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
<SanitizedProjectName>kmcomp</SanitizedProjectName>
<DCC_ConsoleTarget>true</DCC_ConsoleTarget>
<DCC_UnitSearchPath>..\..\..\windows\src\global\delphi\vclzip;..\..\resellers;C:\keyman\8.0\src\global\delphi\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_Define>KPSMALL;VERSION_KEYMAN_DEVELOPER;$(DCC_Define)</DCC_Define>
<DCC_ImageBase>00400000</DCC_ImageBase>
<DCC_IOChecking>false</DCC_IOChecking>
@ -152,26 +151,25 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="main.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\compile.pas"/>
<DCCReference Include="..\common\delphi\compiler\compile.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\RegistryKeys.pas"/>
<DCCReference Include="kccompilepackage.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompilePackage.pas"/>
<DCCReference Include="..\common\delphi\compiler\CompilePackage.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\CRC32.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\common\delphi\packages\kpsfile.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\TIKE\main\RedistFiles.pas"/>
<DCCReference Include="..\tike\main\RedistFiles.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\httpuploader.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\httpuploader_messageprocessor_forms.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\cust\CustomisationStorage.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\klog.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\KeyNames.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\TIKE\main\KeymanDeveloperOptions.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\tike\main\KeymanDeveloperOptions.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\Upload_Settings.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilsystem.pas"/>
@ -180,15 +178,15 @@
<DCCReference Include="..\..\..\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilhttp.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\TIKE\main\UfrmTike.pas">
<DCCReference Include="..\tike\main\UfrmTike.pas">
<Form>TikeForm</Form>
<DesignClass>TTntForm</DesignClass>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompilePackageInstaller.pas"/>
<DCCReference Include="..\TIKE\main\UTikeDebugMode.pas"/>
<DCCReference Include="..\TIKE\compile\CompileKeymanWeb.pas"/>
<DCCReference Include="..\common\delphi\compiler\CompilePackageInstaller.pas"/>
<DCCReference Include="..\tike\main\UTikeDebugMode.pas"/>
<DCCReference Include="..\tike\compile\CompileKeymanWeb.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas"/>
<DCCReference Include="..\TIKE\compile\KeymanWebKeyCodes.pas"/>
<DCCReference Include="..\tike\compile\KeymanWebKeyCodes.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\ExtShiftState.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\wininet5.pas"/>
@ -201,44 +199,43 @@
<DCCReference Include="..\..\..\common\windows\delphi\keyboards\kmxfile.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\Glossary.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\VKeys.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompileErrorCodes.pas"/>
<DCCReference Include="..\TIKE\oskbuilder\TouchLayout.pas"/>
<DCCReference Include="..\TIKE\oskbuilder\TouchLayoutDefinitions.pas"/>
<DCCReference Include="..\TIKE\oskbuilder\TouchLayoutUtils.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\TIKE\main\KeyboardParser.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\common\delphi\compiler\CompileErrorCodes.pas"/>
<DCCReference Include="..\tike\oskbuilder\TouchLayout.pas"/>
<DCCReference Include="..\tike\oskbuilder\TouchLayoutDefinitions.pas"/>
<DCCReference Include="..\tike\oskbuilder\TouchLayoutUtils.pas"/>
<DCCReference Include="..\common\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\tike\main\KeyboardParser.pas"/>
<DCCReference Include="..\common\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\TempFileManager.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<DCCReference Include="..\TIKE\main\TikeUnicodeData.pas"/>
<DCCReference Include="..\tike\main\TikeUnicodeData.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\charmap\UnicodeData.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\ttinfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\tlb\ADODB_TLB.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\tlb\ADOX_TLB.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\common\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="kccompileproject.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFile.pas"/>
<DCCReference Include="..\TIKE\main\mrulist.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.Project.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFiles.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFileType.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectLoader.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kmnProjectFile.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kmxProjectFile.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kpsProjectFile.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kvkProjectFile.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\UMD5Hash.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectFile.pas"/>
<DCCReference Include="..\tike\main\mrulist.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.Project.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectFiles.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectFileType.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectLoader.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kmnProjectFile.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kmxProjectFile.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kpsProjectFile.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kvkProjectFile.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\UserMessages.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverBinary.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverXML.pas"/>
<DCCReference Include="kccompilekvk.pas"/>
<DCCReference Include="..\TIKE\compile\ValidateKeyboardInfo.pas"/>
<DCCReference Include="..\TIKE\compile\MergeKeyboardInfo.pas"/>
<DCCReference Include="..\TIKE\compile\JsonExtractKeyboardInfo.pas"/>
<DCCReference Include="..\tike\compile\ValidateKeyboardInfo.pas"/>
<DCCReference Include="..\tike\compile\MergeKeyboardInfo.pas"/>
<DCCReference Include="..\tike\compile\JsonExtractKeyboardInfo.pas"/>
<DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
<DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
<DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
@ -252,11 +249,11 @@
<DCCReference Include="..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
<DCCReference Include="..\common\delphi\general\TextFileFormat.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
<DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.modelTsProjectFile.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas"/>
<DCCReference Include="..\common\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas"/>
<DCCReference Include="..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
<DCCReference Include="Keyman.Developer.System.Project.ProjectLogConsole.pas"/>
@ -267,10 +264,10 @@
<DCCReference Include="..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
<DCCReference Include="..\tike\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
<DCCReference Include="Keyman.Developer.System.ValidateRepoChanges.pas"/>
<DCCReference Include="..\TIKE\main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.Developer.System.ValidateKpsFile.pas"/>
<DCCReference Include="..\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
<DCCReference Include="..\common\delphi\compiler\Keyman.Developer.System.ValidateKpsFile.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>

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

@ -10,10 +10,10 @@ uses
KeymanVersion in '..\..\..\common\windows\delphi\general\KeymanVersion.pas',
utilexecute in '..\..\..\common\windows\delphi\general\utilexecute.pas',
Keyman.Developer.System.KeyboardProjectTemplate in 'Keyman.Developer.System.KeyboardProjectTemplate.pas',
UKeymanTargets in '..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas',
UKeymanTargets in '..\common\delphi\general\UKeymanTargets.pas',
utilstr in '..\..\..\common\windows\delphi\general\utilstr.pas',
Unicode in '..\..\..\common\windows\delphi\general\Unicode.pas',
StockFileNames in '..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\common\windows\delphi\general\StockFileNames.pas',
utilfiletypes in '..\..\..\common\windows\delphi\general\utilfiletypes.pas',
KeyboardParser in '..\TIKE\main\KeyboardParser.pas',
kmxfile in '..\..\..\common\windows\delphi\keyboards\kmxfile.pas',
@ -21,13 +21,13 @@ uses
ExtShiftState in '..\..\..\common\windows\delphi\visualkeyboard\ExtShiftState.pas',
utilsystem in '..\..\..\common\windows\delphi\general\utilsystem.pas',
VKeys in '..\..\..\common\windows\delphi\general\VKeys.pas',
WindowsLanguages in '..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas',
WindowsLanguages in '..\common\delphi\general\WindowsLanguages.pas',
GetOsVersion in '..\..\..\common\windows\delphi\general\GetOsVersion.pas',
CRC32 in '..\..\..\common\windows\delphi\general\CRC32.pas',
KeyNames in '..\..\..\common\windows\delphi\general\KeyNames.pas',
utildir in '..\..\..\common\windows\delphi\general\utildir.pas',
TextFileFormat in '..\common\delphi\general\TextFileFormat.pas',
kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas',
kpsfile in '..\common\delphi\packages\kpsfile.pas',
PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas',
JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas',
VersionInfo in '..\..\..\common\windows\delphi\general\VersionInfo.pas',
@ -74,10 +74,10 @@ uses
TouchLayout in '..\TIKE\oskbuilder\TouchLayout.pas',
TouchLayoutDefinitions in '..\TIKE\oskbuilder\TouchLayoutDefinitions.pas',
TouchLayoutUtils in '..\TIKE\oskbuilder\TouchLayoutUtils.pas',
KeyboardFonts in '..\..\..\windows\src\global\delphi\general\KeyboardFonts.pas',
KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas',
Keyman.System.Util.RenderLanguageIcon in '..\..\..\common\windows\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas',
utilicon in '..\..\..\common\windows\delphi\general\utilicon.pas',
CompileErrorCodes in '..\..\..\windows\src\global\delphi\general\CompileErrorCodes.pas',
CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas',
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',

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

@ -116,10 +116,10 @@
<DCCReference Include="..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilexecute.pas"/>
<DCCReference Include="Keyman.Developer.System.KeyboardProjectTemplate.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\common\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\TIKE\main\KeyboardParser.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\keyboards\kmxfile.pas"/>
@ -127,13 +127,13 @@
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\ExtShiftState.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilsystem.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\VKeys.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\common\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\CRC32.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\KeyNames.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\common\delphi\general\TextFileFormat.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\common\delphi\packages\kpsfile.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
@ -172,7 +172,6 @@
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverBinary.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverXML.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\UMD5Hash.pas"/>
<DCCReference Include="Keyman.Developer.System.KMConvertParameters.pas"/>
<DCCReference Include="Keyman.Developer.System.ImportKeyboardDLL.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\ScanCodeMap.pas"/>
@ -181,10 +180,10 @@
<DCCReference Include="..\TIKE\oskbuilder\TouchLayout.pas"/>
<DCCReference Include="..\TIKE\oskbuilder\TouchLayoutDefinitions.pas"/>
<DCCReference Include="..\TIKE\oskbuilder\TouchLayoutUtils.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\common\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utilicon.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompileErrorCodes.pas"/>
<DCCReference Include="..\common\delphi\compiler\CompileErrorCodes.pas"/>
<DCCReference Include="Keyman.Developer.System.ModelProjectTemplate.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.wordlistTsvProjectFile.pas">

7
developer/src/test/auto/Makefile
View file

@ -24,7 +24,8 @@ developer-tests: \
kmconvert \
kmx-file-languages \
lexical-model-compiler \
model-ts-parser
model-ts-parser \
package-info
# ----------------------------------------------------------------------
@ -75,6 +76,10 @@ model-ts-parser: .virtual
# cd $(DEVELOPER_ROOT)\src\test\auto\model-ts-parser
# $(MAKE) $(TARGET)
package-info: .virtual
cd $(DEVELOPER_ROOT)\src\test\auto\package-info
$(MAKE) $(TARGET)
# ----------------------------------------------------------------------
!include ..\..\Target.mak

108
developer/src/test/auto/developer-test-auto.groupproj Normal file
View file

@ -0,0 +1,108 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{39F157F7-EACA-4480-A268-2AEEF826DE21}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<Projects Include="keyboard-js-info\KeyboardJSInfoTestSuite.dproj">
<Dependencies/>
</Projects>
<Projects Include="keyboard-package-versions\KeyboardPackageVersionsTestSuite.dproj">
<Dependencies/>
</Projects>
<Projects Include="kmcomp-x64-structures\passtructsize\passtructsize.dproj">
<Dependencies/>
</Projects>
<Projects Include="kmconvert\kmconverttest.dproj">
<Dependencies/>
</Projects>
<Projects Include="kmx-file-languages\KMXFileLanguagesTestSuite.dproj">
<Dependencies/>
</Projects>
<Projects Include="model-ts-parser\ModelTsParserTest.dproj">
<Dependencies/>
</Projects>
<Projects Include="package-info\PackageInfoTestSuite.dproj">
<Dependencies/>
</Projects>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Default.Personality.12</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<Default.Personality/>
</BorlandProject>
</ProjectExtensions>
<Target Name="KeyboardJSInfoTestSuite">
<MSBuild Projects="keyboard-js-info\KeyboardJSInfoTestSuite.dproj"/>
</Target>
<Target Name="KeyboardJSInfoTestSuite:Clean">
<MSBuild Projects="keyboard-js-info\KeyboardJSInfoTestSuite.dproj" Targets="Clean"/>
</Target>
<Target Name="KeyboardJSInfoTestSuite:Make">
<MSBuild Projects="keyboard-js-info\KeyboardJSInfoTestSuite.dproj" Targets="Make"/>
</Target>
<Target Name="KeyboardPackageVersionsTestSuite">
<MSBuild Projects="keyboard-package-versions\KeyboardPackageVersionsTestSuite.dproj"/>
</Target>
<Target Name="KeyboardPackageVersionsTestSuite:Clean">
<MSBuild Projects="keyboard-package-versions\KeyboardPackageVersionsTestSuite.dproj" Targets="Clean"/>
</Target>
<Target Name="KeyboardPackageVersionsTestSuite:Make">
<MSBuild Projects="keyboard-package-versions\KeyboardPackageVersionsTestSuite.dproj" Targets="Make"/>
</Target>
<Target Name="passtructsize">
<MSBuild Projects="kmcomp-x64-structures\passtructsize\passtructsize.dproj"/>
</Target>
<Target Name="passtructsize:Clean">
<MSBuild Projects="kmcomp-x64-structures\passtructsize\passtructsize.dproj" Targets="Clean"/>
</Target>
<Target Name="passtructsize:Make">
<MSBuild Projects="kmcomp-x64-structures\passtructsize\passtructsize.dproj" Targets="Make"/>
</Target>
<Target Name="kmconverttest">
<MSBuild Projects="kmconvert\kmconverttest.dproj"/>
</Target>
<Target Name="kmconverttest:Clean">
<MSBuild Projects="kmconvert\kmconverttest.dproj" Targets="Clean"/>
</Target>
<Target Name="kmconverttest:Make">
<MSBuild Projects="kmconvert\kmconverttest.dproj" Targets="Make"/>
</Target>
<Target Name="KMXFileLanguagesTestSuite">
<MSBuild Projects="kmx-file-languages\KMXFileLanguagesTestSuite.dproj"/>
</Target>
<Target Name="KMXFileLanguagesTestSuite:Clean">
<MSBuild Projects="kmx-file-languages\KMXFileLanguagesTestSuite.dproj" Targets="Clean"/>
</Target>
<Target Name="KMXFileLanguagesTestSuite:Make">
<MSBuild Projects="kmx-file-languages\KMXFileLanguagesTestSuite.dproj" Targets="Make"/>
</Target>
<Target Name="ModelTsParserTest">
<MSBuild Projects="model-ts-parser\ModelTsParserTest.dproj"/>
</Target>
<Target Name="ModelTsParserTest:Clean">
<MSBuild Projects="model-ts-parser\ModelTsParserTest.dproj" Targets="Clean"/>
</Target>
<Target Name="ModelTsParserTest:Make">
<MSBuild Projects="model-ts-parser\ModelTsParserTest.dproj" Targets="Make"/>
</Target>
<Target Name="PackageInfoTestSuite">
<MSBuild Projects="package-info\PackageInfoTestSuite.dproj"/>
</Target>
<Target Name="PackageInfoTestSuite:Clean">
<MSBuild Projects="package-info\PackageInfoTestSuite.dproj" Targets="Clean"/>
</Target>
<Target Name="PackageInfoTestSuite:Make">
<MSBuild Projects="package-info\PackageInfoTestSuite.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="KeyboardJSInfoTestSuite;KeyboardPackageVersionsTestSuite;passtructsize;kmconverttest;KMXFileLanguagesTestSuite;ModelTsParserTest;PackageInfoTestSuite"/>
</Target>
<Target Name="Clean">
<CallTarget Targets="KeyboardJSInfoTestSuite:Clean;KeyboardPackageVersionsTestSuite:Clean;passtructsize:Clean;kmconverttest:Clean;KMXFileLanguagesTestSuite:Clean;ModelTsParserTest:Clean;PackageInfoTestSuite:Clean"/>
</Target>
<Target Name="Make">
<CallTarget Targets="KeyboardJSInfoTestSuite:Make;KeyboardPackageVersionsTestSuite:Make;passtructsize:Make;kmconverttest:Make;KMXFileLanguagesTestSuite:Make;ModelTsParserTest:Make;PackageInfoTestSuite:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>

20
developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
View file

@ -12,14 +12,14 @@ uses
DUnitX.Loggers.Xml.NUnit,
DUnitX.TestFramework,
Keyman.Test.System.CompilePackageVersioningTest in 'Keyman.Test.System.CompilePackageVersioningTest.pas',
CompilePackage in '..\..\..\..\..\windows\src\global\delphi\general\CompilePackage.pas',
CompilePackage in '..\..\..\common\delphi\compiler\CompilePackage.pas',
VisualKeyboard in '..\..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas',
kmpinffile in '..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
kpsfile in '..\..\..\..\..\windows\src\global\delphi\general\kpsfile.pas',
kpsfile in '..\..\..\common\delphi\packages\kpsfile.pas',
PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
JsonUtil in '..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas',
@ -53,7 +53,7 @@ uses
DebugPaths in '..\..\..\..\..\common\windows\delphi\general\DebugPaths.pas',
Upload_Settings in '..\..\..\..\..\common\windows\delphi\general\Upload_Settings.pas',
klog in '..\..\..\..\..\common\windows\delphi\general\klog.pas',
compile in '..\..\..\..\..\windows\src\global\delphi\general\compile.pas',
compile in '..\..\..\common\delphi\compiler\compile.pas',
Keyman.Developer.System.Project.kmnProjectFile in '..\..\..\tike\project\Keyman.Developer.System.Project.kmnProjectFile.pas',
Keyman.Developer.System.Project.kmnProjectFileAction in '..\..\..\tike\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas',
Keyman.Developer.System.Project.Project in '..\..\..\tike\project\Keyman.Developer.System.Project.Project.pas',
@ -65,11 +65,11 @@ uses
Keyman.Developer.System.Project.ProjectLoader in '..\..\..\tike\project\Keyman.Developer.System.Project.ProjectLoader.pas',
Keyman.Developer.System.Project.ProjectLog in '..\..\..\tike\project\Keyman.Developer.System.Project.ProjectLog.pas',
Keyman.Developer.System.Project.ProjectSaver in '..\..\..\tike\project\Keyman.Developer.System.Project.ProjectSaver.pas',
UKeymanTargets in '..\..\..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas',
UKeymanTargets in '..\..\..\common\delphi\general\UKeymanTargets.pas',
CompileKeymanWeb in '..\..\..\tike\compile\CompileKeymanWeb.pas',
CompileErrorCodes in '..\..\..\..\..\windows\src\global\delphi\general\CompileErrorCodes.pas',
CompileErrorCodes in '..\..\..\common\delphi\compiler\CompileErrorCodes.pas',
KeyboardParser in '..\..\..\tike\main\KeyboardParser.pas',
WindowsLanguages in '..\..\..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas',
WindowsLanguages in '..\..\..\common\delphi\general\WindowsLanguages.pas',
KeymanWebKeyCodes in '..\..\..\tike\compile\KeymanWebKeyCodes.pas',
kmxfileutils in '..\..\..\..\..\common\windows\delphi\keyboards\kmxfileutils.pas',
TikeUnicodeData in '..\..\..\tike\main\TikeUnicodeData.pas',
@ -80,10 +80,10 @@ uses
TouchLayoutDefinitions in '..\..\..\tike\oskbuilder\TouchLayoutDefinitions.pas',
TouchLayout in '..\..\..\tike\oskbuilder\TouchLayout.pas',
TouchLayoutUtils in '..\..\..\tike\oskbuilder\TouchLayoutUtils.pas',
KeyboardFonts in '..\..\..\..\..\windows\src\global\delphi\general\KeyboardFonts.pas',
KeyboardFonts in '..\..\..\common\delphi\general\KeyboardFonts.pas',
Keyman.Developer.System.Project.kpsProjectFile in '..\..\..\tike\project\Keyman.Developer.System.Project.kpsProjectFile.pas',
Keyman.Developer.System.Project.kpsProjectFileAction in '..\..\..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas',
CompilePackageInstaller in '..\..\..\..\..\windows\src\global\delphi\general\CompilePackageInstaller.pas',
CompilePackageInstaller in '..\..\..\common\delphi\compiler\CompilePackageInstaller.pas',
utilhttp in '..\..\..\..\..\common\windows\delphi\general\utilhttp.pas',
Keyman.System.LanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.LanguageCodeUtils.pas',
Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\..\..\common\windows\delphi\vcl\Keyman.System.RegExGroupHelperRSP19902.pas',
@ -98,7 +98,7 @@ uses
Keyman.System.Standards.LangTagsRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
Keyman.Developer.System.Project.UrlRenderer in '..\..\..\tike\project\Keyman.Developer.System.Project.UrlRenderer.pas',
KeymanPaths in '..\..\..\..\..\common\windows\delphi\general\KeymanPaths.pas',
Keyman.Developer.System.ValidateKpsFile in '..\..\..\..\..\windows\src\global\delphi\general\Keyman.Developer.System.ValidateKpsFile.pas',
Keyman.Developer.System.ValidateKpsFile in '..\..\..\common\delphi\compiler\Keyman.Developer.System.ValidateKpsFile.pas',
Keyman.Developer.System.KeymanDeveloperPaths in '..\..\..\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas';
var

68
developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
View file

@ -93,13 +93,14 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="Keyman.Test.System.CompilePackageVersioningTest.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\CompilePackage.pas"/>
<DCCReference Include="..\..\..\common\delphi\compiler\CompilePackage.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\..\common\delphi\packages\kpsfile.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
@ -121,7 +122,7 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\keyboards\kmxfile.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\CRC32.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\KeyNames.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\KeymanDeveloperOptions.pas"/>
<DCCReference Include="..\..\..\tike\main\KeymanDeveloperOptions.pas"/>
<DCCReference Include="..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
<DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
<DCCReference Include="..\..\..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
@ -129,43 +130,42 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\TempFileManager.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\RedistFiles.pas"/>
<DCCReference Include="..\..\..\tike\main\RedistFiles.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Upload_Settings.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\klog.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\compile.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.kmnProjectFile.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.Project.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectFile.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectFiles.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectFileType.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\mrulist.pas"/>
<DCCReference Include="..\..\..\common\delphi\compiler\compile.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.kmnProjectFile.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.Project.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.ProjectFile.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.ProjectFiles.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.ProjectFileType.pas"/>
<DCCReference Include="..\..\..\tike\main\mrulist.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectLoader.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\compile\CompileKeymanWeb.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\CompileErrorCodes.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\KeyboardParser.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\compile\KeymanWebKeyCodes.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.ProjectLoader.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
<DCCReference Include="..\..\..\common\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\..\..\tike\compile\CompileKeymanWeb.pas"/>
<DCCReference Include="..\..\..\common\delphi\compiler\CompileErrorCodes.pas"/>
<DCCReference Include="..\..\..\tike\main\KeyboardParser.pas"/>
<DCCReference Include="..\..\..\common\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\..\..\tike\compile\KeymanWebKeyCodes.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\keyboards\kmxfileutils.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\TikeUnicodeData.pas"/>
<DCCReference Include="..\..\..\tike\main\TikeUnicodeData.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\charmap\UnicodeData.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\tlb\ADODB_TLB.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\tlb\ADOX_TLB.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\ttinfo.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\oskbuilder\TouchLayoutDefinitions.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\oskbuilder\TouchLayout.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\oskbuilder\TouchLayoutUtils.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.kpsProjectFile.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\CompilePackageInstaller.pas"/>
<DCCReference Include="..\..\..\tike\oskbuilder\TouchLayoutDefinitions.pas"/>
<DCCReference Include="..\..\..\tike\oskbuilder\TouchLayout.pas"/>
<DCCReference Include="..\..\..\tike\oskbuilder\TouchLayoutUtils.pas"/>
<DCCReference Include="..\..\..\common\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.kpsProjectFile.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
<DCCReference Include="..\..\..\common\delphi\compiler\CompilePackageInstaller.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilhttp.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\UMD5Hash.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\vcl\Keyman.System.RegExGroupHelperRSP19902.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\DUnitX.Loggers.TeamCity.pas"/>
@ -177,10 +177,10 @@
<DCCReference Include="..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
<DCCReference Include="..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
<DCCReference Include="..\..\..\tike\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\Keyman.Developer.System.ValidateKpsFile.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
<DCCReference Include="..\..\..\common\delphi\compiler\Keyman.Developer.System.ValidateKpsFile.pas"/>
<DCCReference Include="..\..\..\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>

2
developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr
View file

@ -6,7 +6,7 @@ program passtructsize;
uses
System.SysUtils,
compile in '..\..\..\..\..\..\windows\src\global\delphi\general\compile.pas',
compile in '..\..\..\..\common\delphi\compiler\compile.pas',
kmxfileconsts in '..\..\..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas',
RegistryKeys in '..\..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas',
KeymanVersion in '..\..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',

136
developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj
View file

@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{766E074A-91D9-4651-8CB0-66EAF581A91E}</ProjectGuid>
<ProjectVersion>18.7</ProjectVersion>
<ProjectVersion>18.8</ProjectVersion>
<FrameworkType>None</FrameworkType>
<MainSource>passtructsize.dpr</MainSource>
<Base>True</Base>
@ -91,14 +91,15 @@
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\..\..\global\delphi\general\compile.pas"/>
<DCCReference Include="..\..\..\..\common\delphi\compiler\compile.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
<DCCReference Include="..\..\..\..\developer\TIKE\main\RedistFiles.pas"/>
<DCCReference Include="..\..\..\..\tike\main\RedistFiles.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\vcl\ErrorControlledRegistry.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\general\Upload_Settings.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
@ -172,12 +173,20 @@
<RemoteDir>classes</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>classes</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidFileProvider">
<Platform Name="Android">
<RemoteDir>res\xml</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\xml</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidGDBServer">
<Platform Name="Android">
@ -190,138 +199,242 @@
<RemoteDir>library\lib\armeabi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidLibnativeArmeabiv7aFile">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidLibnativeMipsFile">
<Platform Name="Android">
<RemoteDir>library\lib\mips</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\mips</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidServiceOutput">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidServiceOutput_Android32">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashImageDef">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashStyles">
<Platform Name="Android">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashStylesV21">
<Platform Name="Android">
<RemoteDir>res\values-v21</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values-v21</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_Colors">
<Platform Name="Android">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon144">
<Platform Name="Android">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon36">
<Platform Name="Android">
<RemoteDir>res\drawable-ldpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-ldpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon48">
<Platform Name="Android">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon72">
<Platform Name="Android">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon96">
<Platform Name="Android">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon24">
<Platform Name="Android">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon36">
<Platform Name="Android">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon48">
<Platform Name="Android">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon72">
<Platform Name="Android">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon96">
<Platform Name="Android">
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-small</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage470">
<Platform Name="Android">
<RemoteDir>res\drawable-normal</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-normal</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage640">
<Platform Name="Android">
<RemoteDir>res\drawable-large</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-large</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage960">
<Platform Name="Android">
<RemoteDir>res\drawable-xlarge</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xlarge</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_Strings">
<Platform Name="Android">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
@ -410,6 +523,9 @@
<Platform Name="Android">
<Operation>0</Operation>
</Platform>
<Platform Name="Android64">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>0</Operation>
</Platform>
@ -699,6 +815,9 @@
<Platform Name="Android">
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice32">
@ -791,6 +910,10 @@
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
@ -815,6 +938,12 @@
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOutput_Android32">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectUWPManifest">
<Platform Name="Win32">
<Operation>1</Operation>
@ -852,6 +981,7 @@
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
</Deployment>
<Platforms>
<Platform value="Win32">True</Platform>

4
developer/src/test/auto/kmconvert/kmconverttest.dpr
View file

@ -13,7 +13,7 @@ uses
DUnitX.TestFramework,
Keyman.Developer.System.Test.KMConvertParametersTest in 'Keyman.Developer.System.Test.KMConvertParametersTest.pas',
Keyman.Developer.System.KMConvertParameters in '..\..\..\kmconvert\Keyman.Developer.System.KMConvertParameters.pas',
UKeymanTargets in '..\..\..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas',
UKeymanTargets in '..\..\..\common\delphi\general\UKeymanTargets.pas',
BCP47Tag in '..\..\..\..\..\common\windows\delphi\general\BCP47Tag.pas',
Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
Keyman.System.LanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.LanguageCodeUtils.pas',
@ -28,7 +28,7 @@ uses
Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas';
StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas';
var
runner : ITestRunner;

18
developer/src/test/auto/kmconvert/kmconverttest.dproj
View file

@ -148,8 +148,8 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="Keyman.Developer.System.Test.KMConvertParametersTest.pas"/>
<DCCReference Include="..\..\..\developer\kmconvert\Keyman.Developer.System.KMConvertParameters.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\..\..\kmconvert\Keyman.Developer.System.KMConvertParameters.pas"/>
<DCCReference Include="..\..\..\common\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\BCP47Tag.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
@ -164,7 +164,7 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
@ -191,6 +191,12 @@
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="3">
<DeployFile LocalName="bin\Win32\Debug\kmconverttest.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>kmconverttest.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="OSX32">
<Overwrite>true</Overwrite>
@ -206,12 +212,6 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="bin\Win32\Debug\kmconverttest.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>kmconverttest.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="AdditionalDebugSymbols">
<Platform Name="OSX32">
<Operation>1</Operation>

2
developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
View file

@ -18,7 +18,7 @@ uses
utildir in '..\..\..\..\..\common\windows\delphi\general\utildir.pas',
utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
KeymanVersion in '..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',

2
developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
View file

@ -98,7 +98,7 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
<DCCReference Include="..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>

4
developer/src/test/auto/model-ts-parser/ModelTsParserTest.dpr
View file

@ -12,8 +12,8 @@ uses
DUnitX.Loggers.Xml.NUnit,
DUnitX.TestFramework,
Keyman.System.Test.LexicalModelParserTest in 'Keyman.System.Test.LexicalModelParserTest.pas',
Keyman.Developer.System.LexicalModelParser in '..\..\..\developer\TIKE\main\Keyman.Developer.System.LexicalModelParser.pas',
Keyman.Developer.System.LexicalModelParserTypes in '..\..\..\developer\TIKE\main\Keyman.Developer.System.LexicalModelParserTypes.pas';
Keyman.Developer.System.LexicalModelParser in '..\..\..\tike\main\Keyman.Developer.System.LexicalModelParser.pas',
Keyman.Developer.System.LexicalModelParserTypes in '..\..\..\tike\main\Keyman.Developer.System.LexicalModelParserTypes.pas';
var
runner : ITestRunner;

135
developer/src/test/auto/model-ts-parser/ModelTsParserTest.dproj
View file

@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{0158CB55-B9BC-4F32-B860-FD6073AE2EB7}</ProjectGuid>
<ProjectVersion>18.7</ProjectVersion>
<ProjectVersion>18.8</ProjectVersion>
<FrameworkType>None</FrameworkType>
<MainSource>ModelTsParserTest.dpr</MainSource>
<Base>True</Base>
@ -85,8 +85,8 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="Keyman.System.Test.LexicalModelParserTest.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\Keyman.Developer.System.LexicalModelParser.pas"/>
<DCCReference Include="..\..\..\developer\TIKE\main\Keyman.Developer.System.LexicalModelParserTypes.pas"/>
<DCCReference Include="..\..\..\tike\main\Keyman.Developer.System.LexicalModelParser.pas"/>
<DCCReference Include="..\..\..\tike\main\Keyman.Developer.System.LexicalModelParserTypes.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
@ -143,12 +143,20 @@
<RemoteDir>classes</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>classes</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidFileProvider">
<Platform Name="Android">
<RemoteDir>res\xml</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\xml</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidGDBServer">
<Platform Name="Android">
@ -161,138 +169,242 @@
<RemoteDir>library\lib\armeabi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidLibnativeArmeabiv7aFile">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidLibnativeMipsFile">
<Platform Name="Android">
<RemoteDir>library\lib\mips</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\mips</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidServiceOutput">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidServiceOutput_Android32">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashImageDef">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashStyles">
<Platform Name="Android">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashStylesV21">
<Platform Name="Android">
<RemoteDir>res\values-v21</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values-v21</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_Colors">
<Platform Name="Android">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon144">
<Platform Name="Android">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon36">
<Platform Name="Android">
<RemoteDir>res\drawable-ldpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-ldpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon48">
<Platform Name="Android">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon72">
<Platform Name="Android">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon96">
<Platform Name="Android">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon24">
<Platform Name="Android">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon36">
<Platform Name="Android">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon48">
<Platform Name="Android">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon72">
<Platform Name="Android">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_NotificationIcon96">
<Platform Name="Android">
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-small</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage470">
<Platform Name="Android">
<RemoteDir>res\drawable-normal</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-normal</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage640">
<Platform Name="Android">
<RemoteDir>res\drawable-large</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-large</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage960">
<Platform Name="Android">
<RemoteDir>res\drawable-xlarge</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\drawable-xlarge</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_Strings">
<Platform Name="Android">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
@ -362,6 +474,9 @@
<Platform Name="Android">
<Operation>0</Operation>
</Platform>
<Platform Name="Android64">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>0</Operation>
</Platform>
@ -649,6 +764,9 @@
<Platform Name="Android">
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice32">
@ -692,6 +810,10 @@
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
@ -714,6 +836,12 @@
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOutput_Android32">
<Platform Name="Android64">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectUWPManifest">
<Platform Name="Win32">
<Operation>1</Operation>
@ -751,6 +879,7 @@
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
</Deployment>
<Platforms>
<Platform value="Win32">True</Platform>

0
windows/src/test/unit-tests/package-info/.gitignore → developer/src/test/auto/package-info/.gitignore vendored
View file

0
windows/src/test/unit-tests/package-info/Makefile → developer/src/test/auto/package-info/Makefile
View file

0
windows/src/test/unit-tests/package-info/PackageInfoTest.pas → developer/src/test/auto/package-info/PackageInfoTest.pas
View file

4
windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr → developer/src/test/auto/package-info/PackageInfoTestSuite.dpr
View file

@ -11,7 +11,7 @@ uses
PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
KeymanVersion in '..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
VersionInfo in '..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas',
@ -20,7 +20,7 @@ uses
utildir in '..\..\..\..\..\common\windows\delphi\general\utildir.pas',
RegistryKeys in '..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas',
GetOsVersion in '..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas',
kpsfile in '..\..\..\global\delphi\general\kpsfile.pas',
kpsfile in '..\..\..\..\..\developer\src\common\delphi\packages\kpsfile.pas',
PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
DUnitX.Loggers.Console,
DUnitX.Loggers.Xml.NUnit,

4
windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj → developer/src/test/auto/package-info/PackageInfoTestSuite.dproj
View file

@ -94,7 +94,7 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
@ -103,7 +103,7 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\..\common\delphi\packages\kpsfile.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="PackageInfoTest.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>

0
windows/src/test/unit-tests/package-info/PackageInfoTestSuite.res → developer/src/test/auto/package-info/PackageInfoTestSuite.res
View file

0
windows/src/test/unit-tests/package-info/test/test.inf → developer/src/test/auto/package-info/test/test.inf
View file

0
windows/src/test/unit-tests/package-info/test/test.json → developer/src/test/auto/package-info/test/test.json
View file

0
windows/src/test/unit-tests/package-info/test/test.xml → developer/src/test/auto/package-info/test/test.xml
View file

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

@ -13,10 +13,10 @@ uses
UfrmAboutTike in 'dialogs\UfrmAboutTike.pas' {frmAboutTike},
RegistryKeys in '..\..\..\common\windows\delphi\general\RegistryKeys.pas',
VersionInfo in '..\..\..\common\windows\delphi\general\VersionInfo.pas',
compile in '..\..\..\windows\src\global\delphi\general\compile.pas',
compile in '..\common\delphi\compiler\compile.pas',
KeymanDeveloperOptions in 'main\KeymanDeveloperOptions.pas',
UfrmKeyTest in 'debug\UfrmKeyTest.pas' {frmKeyTest},
CompilePackage in '..\..\..\windows\src\global\delphi\general\CompilePackage.pas',
CompilePackage in '..\common\delphi\compiler\CompilePackage.pas',
KeymanDeveloperUtils in 'main\KeymanDeveloperUtils.pas',
CRC32 in '..\..\..\common\windows\delphi\general\CRC32.pas',
UfrmEditor in 'child\UfrmEditor.pas' {frmEditor},
@ -73,12 +73,12 @@ uses
UfrmVisualKeyboardImportKMX in 'dialogs\UfrmVisualKeyboardImportKMX.pas' {frmVisualKeyboardImportKMX},
ScanCodeMap in '..\..\..\common\windows\delphi\general\ScanCodeMap.pas',
UfrmRegressionTestFailure in 'dialogs\UfrmRegressionTestFailure.pas' {frmRegressionTestFailure},
XString in '..\..\..\windows\src\global\delphi\general\XString.pas',
XString in 'debug\XString.pas',
debugkeyboard in 'debug\debugkeyboard.pas',
Keyman.Developer.UI.UfrmMessageDlgWithSave in 'dialogs\Keyman.Developer.UI.UfrmMessageDlgWithSave.pas' {frmMessageDlgWithSave},
debugdeadkeys in 'debug\debugdeadkeys.pas',
MessageIdentifiers in 'main\MessageIdentifiers.pas',
kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas',
kpsfile in '..\common\delphi\packages\kpsfile.pas',
Keyman.UI.UframeCEFHost in '..\..\..\common\windows\delphi\chromium\Keyman.UI.UframeCEFHost.pas' {frameCEFHost},
klog in '..\..\..\common\windows\delphi\general\klog.pas',
BitmapEditor in '..\common\delphi\components\BitmapEditor.pas',
@ -89,7 +89,7 @@ uses
utilsystem in '..\..\..\common\windows\delphi\general\utilsystem.pas',
utilfiletypes in '..\..\..\common\windows\delphi\general\utilfiletypes.pas',
UfrmNewFileDetails in 'dialogs\UfrmNewFileDetails.pas' {frmNewFileDetails},
StockFileNames in '..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\common\windows\delphi\general\StockFileNames.pas',
CompileKeymanWeb in 'compile\CompileKeymanWeb.pas',
KeymanWebKeyCodes in 'compile\KeymanWebKeyCodes.pas',
utildir in '..\..\..\common\windows\delphi\general\utildir.pas',
@ -111,7 +111,7 @@ uses
CleartypeDrawCharacter in '..\..\..\common\windows\delphi\general\CleartypeDrawCharacter.pas',
CharMapDropTool in 'main\CharMapDropTool.pas',
UfrmBitmapEditorText in 'dialogs\UfrmBitmapEditorText.pas' {frmBitmapEditorText},
UFixFontDialogBold in '..\..\..\windows\src\global\delphi\general\UFixFontDialogBold.pas',
UFixFontDialogBold in 'main\UFixFontDialogBold.pas',
UnicodeData in '..\..\..\common\windows\delphi\charmap\UnicodeData.pas',
CharacterDragObject in '..\..\..\common\windows\delphi\charmap\CharacterDragObject.pas',
CharacterMapSettings in '..\..\..\common\windows\delphi\charmap\CharacterMapSettings.pas',
@ -140,13 +140,13 @@ uses
VisualKeyboardExportPNG in '..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardExportPNG.pas',
MSXML2_TLB in '..\..\..\common\windows\delphi\tlb\MSXML2_TLB.pas',
CharacterInfo in 'main\CharacterInfo.pas',
CompilePackageInstaller in '..\..\..\windows\src\global\delphi\general\CompilePackageInstaller.pas',
CompilePackageInstaller in '..\common\delphi\compiler\CompilePackageInstaller.pas',
UTikeDebugMode in 'main\UTikeDebugMode.pas',
kmxfileconsts in '..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas',
kmxfileutils in '..\..\..\common\windows\delphi\keyboards\kmxfileutils.pas',
UfrmSelectWindowsLanguages in 'dialogs\languages\UfrmSelectWindowsLanguages.pas' {frmSelectWindowsLanguages: TTntForm},
Keyman.Developer.UI.UfrmSelectBCP47Language in 'dialogs\languages\Keyman.Developer.UI.UfrmSelectBCP47Language.pas' {frmSelectBCP47Language: TTntForm},
WindowsLanguages in '..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas',
WindowsLanguages in '..\common\delphi\general\WindowsLanguages.pas',
wininet5 in '..\..\..\common\windows\delphi\general\wininet5.pas',
TextFileTemplates in 'main\TextFileTemplates.pas',
GlobalProxySettings in '..\..\..\common\windows\delphi\general\GlobalProxySettings.pas',
@ -180,19 +180,18 @@ uses
TouchLayoutDefinitions in 'oskbuilder\TouchLayoutDefinitions.pas',
CharMapDropTool_TntCustomEdit in 'main\CharMapDropTool_TntCustomEdit.pas',
Winapi.UxTheme,
CheckboxGridHelper in '..\..\..\windows\src\global\delphi\general\CheckboxGridHelper.pas',
CheckboxGridHelper in 'main\CheckboxGridHelper.pas',
UfrmAddKeyboardFeature in 'dialogs\UfrmAddKeyboardFeature.pas' {frmAddKeyboardFeature},
LeftTabbedPageControl in '..\common\delphi\components\LeftTabbedPageControl.pas',
UmodWebHttpServer in 'web\UmodWebHttpServer.pas' {modWebHttpServer: TDataModule},
TempFileManager in '..\..\..\common\windows\delphi\general\TempFileManager.pas',
UfrmKeymanWizard in 'child\UfrmKeymanWizard.pas' {frmKeymanWizard},
UfrmKeyboardFonts in 'dialogs\UfrmKeyboardFonts.pas' {frmKeyboardFonts},
CompileErrorCodes in '..\..\..\windows\src\global\delphi\general\CompileErrorCodes.pas',
KeyboardFonts in '..\..\..\windows\src\global\delphi\general\KeyboardFonts.pas',
utiltsf in '..\..\..\windows\src\global\delphi\general\utiltsf.pas',
CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas',
KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas',
JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas',
TikeUnicodeData in 'main\TikeUnicodeData.pas',
UKeymanTargets in '..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas',
UKeymanTargets in '..\common\delphi\general\UKeymanTargets.pas',
UfrmSMTPSetup in 'dialogs\UfrmSMTPSetup.pas' {frmSMTPSetup},
UfrmSendURLsToEmail in 'dialogs\UfrmSendURLsToEmail.pas' {frmSendURLsToEmail},
MSXMLDomCreate in '..\..\..\common\windows\delphi\general\MSXMLDomCreate.pas',
@ -208,7 +207,7 @@ uses
VisualKeyboardExportXML in '..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardExportXML.pas',
VisualKeyboardLoaderBinary in '..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas',
VisualKeyboardSaverBinary in '..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverBinary.pas',
DropTarget in '..\..\..\windows\src\global\delphi\general\DropTarget.pas',
DropTarget in 'main\DropTarget.pas',
CloseButtonPageControl in '..\common\delphi\components\CloseButtonPageControl.pas',
UfrmTIKEDock in 'dockforms\UfrmTIKEDock.pas' {TIKEDockForm},
KeymanDeveloperDebuggerMemo in '..\common\delphi\components\KeymanDeveloperDebuggerMemo.pas',
@ -231,7 +230,7 @@ uses
Keyman.Developer.System.HttpServer.App in 'http\Keyman.Developer.System.HttpServer.App.pas',
Keyman.System.HttpServer.Base in '..\..\..\common\windows\delphi\web\Keyman.System.HttpServer.Base.pas',
Keyman.Developer.System.HttpServer.AppSource in 'http\Keyman.Developer.System.HttpServer.AppSource.pas',
Keyman.UI.FontUtils in '..\..\..\windows\src\global\delphi\general\Keyman.UI.FontUtils.pas',
Keyman.UI.FontUtils in 'main\Keyman.UI.FontUtils.pas',
Keyman.Developer.System.TouchLayoutToVisualKeyboardConverter in '..\kmconvert\Keyman.Developer.System.TouchLayoutToVisualKeyboardConverter.pas',
Keyman.Developer.System.Project.kmnProjectFileAction in 'project\Keyman.Developer.System.Project.kmnProjectFileAction.pas',
Keyman.Developer.System.Project.kpsProjectFileAction in 'project\Keyman.Developer.System.Project.kpsProjectFileAction.pas',
@ -271,8 +270,8 @@ uses
Keyman.System.KeymanSentryClient in '..\..\..\common\windows\delphi\general\Keyman.System.KeymanSentryClient.pas',
Keyman.System.Standards.LangTagsRegistry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
Keyman.Developer.System.Project.UrlRenderer in 'project\Keyman.Developer.System.Project.UrlRenderer.pas',
Keyman.System.KeymanCore in '..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanCore.pas',
Keyman.System.KeymanCoreDebug in '..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanCoreDebug.pas',
Keyman.System.KeymanCore in 'main\Keyman.System.KeymanCore.pas',
Keyman.System.KeymanCoreDebug in 'main\Keyman.System.KeymanCoreDebug.pas',
UfrmDebugStatus_CallStack in 'debug\UfrmDebugStatus_CallStack.pas' {frmDebugStatus_CallStack},
Keyman.System.Debug.DebugEvent in 'debug\Keyman.System.Debug.DebugEvent.pas',
Keyman.System.Debug.DebugCore in 'debug\Keyman.System.Debug.DebugCore.pas',
@ -281,7 +280,7 @@ uses
UfrmDebugStatus_Platform in 'debug\UfrmDebugStatus_Platform.pas' {frmDebugStatus_Platform},
UfrmDebugStatus_Options in 'debug\UfrmDebugStatus_Options.pas' {frmDebugStatus_Options},
Keyman.Developer.System.KeymanDeveloperPaths in 'main\Keyman.Developer.System.KeymanDeveloperPaths.pas',
Keyman.Developer.System.ValidateKpsFile in '..\..\..\windows\src\global\delphi\general\Keyman.Developer.System.ValidateKpsFile.pas',
Keyman.Developer.System.ValidateKpsFile in '..\common\delphi\compiler\Keyman.Developer.System.ValidateKpsFile.pas',
Keyman.Developer.UI.UfrmServerOptions in 'dialogs\Keyman.Developer.UI.UfrmServerOptions.pas' {frmServerOptions},
Keyman.Developer.System.ServerAPI in 'http\Keyman.Developer.System.ServerAPI.pas',
Keyman.System.FontLoadUtil in 'main\Keyman.System.FontLoadUtil.pas';

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

@ -134,12 +134,12 @@
</DCCReference>
<DCCReference Include="..\..\..\common\windows\delphi\general\RegistryKeys.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\compile.pas"/>
<DCCReference Include="..\common\delphi\compiler\compile.pas"/>
<DCCReference Include="main\KeymanDeveloperOptions.pas"/>
<DCCReference Include="debug\UfrmKeyTest.pas">
<Form>frmKeyTest</Form>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompilePackage.pas"/>
<DCCReference Include="..\common\delphi\compiler\CompilePackage.pas"/>
<DCCReference Include="main\KeymanDeveloperUtils.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\CRC32.pas"/>
<DCCReference Include="child\UfrmEditor.pas">
@ -214,14 +214,14 @@
<DCCReference Include="dialogs\UfrmRegressionTestFailure.pas">
<Form>frmRegressionTestFailure</Form>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\XString.pas"/>
<DCCReference Include="debug\XString.pas"/>
<DCCReference Include="debug\debugkeyboard.pas"/>
<DCCReference Include="dialogs\Keyman.Developer.UI.UfrmMessageDlgWithSave.pas">
<Form>frmMessageDlgWithSave</Form>
</DCCReference>
<DCCReference Include="debug\debugdeadkeys.pas"/>
<DCCReference Include="main\MessageIdentifiers.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\common\delphi\packages\kpsfile.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\chromium\Keyman.UI.UframeCEFHost.pas">
<Form>frameCEFHost</Form>
</DCCReference>
@ -236,7 +236,7 @@
<DCCReference Include="dialogs\UfrmNewFileDetails.pas">
<Form>frmNewFileDetails</Form>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="compile\CompileKeymanWeb.pas"/>
<DCCReference Include="compile\KeymanWebKeyCodes.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\utildir.pas"/>
@ -250,7 +250,7 @@
<DCCReference Include="..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas"/>
<DCCReference Include="main\KeyboardParser.pas"/>
<DCCReference Include="..\common\delphi\general\TextFileFormat.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\comp\KMDActions.pas"/>
<DCCReference Include="..\common\delphi\components\KMDActions.pas"/>
<DCCReference Include="..\common\delphi\components\KMDActionInterfaces.pas"/>
<DCCReference Include="main\UfrmHelp.pas">
<Form>frmHelp</Form>
@ -262,7 +262,7 @@
<DCCReference Include="dialogs\UfrmBitmapEditorText.pas">
<Form>frmBitmapEditorText</Form>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\UFixFontDialogBold.pas"/>
<DCCReference Include="main\UFixFontDialogBold.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\charmap\UnicodeData.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\charmap\CharacterDragObject.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\charmap\CharacterMapSettings.pas"/>
@ -321,7 +321,7 @@
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardExportPNG.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\tlb\MSXML2_TLB.pas"/>
<DCCReference Include="main\CharacterInfo.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompilePackageInstaller.pas"/>
<DCCReference Include="..\common\delphi\compiler\CompilePackageInstaller.pas"/>
<DCCReference Include="main\UTikeDebugMode.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\keyboards\kmxfileutils.pas"/>
@ -333,7 +333,7 @@
<Form>frmSelectBCP47Language</Form>
<DesignClass>TTntForm</DesignClass>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\common\delphi\general\WindowsLanguages.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\wininet5.pas"/>
<DCCReference Include="main\TextFileTemplates.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\GlobalProxySettings.pas"/>
@ -402,7 +402,7 @@
<DCCReference Include="oskbuilder\TouchLayout.pas"/>
<DCCReference Include="oskbuilder\TouchLayoutDefinitions.pas"/>
<DCCReference Include="main\CharMapDropTool_TntCustomEdit.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CheckboxGridHelper.pas"/>
<DCCReference Include="main\CheckboxGridHelper.pas"/>
<DCCReference Include="dialogs\UfrmAddKeyboardFeature.pas">
<Form>frmAddKeyboardFeature</Form>
</DCCReference>
@ -418,12 +418,11 @@
<DCCReference Include="dialogs\UfrmKeyboardFonts.pas">
<Form>frmKeyboardFonts</Form>
</DCCReference>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompileErrorCodes.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\utiltsf.pas"/>
<DCCReference Include="..\common\delphi\compiler\CompileErrorCodes.pas"/>
<DCCReference Include="..\common\delphi\general\KeyboardFonts.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<DCCReference Include="main\TikeUnicodeData.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="..\common\delphi\general\UKeymanTargets.pas"/>
<DCCReference Include="dialogs\UfrmSMTPSetup.pas">
<Form>frmSMTPSetup</Form>
</DCCReference>
@ -432,7 +431,6 @@
</DCCReference>
<DCCReference Include="..\..\..\common\windows\delphi\general\MSXMLDomCreate.pas"/>
<DCCReference Include="help\webhelp.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\UMD5Hash.pas"/>
<DCCReference Include="main\UfrmMain.pas">
<Form>frmKeymanDeveloper</Form>
</DCCReference>
@ -446,7 +444,7 @@
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardExportXML.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverBinary.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\DropTarget.pas"/>
<DCCReference Include="main\DropTarget.pas"/>
<DCCReference Include="..\common\delphi\components\CloseButtonPageControl.pas"/>
<DCCReference Include="dockforms\UfrmTIKEDock.pas">
<Form>TIKEDockForm</Form>
@ -473,7 +471,7 @@
<DCCReference Include="http\Keyman.Developer.System.HttpServer.App.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\web\Keyman.System.HttpServer.Base.pas"/>
<DCCReference Include="http\Keyman.Developer.System.HttpServer.AppSource.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.UI.FontUtils.pas"/>
<DCCReference Include="main\Keyman.UI.FontUtils.pas"/>
<DCCReference Include="..\kmconvert\Keyman.Developer.System.TouchLayoutToVisualKeyboardConverter.pas"/>
<DCCReference Include="project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
<DCCReference Include="project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
@ -530,8 +528,8 @@
<DCCReference Include="..\..\..\common\windows\delphi\general\Keyman.System.KeymanSentryClient.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
<DCCReference Include="project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanCore.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanCoreDebug.pas"/>
<DCCReference Include="main\Keyman.System.KeymanCore.pas"/>
<DCCReference Include="main\Keyman.System.KeymanCoreDebug.pas"/>
<DCCReference Include="debug\UfrmDebugStatus_CallStack.pas">
<Form>frmDebugStatus_CallStack</Form>
</DCCReference>
@ -547,7 +545,7 @@
<FormType>dfm</FormType>
</DCCReference>
<DCCReference Include="main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\Keyman.Developer.System.ValidateKpsFile.pas"/>
<DCCReference Include="..\common\delphi\compiler\Keyman.Developer.System.ValidateKpsFile.pas"/>
<DCCReference Include="dialogs\Keyman.Developer.UI.UfrmServerOptions.pas">
<Form>frmServerOptions</Form>
<FormType>dfm</FormType>

0
windows/src/global/delphi/general/XString.pas → developer/src/tike/debug/XString.pas
View file

0
windows/src/global/delphi/general/CheckboxGridHelper.pas → developer/src/tike/main/CheckboxGridHelper.pas
View file

0
windows/src/global/delphi/general/DropTarget.pas → developer/src/tike/main/DropTarget.pas
View file

0
windows/src/global/delphi/general/Keyman.System.KeymanCore.pas → developer/src/tike/main/Keyman.System.KeymanCore.pas
View file

0
windows/src/global/delphi/general/Keyman.System.KeymanCoreDebug.pas → developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas
View file

0
windows/src/global/delphi/general/Keyman.UI.FontUtils.pas → developer/src/tike/main/Keyman.UI.FontUtils.pas
View file

0
windows/src/global/delphi/general/UFixFontDialogBold.pas → developer/src/tike/main/UFixFontDialogBold.pas
View file

8
windows/src/buildtools/buildpkg/buildpkg.dpr
View file

@ -5,11 +5,11 @@ program buildpkg;
uses
SysUtils,
buildpkgmain in 'buildpkgmain.pas',
CompilePackageInstaller in '..\..\global\delphi\general\CompilePackageInstaller.pas',
CompilePackageInstaller in '..\..\..\..\developer\src\common\delphi\compiler\CompilePackageInstaller.pas',
utilsystem in '..\..\..\..\common\windows\delphi\general\utilsystem.pas',
CompilePackage in '..\..\global\delphi\general\CompilePackage.pas',
CompilePackage in '..\..\..\..\developer\src\common\delphi\compiler\CompilePackage.pas',
kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
kpsfile in '..\..\global\delphi\general\kpsfile.pas',
kpsfile in '..\..\..\..\developer\src\common\delphi\packages\kpsfile.pas',
PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utildir in '..\..\..\..\common\windows\delphi\general\utildir.pas',
utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas',
@ -23,7 +23,7 @@ uses
RedistFiles in '..\..\..\..\developer\src\tike\main\RedistFiles.pas',
DebugPaths in '..\..\..\..\common\windows\delphi\general\DebugPaths.pas',
CustomisationStorage in '..\..\global\delphi\cust\CustomisationStorage.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
klog in '..\..\..\..\common\windows\delphi\general\klog.pas',
httpuploader in '..\..\..\..\common\windows\delphi\general\httpuploader.pas',
Upload_Settings in '..\..\..\..\common\windows\delphi\general\Upload_Settings.pas',

8
windows/src/buildtools/buildpkg/buildpkg.dproj
View file

@ -92,11 +92,11 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="buildpkgmain.pas"/>
<DCCReference Include="..\..\global\delphi\general\CompilePackageInstaller.pas"/>
<DCCReference Include="..\..\..\..\developer\src\common\delphi\compiler\CompilePackageInstaller.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilsystem.pas"/>
<DCCReference Include="..\..\global\delphi\general\CompilePackage.pas"/>
<DCCReference Include="..\..\..\..\developer\src\common\delphi\compiler\CompilePackage.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\..\..\developer\src\common\delphi\packages\kpsfile.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
@ -110,7 +110,7 @@
<DCCReference Include="..\..\..\..\developer\src\tike\main\RedistFiles.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
<DCCReference Include="..\..\global\delphi\cust\CustomisationStorage.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\klog.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\httpuploader.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\Upload_Settings.pas"/>

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

@ -123,7 +123,7 @@ uses
utilfocusappwnd in 'util\utilfocusappwnd.pas',
UImportOlderVersionKeyboards8 in 'main\UImportOlderVersionKeyboards8.pas',
KeymanPaths in '..\..\..\..\common\windows\delphi\general\KeymanPaths.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
KeymanEngineControl in '..\..\global\delphi\general\KeymanEngineControl.pas',
KeymanOptionNames in '..\..\global\delphi\general\KeymanOptionNames.pas',
VisualKeyboardLoaderBinary in '..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas',

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

@ -266,7 +266,7 @@
<DCCReference Include="util\utilfocusappwnd.pas"/>
<DCCReference Include="main\UImportOlderVersionKeyboards8.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\global\delphi\general\KeymanEngineControl.pas"/>
<DCCReference Include="..\..\global\delphi\general\KeymanOptionNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas"/>

2
windows/src/desktop/setup/setup.dpr
View file

@ -35,7 +35,7 @@ uses
PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas',
utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
utildir in '..\..\..\..\common\windows\delphi\general\utildir.pas',
JsonUtil in '..\..\..\..\common\windows\delphi\general\JsonUtil.pas',
kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',

2
windows/src/desktop/setup/setup.dproj
View file

@ -138,7 +138,7 @@
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>

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

@ -94,7 +94,7 @@ uses
keyman_msctf in '..\..\global\delphi\winapi\keyman_msctf.pas',
KeymanDesktopShell in 'KeymanDesktopShell.pas',
KeymanPaths in '..\..\..\..\common\windows\delphi\general\KeymanPaths.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
KeymanEngineControl in '..\..\global\delphi\general\KeymanEngineControl.pas',
VisualKeyboardLoaderBinary in '..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas',
VisualKeyboardLoaderXML in '..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas',

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

@ -218,7 +218,7 @@
<DCCReference Include="..\..\global\delphi\winapi\keyman_msctf.pas"/>
<DCCReference Include="KeymanDesktopShell.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\global\delphi\general\KeymanEngineControl.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas"/>

2
windows/src/engine/kmcomapi/kmcomapi.dpr
View file

@ -84,7 +84,7 @@ uses
keymanapi_TLB in 'keymanapi_TLB.pas',
kmxfile in '..\..\..\..\common\windows\delphi\keyboards\kmxfile.pas',
utilhandleexception in 'util\utilhandleexception.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
CustomisationMenu in '..\..\global\delphi\cust\CustomisationMenu.pas',
utilolepicture in 'util\utilolepicture.pas',
utilxml in '..\..\..\..\common\windows\delphi\general\utilxml.pas',

2
windows/src/engine/kmcomapi/kmcomapi.dproj
View file

@ -222,7 +222,7 @@
<DCCReference Include="keymanapi_TLB.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\keyboards\kmxfile.pas"/>
<DCCReference Include="util\utilhandleexception.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\global\delphi\cust\CustomisationMenu.pas"/>
<DCCReference Include="util\utilolepicture.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilxml.pas"/>

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

@ -49,7 +49,7 @@ uses
keyman_msctf in '..\..\global\delphi\winapi\keyman_msctf.pas',
Glossary in '..\..\..\..\common\windows\delphi\general\Glossary.pas',
TempFileManager in '..\..\..\..\common\windows\delphi\general\TempFileManager.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
kmxfileconsts in '..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas',
Keyman.System.CEFManager in '..\..\..\..\common\windows\delphi\chromium\Keyman.System.CEFManager.pas',
Keyman.UI.UframeCEFHost in '..\..\..\..\common\windows\delphi\chromium\Keyman.UI.UframeCEFHost.pas' {frameCEFHost},

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

@ -198,7 +198,7 @@
<DCCReference Include="..\..\global\delphi\winapi\keyman_msctf.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\Glossary.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\TempFileManager.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\chromium\Keyman.System.CEFManager.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\chromium\Keyman.UI.UframeCEFHost.pas">

2
windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr
View file

@ -17,7 +17,7 @@ uses
CRC32 in 'C:\Projects\keyman\open\common\windows\delphi\general\CRC32.pas',
KeyNames in 'C:\Projects\keyman\open\common\windows\delphi\general\KeyNames.pas',
KeymanVersion in 'C:\Projects\keyman\open\common\windows\delphi\general\KeymanVersion.pas',
StockFileNames in 'C:\Projects\keyman\open\windows\src\global\delphi\cust\StockFileNames.pas',
StockFileNames in 'C:\Projects\keyman\open\windows\src\..\..\common\windows\delphi\general\StockFileNames.pas',
Unicode in 'C:\Projects\keyman\open\common\windows\delphi\general\Unicode.pas',
JsonUtil in 'C:\Projects\keyman\open\common\windows\delphi\general\JsonUtil.pas';

2
windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj
View file

@ -108,7 +108,7 @@
<DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\CRC32.pas"/>
<DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\KeyNames.pas"/>
<DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\KeymanVersion.pas"/>
<DCCReference Include="C:\Projects\keyman\open\windows\src\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="C:\Projects\keyman\open\windows\src\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\JsonUtil.pas"/>
<BuildConfiguration Include="Release">

2
windows/src/support/kmxfonts/kmxfonts.dpr
View file

@ -15,7 +15,7 @@ uses
utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
utilkeyboard in '..\..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas',
KeymanVersion in '..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas';
StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas';
{$R *.res}

2
windows/src/support/kmxfonts/kmxfonts.dproj
View file

@ -231,7 +231,7 @@
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>

2
windows/src/test/manual-tests/regressiontest/regressiontest.dpr
View file

@ -24,7 +24,7 @@ uses
VersionInfo in '..\..\..\..\common\windows\delphi\general\VersionInfo.pas',
klog in '..\..\..\..\common\windows\delphi\general\klog.pas',
keyman32_int in '..\..\global\delphi\general\keyman32_int.pas',
compile in '..\..\global\delphi\general\compile.pas',
compile in '..\..\..\..\developer\src\common\delphi\compiler\compile.pas',
SystemDebugPath in '..\..\global\delphi\general\SystemDebugPath.pas',
msctf in '..\..\global\delphi\winapi\msctf.pas',
DebugUtils in 'DebugUtils.pas',

2
windows/src/test/manual-tests/regressiontest/regressiontest.dproj
View file

@ -117,7 +117,7 @@
<DCCReference Include="..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\klog.pas"/>
<DCCReference Include="..\..\global\delphi\general\keyman32_int.pas"/>
<DCCReference Include="..\..\global\delphi\general\compile.pas"/>
<DCCReference Include="..\..\..\..\developer\src\common\delphi\compiler\compile.pas"/>
<DCCReference Include="..\..\global\delphi\general\SystemDebugPath.pas"/>
<DCCReference Include="..\..\global\delphi\winapi\msctf.pas"/>
<DCCReference Include="DebugUtils.pas"/>

7
windows/src/test/unit-tests/Makefile
View file

@ -14,8 +14,7 @@ test:
# ----------------------------------------------------------------------
# TODO: move shared-tests to /common
shared-tests: androidstringtokeymanlocalestring package-info jsonutil \
standards-data
shared-tests: androidstringtokeymanlocalestring jsonutil standards-data
windows-tests: group-helper-rsp19902 shared-data \
windows-setup ui-language-manager
@ -34,10 +33,6 @@ shared-data: .virtual
cd $(ROOT)\src\test\unit-tests\shared-data
$(MAKE) $(TARGET)
package-info: .virtual
cd $(ROOT)\src\test\unit-tests\package-info
$(MAKE) $(TARGET)
jsonutil: .virtual
cd $(ROOT)\src\test\unit-tests\jsonutil
$(MAKE) $(TARGET)

2
windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr
View file

@ -15,7 +15,7 @@ uses
Keyman.Setup.System.InstallInfo in '..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas',
PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas',
StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
JsonUtil in '..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas',

2
windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj
View file

@ -105,7 +105,7 @@
<DCCReference Include="..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>