diff --git a/developer/src/kmcomp/Makefile b/developer/src/kmcomp/Makefile
index c18df3645f..f559f32afa 100644
--- a/developer/src/kmcomp/Makefile
+++ b/developer/src/kmcomp/Makefile
@@ -2,7 +2,7 @@
# Kmcomp Makefile
#
-!include ..\..\Defines.mak
+!include ..\Defines.mak
TARGET_BASE=kmcomp
TARGET_EXT=exe
@@ -13,8 +13,8 @@ build: version.res manifest.res dirs icons
$(SENTRYTOOL_DELPHIPREP) $(WIN32_TARGET_PATH)\kmcomp.exe -dpr kmcomp.dpr
$(TDS2DBG) $(WIN32_TARGET_PATH)\kmcomp.exe
- $(COPY) $(WIN32_TARGET_PATH)\kmcomp.exe $(PROGRAM)\developer
- if exist $(WIN32_TARGET_PATH)\kmcomp.dbg $(COPY) $(WIN32_TARGET_PATH)\kmcomp.dbg $(DEBUGPATH)\developer
+ $(COPY) $(WIN32_TARGET_PATH)\kmcomp.exe $(DEVELOPER_PROGRAM)
+ if exist $(WIN32_TARGET_PATH)\kmcomp.dbg $(COPY) $(WIN32_TARGET_PATH)\kmcomp.dbg $(DEVELOPER_DEBUGPATH)
$(DELPHI_MSBUILD) kmcomp.dproj "/p:Platform=Win64"
@@ -26,8 +26,8 @@ build: version.res manifest.res dirs icons
ren $(WIN64_TARGET_PATH)\kmcomp.map kmcomp.x64.map
# $(SENTRYTOOL_DELPHIPREP) $(WIN64_TARGET_PATH)\kmcomp.x64.exe -dpr kmcomp.dpr
- $(COPY) $(WIN64_TARGET_PATH)\kmcomp.x64.exe $(PROGRAM)\developer\kmcomp.x64.exe
- if exist $(WIN64_TARGET_PATH)\kmcomp.dbg $(COPY) $(WIN64_TARGET_PATH)\kmcomp.dbg $(DEBUGPATH)\developer\kmcomp.x64.dbg
+ $(COPY) $(WIN64_TARGET_PATH)\kmcomp.x64.exe $(DEVELOPER_PROGRAM)\kmcomp.x64.exe
+ if exist $(WIN64_TARGET_PATH)\kmcomp.dbg $(COPY) $(WIN64_TARGET_PATH)\kmcomp.dbg $(DEVELOPER_DEBUGPATH)\kmcomp.x64.dbg
icons:
rc icons.rc
@@ -36,22 +36,22 @@ clean: def-clean
if exist icons.res del icons.res
signcode:
- $(SIGNCODE) /d "Keyman Developer Command-Line Compiler" $(PROGRAM)\developer\kmcomp.exe
- $(SIGNCODE) /d "Keyman Developer Command-Line Compiler" $(PROGRAM)\developer\kmcomp.x64.exe
+ $(SIGNCODE) /d "Keyman Developer Command-Line Compiler" $(DEVELOPER_PROGRAM)\kmcomp.exe
+ $(SIGNCODE) /d "Keyman Developer Command-Line Compiler" $(DEVELOPER_PROGRAM)\kmcomp.x64.exe
wrap-symbols:
- $(SYMSTORE) $(PROGRAM)\developer\kmcomp.exe /t keyman-developer
- $(SYMSTORE) $(PROGRAM)\developer\kmcomp.x64.exe /t keyman-developer
- $(SYMSTORE) $(DEBUGPATH)\developer\kmcomp.dbg /t keyman-developer
-#TODO: $(SYMSTORE) $(DEBUGPATH)\developer\kmcomp.x64.dbg /t keyman-developer
+ $(SYMSTORE) $(DEVELOPER_PROGRAM)\kmcomp.exe /t keyman-developer
+ $(SYMSTORE) $(DEVELOPER_PROGRAM)\kmcomp.x64.exe /t keyman-developer
+ $(SYMSTORE) $(DEVELOPER_DEBUGPATH)\kmcomp.dbg /t keyman-developer
+#TODO: $(SYMSTORE) $(DEVELOPER_DEBUGPATH)\kmcomp.x64.dbg /t keyman-developer
test-manifest:
# test that (a) linked manifest exists and correct
- $(MT) -nologo -inputresource:$(PROGRAM)\developer\kmcomp.exe -validate_manifest
- $(MT) -nologo -inputresource:$(PROGRAM)\developer\kmcomp.x64.exe -validate_manifest
+ $(MT) -nologo -inputresource:$(DEVELOPER_PROGRAM)\kmcomp.exe -validate_manifest
+ $(MT) -nologo -inputresource:$(DEVELOPER_PROGRAM)\kmcomp.x64.exe -validate_manifest
install:
- $(COPY) $(PROGRAM)\developer\kmcomp.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmcomp.exe"
- $(COPY) $(PROGRAM)\developer\kmcomp.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmcomp.x64.exe"
+ $(COPY) $(DEVELOPER_PROGRAM)\kmcomp.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmcomp.exe"
+ $(COPY) $(DEVELOPER_PROGRAM)\kmcomp.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmcomp.x64.exe"
-!include ..\..\Target.mak
+!include ..\Target.mak
diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr
index f44e1ca399..b95b0cdc8e 100644
--- a/developer/src/kmcomp/kmcomp.dpr
+++ b/developer/src/kmcomp/kmcomp.dpr
@@ -5,124 +5,124 @@ program kmcomp;
uses
System.SysUtils,
main in 'main.pas',
- compile in '..\..\global\delphi\general\compile.pas',
- VersionInfo in '..\..\global\delphi\general\VersionInfo.pas',
- RegistryKeys in '..\..\global\delphi\general\RegistryKeys.pas',
+ compile in '..\..\..\windows\src\global\delphi\general\compile.pas',
+ VersionInfo in '..\..\..\windows\src\global\delphi\general\VersionInfo.pas',
+ RegistryKeys in '..\..\..\windows\src\global\delphi\general\RegistryKeys.pas',
kccompilepackage in 'kccompilepackage.pas',
- CompilePackage in '..\..\global\delphi\general\CompilePackage.pas',
- CRC32 in '..\..\global\delphi\general\CRC32.pas',
- kpsfile in '..\..\global\delphi\general\kpsfile.pas',
- PackageInfo in '..\..\global\delphi\general\PackageInfo.pas',
- PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas',
- kmpinffile in '..\..\global\delphi\general\kmpinffile.pas',
- RedistFiles in '..\TIKE\main\RedistFiles.pas',
- DebugPaths in '..\..\global\delphi\general\DebugPaths.pas',
- httpuploader in '..\..\global\delphi\general\httpuploader.pas',
- httpuploader_messageprocessor_forms in '..\..\global\delphi\general\httpuploader_messageprocessor_forms.pas',
- utilfiletypes in '..\..\global\delphi\general\utilfiletypes.pas',
- CustomisationStorage in '..\..\global\delphi\cust\CustomisationStorage.pas',
- klog in '..\..\global\delphi\general\klog.pas',
- KeyNames in '..\..\global\delphi\general\KeyNames.pas',
- StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
- OnlineConstants in '..\..\global\delphi\productactivation\OnlineConstants.pas',
- KeymanDeveloperOptions in '..\TIKE\main\KeymanDeveloperOptions.pas',
- Upload_Settings in '..\..\global\delphi\general\Upload_Settings.pas',
- utilstr in '..\..\global\delphi\general\utilstr.pas',
- utilsystem in '..\..\global\delphi\general\utilsystem.pas',
- utildir in '..\..\global\delphi\general\utildir.pas',
- utilkeyboard in '..\..\global\delphi\general\utilkeyboard.pas',
- unicode in '..\..\global\delphi\general\unicode.pas',
- utilhttp in '..\..\global\delphi\general\utilhttp.pas',
- GetOsVersion in '..\..\global\delphi\general\GetOsVersion.pas',
- UfrmTike in '..\TIKE\main\UfrmTike.pas' {TikeForm: TTntForm},
- CompilePackageInstaller in '..\..\global\delphi\general\CompilePackageInstaller.pas',
- UTikeDebugMode in '..\TIKE\main\UTikeDebugMode.pas',
- CompileKeymanWeb in '..\TIKE\compile\CompileKeymanWeb.pas',
- VisualKeyboard in '..\..\global\delphi\visualkeyboard\VisualKeyboard.pas',
- KeymanWebKeyCodes in '..\TIKE\compile\KeymanWebKeyCodes.pas',
- ExtShiftState in '..\..\global\delphi\comp\ExtShiftState.pas',
- kmxfileconsts in '..\..\global\delphi\general\kmxfileconsts.pas',
- wininet5 in '..\..\global\delphi\general\wininet5.pas',
- kmxfileutils in '..\..\global\delphi\general\kmxfileutils.pas',
- GlobalProxySettings in '..\..\global\delphi\general\GlobalProxySettings.pas',
- VKeyChars in '..\..\global\delphi\general\VKeyChars.pas',
- utilmsxml in '..\..\global\delphi\general\utilmsxml.pas',
- ErrorControlledRegistry in '..\..\global\delphi\vcl\ErrorControlledRegistry.pas',
- utilexecute in '..\..\global\delphi\general\utilexecute.pas',
- KeymanVersion in '..\..\global\delphi\general\KeymanVersion.pas',
- kmxfile in '..\..\global\delphi\general\kmxfile.pas',
- Glossary in '..\..\global\delphi\general\Glossary.pas',
- VKeys in '..\..\global\delphi\general\VKeys.pas',
- CompileErrorCodes in '..\..\global\delphi\general\CompileErrorCodes.pas',
- TouchLayout in '..\TIKE\oskbuilder\TouchLayout.pas',
- TouchLayoutDefinitions in '..\TIKE\oskbuilder\TouchLayoutDefinitions.pas',
- TouchLayoutUtils in '..\TIKE\oskbuilder\TouchLayoutUtils.pas',
- KeyboardFonts in '..\..\global\delphi\general\KeyboardFonts.pas',
- KeyboardParser in '..\TIKE\main\KeyboardParser.pas',
- WindowsLanguages in '..\..\global\delphi\general\WindowsLanguages.pas',
- TempFileManager in '..\..\global\delphi\general\TempFileManager.pas',
- JsonUtil in '..\..\global\delphi\general\JsonUtil.pas',
- TikeUnicodeData in '..\TIKE\main\TikeUnicodeData.pas',
- UnicodeData in '..\..\global\delphi\charmap\UnicodeData.pas',
- ttinfo in '..\..\global\delphi\general\ttinfo.pas',
- ADODB_TLB in '..\..\global\delphi\tlb\ADODB_TLB.pas',
- ADOX_TLB in '..\..\global\delphi\tlb\ADOX_TLB.pas',
- UKeymanTargets in '..\..\global\delphi\general\UKeymanTargets.pas',
+ CompilePackage in '..\..\..\windows\src\global\delphi\general\CompilePackage.pas',
+ CRC32 in '..\..\..\windows\src\global\delphi\general\CRC32.pas',
+ kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas',
+ PackageInfo in '..\..\..\windows\src\global\delphi\general\PackageInfo.pas',
+ PackageFileFormats in '..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas',
+ kmpinffile in '..\..\..\windows\src\global\delphi\general\kmpinffile.pas',
+ RedistFiles in '..\tike\main\RedistFiles.pas',
+ DebugPaths in '..\..\..\windows\src\global\delphi\general\DebugPaths.pas',
+ httpuploader in '..\..\..\windows\src\global\delphi\general\httpuploader.pas',
+ httpuploader_messageprocessor_forms in '..\..\..\windows\src\global\delphi\general\httpuploader_messageprocessor_forms.pas',
+ utilfiletypes in '..\..\..\windows\src\global\delphi\general\utilfiletypes.pas',
+ CustomisationStorage in '..\..\..\windows\src\global\delphi\cust\CustomisationStorage.pas',
+ klog in '..\..\..\windows\src\global\delphi\general\klog.pas',
+ KeyNames in '..\..\..\windows\src\global\delphi\general\KeyNames.pas',
+ StockFileNames in '..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
+ OnlineConstants in '..\..\..\windows\src\global\delphi\productactivation\OnlineConstants.pas',
+ KeymanDeveloperOptions in '..\tike\main\KeymanDeveloperOptions.pas',
+ Upload_Settings in '..\..\..\windows\src\global\delphi\general\Upload_Settings.pas',
+ utilstr in '..\..\..\windows\src\global\delphi\general\utilstr.pas',
+ utilsystem in '..\..\..\windows\src\global\delphi\general\utilsystem.pas',
+ utildir in '..\..\..\windows\src\global\delphi\general\utildir.pas',
+ utilkeyboard in '..\..\..\windows\src\global\delphi\general\utilkeyboard.pas',
+ unicode in '..\..\..\windows\src\global\delphi\general\unicode.pas',
+ utilhttp in '..\..\..\windows\src\global\delphi\general\utilhttp.pas',
+ GetOsVersion in '..\..\..\windows\src\global\delphi\general\GetOsVersion.pas',
+ UfrmTike in '..\tike\main\UfrmTike.pas' {TikeForm: TTntForm},
+ CompilePackageInstaller in '..\..\..\windows\src\global\delphi\general\CompilePackageInstaller.pas',
+ UTikeDebugMode in '..\tike\main\UTikeDebugMode.pas',
+ CompileKeymanWeb in '..\tike\compile\CompileKeymanWeb.pas',
+ VisualKeyboard in '..\..\..\windows\src\global\delphi\visualkeyboard\VisualKeyboard.pas',
+ KeymanWebKeyCodes in '..\tike\compile\KeymanWebKeyCodes.pas',
+ ExtShiftState in '..\..\..\windows\src\global\delphi\comp\ExtShiftState.pas',
+ kmxfileconsts in '..\..\..\windows\src\global\delphi\general\kmxfileconsts.pas',
+ wininet5 in '..\..\..\windows\src\global\delphi\general\wininet5.pas',
+ kmxfileutils in '..\..\..\windows\src\global\delphi\general\kmxfileutils.pas',
+ GlobalProxySettings in '..\..\..\windows\src\global\delphi\general\GlobalProxySettings.pas',
+ VKeyChars in '..\..\..\windows\src\global\delphi\general\VKeyChars.pas',
+ utilmsxml in '..\..\..\windows\src\global\delphi\general\utilmsxml.pas',
+ ErrorControlledRegistry in '..\..\..\windows\src\global\delphi\vcl\ErrorControlledRegistry.pas',
+ utilexecute in '..\..\..\windows\src\global\delphi\general\utilexecute.pas',
+ KeymanVersion in '..\..\..\windows\src\global\delphi\general\KeymanVersion.pas',
+ kmxfile in '..\..\..\windows\src\global\delphi\general\kmxfile.pas',
+ Glossary in '..\..\..\windows\src\global\delphi\general\Glossary.pas',
+ VKeys in '..\..\..\windows\src\global\delphi\general\VKeys.pas',
+ CompileErrorCodes in '..\..\..\windows\src\global\delphi\general\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',
+ KeyboardParser in '..\tike\main\KeyboardParser.pas',
+ WindowsLanguages in '..\..\..\windows\src\global\delphi\general\WindowsLanguages.pas',
+ TempFileManager in '..\..\..\windows\src\global\delphi\general\TempFileManager.pas',
+ JsonUtil in '..\..\..\windows\src\global\delphi\general\JsonUtil.pas',
+ TikeUnicodeData in '..\tike\main\TikeUnicodeData.pas',
+ UnicodeData in '..\..\..\windows\src\global\delphi\charmap\UnicodeData.pas',
+ ttinfo in '..\..\..\windows\src\global\delphi\general\ttinfo.pas',
+ ADODB_TLB in '..\..\..\windows\src\global\delphi\tlb\ADODB_TLB.pas',
+ ADOX_TLB in '..\..\..\windows\src\global\delphi\tlb\ADOX_TLB.pas',
+ UKeymanTargets in '..\..\..\windows\src\global\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',
- Keyman.Developer.System.Project.Project in '..\TIKE\project\Keyman.Developer.System.Project.Project.pas',
- Keyman.Developer.System.Project.ProjectFiles in '..\TIKE\project\Keyman.Developer.System.Project.ProjectFiles.pas',
- Keyman.Developer.System.Project.ProjectFileType in '..\TIKE\project\Keyman.Developer.System.Project.ProjectFileType.pas',
- Keyman.Developer.System.Project.ProjectLoader in '..\TIKE\project\Keyman.Developer.System.Project.ProjectLoader.pas',
- Keyman.Developer.System.Project.ProjectSaver in '..\TIKE\project\Keyman.Developer.System.Project.ProjectSaver.pas',
- Keyman.Developer.System.Project.kmnProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.kmnProjectFile.pas',
- Keyman.Developer.System.Project.kmxProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.kmxProjectFile.pas',
- Keyman.Developer.System.Project.kpsProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.kpsProjectFile.pas',
- Keyman.Developer.System.Project.kvkProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.kvkProjectFile.pas',
- Keyman.Developer.System.Project.ProjectLog in '..\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas',
- UMD5Hash in '..\..\global\delphi\general\UMD5Hash.pas',
- UserMessages in '..\..\global\delphi\general\UserMessages.pas',
- VisualKeyboardLoaderBinary in '..\..\global\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas',
- VisualKeyboardLoaderXML in '..\..\global\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas',
- VisualKeyboardSaverBinary in '..\..\global\delphi\visualkeyboard\VisualKeyboardSaverBinary.pas',
- VisualKeyboardSaverXML in '..\..\global\delphi\visualkeyboard\VisualKeyboardSaverXML.pas',
+ Keyman.Developer.System.Project.ProjectFile in '..\tike\project\Keyman.Developer.System.Project.ProjectFile.pas',
+ mrulist in '..\tike\main\mrulist.pas',
+ Keyman.Developer.System.Project.Project in '..\tike\project\Keyman.Developer.System.Project.Project.pas',
+ Keyman.Developer.System.Project.ProjectFiles in '..\tike\project\Keyman.Developer.System.Project.ProjectFiles.pas',
+ Keyman.Developer.System.Project.ProjectFileType in '..\tike\project\Keyman.Developer.System.Project.ProjectFileType.pas',
+ Keyman.Developer.System.Project.ProjectLoader in '..\tike\project\Keyman.Developer.System.Project.ProjectLoader.pas',
+ Keyman.Developer.System.Project.ProjectSaver in '..\tike\project\Keyman.Developer.System.Project.ProjectSaver.pas',
+ Keyman.Developer.System.Project.kmnProjectFile in '..\tike\project\Keyman.Developer.System.Project.kmnProjectFile.pas',
+ Keyman.Developer.System.Project.kmxProjectFile in '..\tike\project\Keyman.Developer.System.Project.kmxProjectFile.pas',
+ Keyman.Developer.System.Project.kpsProjectFile in '..\tike\project\Keyman.Developer.System.Project.kpsProjectFile.pas',
+ Keyman.Developer.System.Project.kvkProjectFile in '..\tike\project\Keyman.Developer.System.Project.kvkProjectFile.pas',
+ Keyman.Developer.System.Project.ProjectLog in '..\tike\project\Keyman.Developer.System.Project.ProjectLog.pas',
+ UMD5Hash in '..\..\..\windows\src\global\delphi\general\UMD5Hash.pas',
+ UserMessages in '..\..\..\windows\src\global\delphi\general\UserMessages.pas',
+ VisualKeyboardLoaderBinary in '..\..\..\windows\src\global\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas',
+ VisualKeyboardLoaderXML in '..\..\..\windows\src\global\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas',
+ VisualKeyboardSaverBinary in '..\..\..\windows\src\global\delphi\visualkeyboard\VisualKeyboardSaverBinary.pas',
+ VisualKeyboardSaverXML in '..\..\..\windows\src\global\delphi\visualkeyboard\VisualKeyboardSaverXML.pas',
kccompilekvk in 'kccompilekvk.pas',
- ValidateKeyboardInfo in '..\TIKE\compile\ValidateKeyboardInfo.pas',
- MergeKeyboardInfo in '..\TIKE\compile\MergeKeyboardInfo.pas',
- JsonExtractKeyboardInfo in '..\TIKE\compile\JsonExtractKeyboardInfo.pas',
- Keyman.System.PackageInfoRefreshKeyboards in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
- Keyman.System.KeyboardJSInfo in '..\..\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
- Keyman.System.KeyboardUtils in '..\..\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
- Keyman.System.KMXFileLanguages in '..\..\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
- Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
- Keyman.System.Standards.LCIDToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
- Keyman.System.KeyboardInfoFile in '..\..\global\delphi\keyboards\Keyman.System.KeyboardInfoFile.pas',
- BCP47Tag in '..\..\global\delphi\general\BCP47Tag.pas',
- Keyman.System.LanguageCodeUtils in '..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
- Keyman.System.RegExGroupHelperRSP19902 in '..\..\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
- Keyman.System.Standards.BCP47SubtagRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
- Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
- TextFileFormat in '..\TIKE\main\TextFileFormat.pas',
- Keyman.Developer.System.Project.kmnProjectFileAction in '..\TIKE\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas',
- Keyman.Developer.System.Project.kpsProjectFileAction in '..\TIKE\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas',
- Keyman.System.PackageInfoRefreshLexicalModels in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
- Keyman.Developer.System.Project.modelTsProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas',
- Keyman.Developer.System.Project.modelTsProjectFileAction in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas',
- Keyman.Developer.System.LexicalModelCompile in '..\..\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas',
- Keyman.System.LexicalModelUtils in '..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
+ ValidateKeyboardInfo in '..\tike\compile\ValidateKeyboardInfo.pas',
+ MergeKeyboardInfo in '..\tike\compile\MergeKeyboardInfo.pas',
+ JsonExtractKeyboardInfo in '..\tike\compile\JsonExtractKeyboardInfo.pas',
+ Keyman.System.PackageInfoRefreshKeyboards in '..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
+ Keyman.System.KeyboardJSInfo in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas',
+ Keyman.System.KeyboardUtils in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardUtils.pas',
+ Keyman.System.KMXFileLanguages in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
+ Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
+ Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
+ Keyman.System.KeyboardInfoFile in '..\..\..\windows\src\global\delphi\keyboards\Keyman.System.KeyboardInfoFile.pas',
+ BCP47Tag in '..\..\..\windows\src\global\delphi\general\BCP47Tag.pas',
+ Keyman.System.LanguageCodeUtils in '..\..\..\windows\src\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
+ Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\windows\src\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
+ Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
+ Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
+ TextFileFormat in '..\tike\main\TextFileFormat.pas',
+ Keyman.Developer.System.Project.kmnProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas',
+ Keyman.Developer.System.Project.kpsProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas',
+ Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\windows\src\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
+ Keyman.Developer.System.Project.modelTsProjectFile in '..\tike\project\Keyman.Developer.System.Project.modelTsProjectFile.pas',
+ Keyman.Developer.System.Project.modelTsProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas',
+ Keyman.Developer.System.LexicalModelCompile in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas',
+ Keyman.System.LexicalModelUtils in '..\..\..\windows\src\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
Keyman.Developer.System.Project.ProjectLogConsole in 'Keyman.Developer.System.Project.ProjectLogConsole.pas',
- Sentry.Client in '..\..\ext\sentry\Sentry.Client.pas',
- Sentry.Client.Console in '..\..\ext\sentry\Sentry.Client.Console.pas',
- sentry in '..\..\ext\sentry\sentry.pas',
- Keyman.System.KeymanSentryClient in '..\..\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
- KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas',
- Keyman.System.CanonicalLanguageCodeUtils in '..\..\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
- Keyman.System.Standards.LangTagsRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
- Keyman.Developer.System.Project.UrlRenderer in '..\TIKE\project\Keyman.Developer.System.Project.UrlRenderer.pas',
+ Sentry.Client in '..\..\..\windows\src\ext\sentry\Sentry.Client.pas',
+ Sentry.Client.Console in '..\..\..\windows\src\ext\sentry\Sentry.Client.Console.pas',
+ sentry in '..\..\..\windows\src\ext\sentry\sentry.pas',
+ Keyman.System.KeymanSentryClient in '..\..\..\windows\src\global\delphi\general\Keyman.System.KeymanSentryClient.pas',
+ KeymanPaths in '..\..\..\windows\src\global\delphi\general\KeymanPaths.pas',
+ Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\windows\src\global\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
+ Keyman.System.Standards.LangTagsRegistry in '..\..\..\windows\src\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
+ 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 '..\..\global\delphi\general\Keyman.Developer.System.ValidateKpsFile.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';
{$R icons.RES}
{$R version.res}
diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj
index 496b7bb3c1..db17bbad7f 100644
--- a/developer/src/kmcomp/kmcomp.dproj
+++ b/developer/src/kmcomp/kmcomp.dproj
@@ -62,7 +62,7 @@
$(BDS)\bin\delphi_PROJECTICNS.icns
kmcomp
true
- ..\..\global\delphi\vclzip;..\..\resellers;C:\keyman\8.0\src\global\delphi\jedi;$(DCC_UnitSearchPath)
+ ..\..\..\windows\src\global\delphi\vclzip;..\..\resellers;C:\keyman\8.0\src\global\delphi\jedi;$(DCC_UnitSearchPath)
KPSMALL;VERSION_KEYMAN_DEVELOPER;$(DCC_Define)
00400000
false
@@ -152,72 +152,72 @@
MainSource
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
TTntForm
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -231,48 +231,48 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
Cfg_2
Base