From 9bb4c27e61b7c429ed2faf63649b1583291d9c31 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 23 Jun 2022 09:28:34 +1000 Subject: [PATCH 1/4] chore(windows): move general developer files to developer/ --- .../delphi/compiler}/CompileErrorCodes.pas | 0 .../delphi/compiler}/CompilePackage.pas | 0 .../compiler}/CompilePackageInstaller.pas | 0 ...eyman.Developer.System.ValidateKpsFile.pas | 0 .../src/common/delphi/compiler}/compile.pas | 0 .../common}/delphi/general/KeyboardFonts.pas | 0 .../common}/delphi/general/UKeymanTargets.pas | 0 .../delphi/general/WindowsLanguages.pas | 0 .../src/common/delphi/packages}/kpsfile.pas | 0 developer/src/kmcomp/kmcomp.dpr | 18 +++++++++--------- developer/src/kmcomp/kmcomp.dproj | 18 +++++++++--------- developer/src/kmconvert/kmconvert.dpr | 10 +++++----- developer/src/kmconvert/kmconvert.dproj | 10 +++++----- .../KeyboardPackageVersionsTestSuite.dpr | 18 +++++++++--------- .../KeyboardPackageVersionsTestSuite.dproj | 18 +++++++++--------- .../passtructsize/passtructsize.dpr | 2 +- .../passtructsize/passtructsize.dproj | 2 +- .../src/test/auto/kmconvert/kmconverttest.dpr | 2 +- .../test/auto/kmconvert/kmconverttest.dproj | 2 +- developer/src/tike/Tike.dpr | 19 +++++++++---------- developer/src/tike/Tike.dproj | 19 +++++++++---------- windows/src/buildtools/buildpkg/buildpkg.dpr | 6 +++--- .../src/buildtools/buildpkg/buildpkg.dproj | 6 +++--- .../inffiletests/packageinftool.dpr | 2 +- .../inffiletests/packageinftool.dproj | 2 +- .../regressiontest/regressiontest.dpr | 2 +- .../regressiontest/regressiontest.dproj | 2 +- .../package-info/PackageInfoTestSuite.dpr | 2 +- .../package-info/PackageInfoTestSuite.dproj | 2 +- 29 files changed, 80 insertions(+), 82 deletions(-) rename {windows/src/global/delphi/general => developer/src/common/delphi/compiler}/CompileErrorCodes.pas (100%) rename {windows/src/global/delphi/general => developer/src/common/delphi/compiler}/CompilePackage.pas (100%) rename {windows/src/global/delphi/general => developer/src/common/delphi/compiler}/CompilePackageInstaller.pas (100%) rename {windows/src/global/delphi/general => developer/src/common/delphi/compiler}/Keyman.Developer.System.ValidateKpsFile.pas (100%) rename {windows/src/global/delphi/general => developer/src/common/delphi/compiler}/compile.pas (100%) rename {windows/src/global => developer/src/common}/delphi/general/KeyboardFonts.pas (100%) rename {windows/src/global => developer/src/common}/delphi/general/UKeymanTargets.pas (100%) rename {windows/src/global => developer/src/common}/delphi/general/WindowsLanguages.pas (100%) rename {windows/src/global/delphi/general => developer/src/common/delphi/packages}/kpsfile.pas (100%) diff --git a/windows/src/global/delphi/general/CompileErrorCodes.pas b/developer/src/common/delphi/compiler/CompileErrorCodes.pas similarity index 100% rename from windows/src/global/delphi/general/CompileErrorCodes.pas rename to developer/src/common/delphi/compiler/CompileErrorCodes.pas diff --git a/windows/src/global/delphi/general/CompilePackage.pas b/developer/src/common/delphi/compiler/CompilePackage.pas similarity index 100% rename from windows/src/global/delphi/general/CompilePackage.pas rename to developer/src/common/delphi/compiler/CompilePackage.pas diff --git a/windows/src/global/delphi/general/CompilePackageInstaller.pas b/developer/src/common/delphi/compiler/CompilePackageInstaller.pas similarity index 100% rename from windows/src/global/delphi/general/CompilePackageInstaller.pas rename to developer/src/common/delphi/compiler/CompilePackageInstaller.pas diff --git a/windows/src/global/delphi/general/Keyman.Developer.System.ValidateKpsFile.pas b/developer/src/common/delphi/compiler/Keyman.Developer.System.ValidateKpsFile.pas similarity index 100% rename from windows/src/global/delphi/general/Keyman.Developer.System.ValidateKpsFile.pas rename to developer/src/common/delphi/compiler/Keyman.Developer.System.ValidateKpsFile.pas diff --git a/windows/src/global/delphi/general/compile.pas b/developer/src/common/delphi/compiler/compile.pas similarity index 100% rename from windows/src/global/delphi/general/compile.pas rename to developer/src/common/delphi/compiler/compile.pas diff --git a/windows/src/global/delphi/general/KeyboardFonts.pas b/developer/src/common/delphi/general/KeyboardFonts.pas similarity index 100% rename from windows/src/global/delphi/general/KeyboardFonts.pas rename to developer/src/common/delphi/general/KeyboardFonts.pas diff --git a/windows/src/global/delphi/general/UKeymanTargets.pas b/developer/src/common/delphi/general/UKeymanTargets.pas similarity index 100% rename from windows/src/global/delphi/general/UKeymanTargets.pas rename to developer/src/common/delphi/general/UKeymanTargets.pas diff --git a/windows/src/global/delphi/general/WindowsLanguages.pas b/developer/src/common/delphi/general/WindowsLanguages.pas similarity index 100% rename from windows/src/global/delphi/general/WindowsLanguages.pas rename to developer/src/common/delphi/general/WindowsLanguages.pas diff --git a/windows/src/global/delphi/general/kpsfile.pas b/developer/src/common/delphi/packages/kpsfile.pas similarity index 100% rename from windows/src/global/delphi/general/kpsfile.pas rename to developer/src/common/delphi/packages/kpsfile.pas diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr index 9133f855ae..e0d5605d23 100644 --- a/developer/src/kmcomp/kmcomp.dpr +++ b/developer/src/kmcomp/kmcomp.dpr @@ -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', @@ -34,7 +34,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 +51,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 +65,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 +119,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} diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj index 26c57f743b..3d738caaef 100644 --- a/developer/src/kmcomp/kmcomp.dproj +++ b/developer/src/kmcomp/kmcomp.dproj @@ -152,13 +152,13 @@ MainSource - + - + - + @@ -184,7 +184,7 @@
TikeForm
TTntForm - + @@ -201,13 +201,13 @@ - + - + - + @@ -215,7 +215,7 @@ - + @@ -270,7 +270,7 @@ - + Cfg_2 Base diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr index 95b5780d91..ba9006ff62 100644 --- a/developer/src/kmconvert/kmconvert.dpr +++ b/developer/src/kmconvert/kmconvert.dpr @@ -10,7 +10,7 @@ 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', @@ -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', diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj index 2d0d1684fb..879f2c513e 100644 --- a/developer/src/kmconvert/kmconvert.dproj +++ b/developer/src/kmconvert/kmconvert.dproj @@ -116,7 +116,7 @@ - + @@ -127,13 +127,13 @@ - + - + @@ -181,10 +181,10 @@ - + - + diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr index 83a0006536..84f9861c22 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr @@ -12,10 +12,10 @@ 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', @@ -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 diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj index ed68c59e1b..0a7a2db447 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj @@ -93,9 +93,9 @@ MainSource - + - + @@ -133,7 +133,7 @@ - + @@ -145,11 +145,11 @@ - + - + - + @@ -160,10 +160,10 @@ - + - + @@ -179,7 +179,7 @@ - + Cfg_2 diff --git a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr index 38d56cd153..39516d1123 100644 --- a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr +++ b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dpr @@ -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', diff --git a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj index 30040cd817..cb86d7b07e 100644 --- a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj +++ b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj @@ -91,7 +91,7 @@ MainSource - + diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dpr b/developer/src/test/auto/kmconvert/kmconverttest.dpr index 02901dfad2..67be7f600f 100644 --- a/developer/src/test/auto/kmconvert/kmconverttest.dpr +++ b/developer/src/test/auto/kmconvert/kmconverttest.dpr @@ -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', diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dproj b/developer/src/test/auto/kmconvert/kmconverttest.dproj index 70e5a2b3d7..0a04a7f320 100644 --- a/developer/src/test/auto/kmconvert/kmconverttest.dproj +++ b/developer/src/test/auto/kmconvert/kmconverttest.dproj @@ -149,7 +149,7 @@ - + diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr index b1e77bb9b6..96ab9d0da1 100644 --- a/developer/src/tike/Tike.dpr +++ b/developer/src/tike/Tike.dpr @@ -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}, @@ -78,7 +78,7 @@ uses 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', @@ -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', @@ -187,12 +187,11 @@ uses 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', @@ -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'; diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj index 37b7e53fae..14ee8d0e32 100644 --- a/developer/src/tike/Tike.dproj +++ b/developer/src/tike/Tike.dproj @@ -134,12 +134,12 @@ - +
frmKeyTest
 - + @@ -221,7 +221,7 @@ - +
frameCEFHost
 @@ -321,7 +321,7 @@ - + @@ -333,7 +333,7 @@
frmSelectBCP47Language
TTntForm - + @@ -418,12 +418,11 @@
frmKeyboardFonts
 - - - + + - +
frmSMTPSetup
 @@ -547,7 +546,7 @@ dfm - +
frmServerOptions
dfm diff --git a/windows/src/buildtools/buildpkg/buildpkg.dpr b/windows/src/buildtools/buildpkg/buildpkg.dpr index 7f753f433c..a69acad294 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dpr +++ b/windows/src/buildtools/buildpkg/buildpkg.dpr @@ -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', diff --git a/windows/src/buildtools/buildpkg/buildpkg.dproj b/windows/src/buildtools/buildpkg/buildpkg.dproj index 15ea9883b3..b59126f99f 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dproj +++ b/windows/src/buildtools/buildpkg/buildpkg.dproj @@ -92,11 +92,11 @@ MainSource - + - + - + diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr index 347477e438..fdabdaffae 100644 --- a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr +++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr @@ -18,7 +18,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', packageinf in 'packageinf.pas', kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas', diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj index 4b0a5634ba..eee1aeedbf 100644 --- a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj +++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj @@ -100,7 +100,7 @@ - + diff --git a/windows/src/test/manual-tests/regressiontest/regressiontest.dpr b/windows/src/test/manual-tests/regressiontest/regressiontest.dpr index f3232aadd8..7170f19acf 100644 --- a/windows/src/test/manual-tests/regressiontest/regressiontest.dpr +++ b/windows/src/test/manual-tests/regressiontest/regressiontest.dpr @@ -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', diff --git a/windows/src/test/manual-tests/regressiontest/regressiontest.dproj b/windows/src/test/manual-tests/regressiontest/regressiontest.dproj index 98db61ab47..54009c3a72 100644 --- a/windows/src/test/manual-tests/regressiontest/regressiontest.dproj +++ b/windows/src/test/manual-tests/regressiontest/regressiontest.dproj @@ -117,7 +117,7 @@ - + diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr index ca4de5f620..b59c9dda05 100644 --- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr +++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr @@ -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, diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj index 5151051b4b..7e8a158e94 100644 --- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj +++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj @@ -103,7 +103,7 @@ - + From 393083509a0016ed9a812d21b4e0ffc019412940 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 23 Jun 2022 09:34:03 +1000 Subject: [PATCH 2/4] chore(windows): move tike files from global to developer These files used only by TIKE so moved into that project. Noticed obsolete refs to UMD5Hash and removed those at the same time. --- developer/src/kmcomp/kmcomp.dproj | 1 - developer/src/kmconvert/kmconvert.dproj | 1 - .../KeyboardPackageVersionsTestSuite.dproj | 1 - developer/src/tike/Tike.dpr | 14 +++++++------- developer/src/tike/Tike.dproj | 15 +++++++-------- .../src/tike/debug}/XString.pas | 0 .../src/tike/main}/CheckboxGridHelper.pas | 0 .../src/tike/main}/DropTarget.pas | 0 .../src/tike/main}/Keyman.System.KeymanCore.pas | 0 .../tike/main}/Keyman.System.KeymanCoreDebug.pas | 0 .../src/tike/main}/Keyman.UI.FontUtils.pas | 0 .../src/tike/main}/UFixFontDialogBold.pas | 0 12 files changed, 14 insertions(+), 18 deletions(-) rename {windows/src/global/delphi/general => developer/src/tike/debug}/XString.pas (100%) rename {windows/src/global/delphi/general => developer/src/tike/main}/CheckboxGridHelper.pas (100%) rename {windows/src/global/delphi/general => developer/src/tike/main}/DropTarget.pas (100%) rename {windows/src/global/delphi/general => developer/src/tike/main}/Keyman.System.KeymanCore.pas (100%) rename {windows/src/global/delphi/general => developer/src/tike/main}/Keyman.System.KeymanCoreDebug.pas (100%) rename {windows/src/global/delphi/general => developer/src/tike/main}/Keyman.UI.FontUtils.pas (100%) rename {windows/src/global/delphi/general => developer/src/tike/main}/UFixFontDialogBold.pas (100%) diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj index 3d738caaef..81aa31fa82 100644 --- a/developer/src/kmcomp/kmcomp.dproj +++ b/developer/src/kmcomp/kmcomp.dproj @@ -229,7 +229,6 @@ - diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj index 879f2c513e..6bb61d97e6 100644 --- a/developer/src/kmconvert/kmconvert.dproj +++ b/developer/src/kmconvert/kmconvert.dproj @@ -172,7 +172,6 @@ - diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj index 0a7a2db447..48e8c345fb 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj @@ -165,7 +165,6 @@ - diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr index 96ab9d0da1..569ed0bb03 100644 --- a/developer/src/tike/Tike.dpr +++ b/developer/src/tike/Tike.dpr @@ -73,7 +73,7 @@ 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 'main\XString.pas', debugkeyboard in 'debug\debugkeyboard.pas', Keyman.Developer.UI.UfrmMessageDlgWithSave in 'dialogs\Keyman.Developer.UI.UfrmMessageDlgWithSave.pas' {frmMessageDlgWithSave}, debugdeadkeys in 'debug\debugdeadkeys.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', @@ -180,7 +180,7 @@ 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}, @@ -207,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', @@ -230,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', @@ -270,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', diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj index 14ee8d0e32..0994f1b100 100644 --- a/developer/src/tike/Tike.dproj +++ b/developer/src/tike/Tike.dproj @@ -214,7 +214,7 @@
frmRegressionTestFailure
 - +
frmMessageDlgWithSave
@@ -262,7 +262,7 @@
frmBitmapEditorText
 - + @@ -402,7 +402,7 @@ - +
frmAddKeyboardFeature
 @@ -431,7 +431,6 @@ -
frmKeymanDeveloper
 @@ -445,7 +444,7 @@ - +
TIKEDockForm
@@ -472,7 +471,7 @@ - + @@ -529,8 +528,8 @@ - - + +
frmDebugStatus_CallStack
 diff --git a/windows/src/global/delphi/general/XString.pas b/developer/src/tike/debug/XString.pas similarity index 100% rename from windows/src/global/delphi/general/XString.pas rename to developer/src/tike/debug/XString.pas diff --git a/windows/src/global/delphi/general/CheckboxGridHelper.pas b/developer/src/tike/main/CheckboxGridHelper.pas similarity index 100% rename from windows/src/global/delphi/general/CheckboxGridHelper.pas rename to developer/src/tike/main/CheckboxGridHelper.pas diff --git a/windows/src/global/delphi/general/DropTarget.pas b/developer/src/tike/main/DropTarget.pas similarity index 100% rename from windows/src/global/delphi/general/DropTarget.pas rename to developer/src/tike/main/DropTarget.pas diff --git a/windows/src/global/delphi/general/Keyman.System.KeymanCore.pas b/developer/src/tike/main/Keyman.System.KeymanCore.pas similarity index 100% rename from windows/src/global/delphi/general/Keyman.System.KeymanCore.pas rename to developer/src/tike/main/Keyman.System.KeymanCore.pas diff --git a/windows/src/global/delphi/general/Keyman.System.KeymanCoreDebug.pas b/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas similarity index 100% rename from windows/src/global/delphi/general/Keyman.System.KeymanCoreDebug.pas rename to developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas diff --git a/windows/src/global/delphi/general/Keyman.UI.FontUtils.pas b/developer/src/tike/main/Keyman.UI.FontUtils.pas similarity index 100% rename from windows/src/global/delphi/general/Keyman.UI.FontUtils.pas rename to developer/src/tike/main/Keyman.UI.FontUtils.pas diff --git a/windows/src/global/delphi/general/UFixFontDialogBold.pas b/developer/src/tike/main/UFixFontDialogBold.pas similarity index 100% rename from windows/src/global/delphi/general/UFixFontDialogBold.pas rename to developer/src/tike/main/UFixFontDialogBold.pas From 385045e978cda2fb712ffa2e595c811e00fdf37e Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 23 Jun 2022 09:47:59 +1000 Subject: [PATCH 3/4] chore(windows): fixup refs and move StockFileNames * StockFileNames.pas was missed in earlier moves. * Cleaned up references in various dproj files * Fixed up broken references to common files --- .../delphi/general}/StockFileNames.pas | 0 developer/src/kmcomp/kmcomp.dpr | 11 ++- developer/src/kmcomp/kmcomp.dproj | 75 +++++++++---------- developer/src/kmconvert/kmconvert.dpr | 10 +-- developer/src/kmconvert/kmconvert.dproj | 10 +-- .../KeyboardPackageVersionsTestSuite.dpr | 10 +-- .../KeyboardPackageVersionsTestSuite.dproj | 10 +-- .../src/test/auto/kmconvert/kmconverttest.dpr | 4 +- .../test/auto/kmconvert/kmconverttest.dproj | 4 +- .../KMXFileLanguagesTestSuite.dpr | 2 +- .../KMXFileLanguagesTestSuite.dproj | 2 +- developer/src/tike/Tike.dpr | 10 +-- developer/src/tike/Tike.dproj | 14 ++-- windows/src/buildtools/buildpkg/buildpkg.dpr | 2 +- .../src/buildtools/buildpkg/buildpkg.dproj | 2 +- windows/src/desktop/kmshell/kmshell.dpr | 2 +- windows/src/desktop/kmshell/kmshell.dproj | 2 +- windows/src/desktop/setup/setup.dpr | 2 +- windows/src/desktop/setup/setup.dproj | 2 +- windows/src/engine/keyman/keyman.dpr | 2 +- windows/src/engine/keyman/keyman.dproj | 2 +- windows/src/engine/kmcomapi/kmcomapi.dpr | 2 +- windows/src/engine/kmcomapi/kmcomapi.dproj | 2 +- windows/src/engine/tsysinfo/tsysinfo.dpr | 2 +- windows/src/engine/tsysinfo/tsysinfo.dproj | 2 +- .../cvt.dpr | 2 +- .../cvt.dproj | 2 +- windows/src/support/kmxfonts/kmxfonts.dpr | 2 +- windows/src/support/kmxfonts/kmxfonts.dproj | 2 +- .../inffiletests/packageinftool.dpr | 2 +- .../inffiletests/packageinftool.dproj | 2 +- .../package-info/PackageInfoTestSuite.dpr | 2 +- .../package-info/PackageInfoTestSuite.dproj | 2 +- .../windows-setup/WindowsSetupTest.dpr | 2 +- .../windows-setup/WindowsSetupTest.dproj | 2 +- 35 files changed, 102 insertions(+), 104 deletions(-) rename {windows/src/global/delphi/cust => common/windows/delphi/general}/StockFileNames.pas (100%) diff --git a/windows/src/global/delphi/cust/StockFileNames.pas b/common/windows/delphi/general/StockFileNames.pas similarity index 100% rename from windows/src/global/delphi/cust/StockFileNames.pas rename to common/windows/delphi/general/StockFileNames.pas diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr index e0d5605d23..0fe7f296e2 100644 --- a/developer/src/kmcomp/kmcomp.dpr +++ b/developer/src/kmcomp/kmcomp.dpr @@ -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', @@ -55,9 +54,9 @@ uses TouchLayout in '..\tike\oskbuilder\TouchLayout.pas', TouchLayoutDefinitions in '..\tike\oskbuilder\TouchLayoutDefinitions.pas', TouchLayoutUtils in '..\tike\oskbuilder\TouchLayoutUtils.pas', - KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas', + KeyboardFonts in '..\common\windows\delphi\general\KeyboardFonts.pas', KeyboardParser in '..\tike\main\KeyboardParser.pas', - WindowsLanguages in '..\common\delphi\general\WindowsLanguages.pas', + WindowsLanguages in '..\common\windows\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 '..\common\delphi\general\UKeymanTargets.pas', + UKeymanTargets in '..\common\windows\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', @@ -100,7 +99,7 @@ uses Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\common\windows\delphi\vcl\Keyman.System.RegExGroupHelperRSP19902.pas', Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas', Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas', - TextFileFormat in '..\common\delphi\general\TextFileFormat.pas', + TextFileFormat in '..\common\windows\delphi\general\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 '..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas', diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj index 81aa31fa82..d0c1e020d4 100644 --- a/developer/src/kmcomp/kmcomp.dproj +++ b/developer/src/kmcomp/kmcomp.dproj @@ -162,16 +162,15 @@ - + - - - + + @@ -180,15 +179,15 @@ - +
TikeForm
TTntForm - - + + - + @@ -202,42 +201,42 @@ - - - - - - + + + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + @@ -250,12 +249,12 @@ - - - + + + - - + + @@ -266,9 +265,9 @@ - + - + Cfg_2 diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr index ba9006ff62..35b98b67d7 100644 --- a/developer/src/kmconvert/kmconvert.dpr +++ b/developer/src/kmconvert/kmconvert.dpr @@ -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 '..\common\delphi\general\UKeymanTargets.pas', + UKeymanTargets in '..\common\windows\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,12 +21,12 @@ 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 '..\common\delphi\general\WindowsLanguages.pas', + WindowsLanguages in '..\common\windows\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', + TextFileFormat in '..\common\windows\delphi\general\TextFileFormat.pas', kpsfile in '..\common\delphi\packages\kpsfile.pas', PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas', JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas', @@ -74,7 +74,7 @@ uses TouchLayout in '..\TIKE\oskbuilder\TouchLayout.pas', TouchLayoutDefinitions in '..\TIKE\oskbuilder\TouchLayoutDefinitions.pas', TouchLayoutUtils in '..\TIKE\oskbuilder\TouchLayoutUtils.pas', - KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas', + KeyboardFonts in '..\common\windows\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 '..\common\delphi\compiler\CompileErrorCodes.pas', diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj index 6bb61d97e6..5558b4de4e 100644 --- a/developer/src/kmconvert/kmconvert.dproj +++ b/developer/src/kmconvert/kmconvert.dproj @@ -116,10 +116,10 @@ - + - + @@ -127,12 +127,12 @@ - + - + @@ -180,7 +180,7 @@ - + diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr index 84f9861c22..04856f445c 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr @@ -19,7 +19,7 @@ uses 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', @@ -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 '..\..\..\common\delphi\general\UKeymanTargets.pas', + UKeymanTargets in '..\..\..\common\windows\delphi\general\UKeymanTargets.pas', CompileKeymanWeb in '..\..\..\tike\compile\CompileKeymanWeb.pas', CompileErrorCodes in '..\..\..\common\delphi\compiler\CompileErrorCodes.pas', KeyboardParser in '..\..\..\tike\main\KeyboardParser.pas', - WindowsLanguages in '..\..\..\common\delphi\general\WindowsLanguages.pas', + WindowsLanguages in '..\..\..\common\windows\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,7 +80,7 @@ uses TouchLayoutDefinitions in '..\..\..\tike\oskbuilder\TouchLayoutDefinitions.pas', TouchLayout in '..\..\..\tike\oskbuilder\TouchLayout.pas', TouchLayoutUtils in '..\..\..\tike\oskbuilder\TouchLayoutUtils.pas', - KeyboardFonts in '..\..\..\common\delphi\general\KeyboardFonts.pas', + KeyboardFonts in '..\..\..\common\windows\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 '..\..\..\common\delphi\compiler\CompilePackageInstaller.pas', @@ -92,7 +92,7 @@ uses Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas', Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas', Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas', - TextFileFormat in '..\..\..\common\delphi\general\TextFileFormat.pas', + TextFileFormat in '..\..\..\common\windows\delphi\general\TextFileFormat.pas', Keyman.System.LexicalModelUtils in '..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas', Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas', Keyman.System.Standards.LangTagsRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas', diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj index 48e8c345fb..959ce2cc8d 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj @@ -99,7 +99,7 @@ - + @@ -145,11 +145,11 @@ - + - + @@ -160,7 +160,7 @@ - + @@ -172,7 +172,7 @@ - + diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dpr b/developer/src/test/auto/kmconvert/kmconverttest.dpr index 67be7f600f..2725ac47c2 100644 --- a/developer/src/test/auto/kmconvert/kmconverttest.dpr +++ b/developer/src/test/auto/kmconvert/kmconverttest.dpr @@ -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 '..\..\..\common\delphi\general\UKeymanTargets.pas', + UKeymanTargets in '..\..\..\common\windows\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; diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dproj b/developer/src/test/auto/kmconvert/kmconverttest.dproj index 0a04a7f320..ca80e02ecb 100644 --- a/developer/src/test/auto/kmconvert/kmconverttest.dproj +++ b/developer/src/test/auto/kmconvert/kmconverttest.dproj @@ -149,7 +149,7 @@ - + @@ -164,7 +164,7 @@ - + Cfg_2 Base diff --git a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr index 1c26ce765f..aef131a3b0 100644 --- a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr +++ b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr @@ -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', diff --git a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj index 79bb38c38f..8c2fcb37ee 100644 --- a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj +++ b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj @@ -98,7 +98,7 @@ - + diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr index 569ed0bb03..37481c615c 100644 --- a/developer/src/tike/Tike.dpr +++ b/developer/src/tike/Tike.dpr @@ -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', @@ -102,7 +102,7 @@ uses utilstr in '..\..\..\common\windows\delphi\general\utilstr.pas', utilkeyboard in '..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas', KeyboardParser in 'main\KeyboardParser.pas', - TextFileFormat in '..\common\delphi\general\TextFileFormat.pas', + TextFileFormat in '..\common\windows\delphi\general\TextFileFormat.pas', KMDActions in '..\common\delphi\components\KMDActions.pas', KMDActionInterfaces in '..\common\delphi\components\KMDActionInterfaces.pas', UfrmHelp in 'main\UfrmHelp.pas' {frmHelp}, @@ -146,7 +146,7 @@ uses 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 '..\common\delphi\general\WindowsLanguages.pas', + WindowsLanguages in '..\common\windows\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', @@ -188,10 +188,10 @@ uses UfrmKeymanWizard in 'child\UfrmKeymanWizard.pas' {frmKeymanWizard}, UfrmKeyboardFonts in 'dialogs\UfrmKeyboardFonts.pas' {frmKeyboardFonts}, CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas', - KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas', + KeyboardFonts in '..\common\windows\delphi\general\KeyboardFonts.pas', JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas', TikeUnicodeData in 'main\TikeUnicodeData.pas', - UKeymanTargets in '..\common\delphi\general\UKeymanTargets.pas', + UKeymanTargets in '..\common\windows\delphi\general\UKeymanTargets.pas', UfrmSMTPSetup in 'dialogs\UfrmSMTPSetup.pas' {frmSMTPSetup}, UfrmSendURLsToEmail in 'dialogs\UfrmSendURLsToEmail.pas' {frmSendURLsToEmail}, MSXMLDomCreate in '..\..\..\common\windows\delphi\general\MSXMLDomCreate.pas', diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj index 0994f1b100..da58fef3d5 100644 --- a/developer/src/tike/Tike.dproj +++ b/developer/src/tike/Tike.dproj @@ -214,7 +214,7 @@
frmRegressionTestFailure
 - +
frmMessageDlgWithSave
@@ -236,7 +236,7 @@
frmNewFileDetails
 - + @@ -249,8 +249,8 @@ - - + +
frmHelp
@@ -333,7 +333,7 @@
frmSelectBCP47Language
TTntForm - + @@ -419,10 +419,10 @@
frmKeyboardFonts
 - + - +
frmSMTPSetup
 diff --git a/windows/src/buildtools/buildpkg/buildpkg.dpr b/windows/src/buildtools/buildpkg/buildpkg.dpr index a69acad294..e1ebdb363e 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dpr +++ b/windows/src/buildtools/buildpkg/buildpkg.dpr @@ -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', diff --git a/windows/src/buildtools/buildpkg/buildpkg.dproj b/windows/src/buildtools/buildpkg/buildpkg.dproj index b59126f99f..49fdf4ab5a 100644 --- a/windows/src/buildtools/buildpkg/buildpkg.dproj +++ b/windows/src/buildtools/buildpkg/buildpkg.dproj @@ -110,7 +110,7 @@ - + diff --git a/windows/src/desktop/kmshell/kmshell.dpr b/windows/src/desktop/kmshell/kmshell.dpr index bb612358e5..b20d90cffb 100644 --- a/windows/src/desktop/kmshell/kmshell.dpr +++ b/windows/src/desktop/kmshell/kmshell.dpr @@ -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', diff --git a/windows/src/desktop/kmshell/kmshell.dproj b/windows/src/desktop/kmshell/kmshell.dproj index 771525a887..d8a2beac27 100644 --- a/windows/src/desktop/kmshell/kmshell.dproj +++ b/windows/src/desktop/kmshell/kmshell.dproj @@ -266,7 +266,7 @@ - + diff --git a/windows/src/desktop/setup/setup.dpr b/windows/src/desktop/setup/setup.dpr index 9f3ac7350a..0d9a16b875 100644 --- a/windows/src/desktop/setup/setup.dpr +++ b/windows/src/desktop/setup/setup.dpr @@ -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', diff --git a/windows/src/desktop/setup/setup.dproj b/windows/src/desktop/setup/setup.dproj index 2c51bccea5..33a9d6f4a5 100644 --- a/windows/src/desktop/setup/setup.dproj +++ b/windows/src/desktop/setup/setup.dproj @@ -138,7 +138,7 @@ - + diff --git a/windows/src/engine/keyman/keyman.dpr b/windows/src/engine/keyman/keyman.dpr index 9de71a3fd2..f425f89042 100644 --- a/windows/src/engine/keyman/keyman.dpr +++ b/windows/src/engine/keyman/keyman.dpr @@ -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', diff --git a/windows/src/engine/keyman/keyman.dproj b/windows/src/engine/keyman/keyman.dproj index 3d8597bbf7..52c8dda9cf 100644 --- a/windows/src/engine/keyman/keyman.dproj +++ b/windows/src/engine/keyman/keyman.dproj @@ -218,7 +218,7 @@ - + diff --git a/windows/src/engine/kmcomapi/kmcomapi.dpr b/windows/src/engine/kmcomapi/kmcomapi.dpr index 065ff1729c..0db7f5ea06 100644 --- a/windows/src/engine/kmcomapi/kmcomapi.dpr +++ b/windows/src/engine/kmcomapi/kmcomapi.dpr @@ -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', diff --git a/windows/src/engine/kmcomapi/kmcomapi.dproj b/windows/src/engine/kmcomapi/kmcomapi.dproj index e5c3d5aff0..9cf288d95c 100644 --- a/windows/src/engine/kmcomapi/kmcomapi.dproj +++ b/windows/src/engine/kmcomapi/kmcomapi.dproj @@ -222,7 +222,7 @@ - + diff --git a/windows/src/engine/tsysinfo/tsysinfo.dpr b/windows/src/engine/tsysinfo/tsysinfo.dpr index 34bd83aa00..d333e75d97 100644 --- a/windows/src/engine/tsysinfo/tsysinfo.dpr +++ b/windows/src/engine/tsysinfo/tsysinfo.dpr @@ -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}, diff --git a/windows/src/engine/tsysinfo/tsysinfo.dproj b/windows/src/engine/tsysinfo/tsysinfo.dproj index dd4be456c2..eaca7762c2 100644 --- a/windows/src/engine/tsysinfo/tsysinfo.dproj +++ b/windows/src/engine/tsysinfo/tsysinfo.dproj @@ -198,7 +198,7 @@ - + diff --git a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr index 07d1f1cfc0..6f4a235b9a 100644 --- a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr +++ b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr @@ -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'; diff --git a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj index 05ea9e4111..48edcb38d9 100644 --- a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj +++ b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj @@ -108,7 +108,7 @@ - + diff --git a/windows/src/support/kmxfonts/kmxfonts.dpr b/windows/src/support/kmxfonts/kmxfonts.dpr index 436d2def29..86a9bf1ce9 100644 --- a/windows/src/support/kmxfonts/kmxfonts.dpr +++ b/windows/src/support/kmxfonts/kmxfonts.dpr @@ -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} diff --git a/windows/src/support/kmxfonts/kmxfonts.dproj b/windows/src/support/kmxfonts/kmxfonts.dproj index e395b46346..1964ec9750 100644 --- a/windows/src/support/kmxfonts/kmxfonts.dproj +++ b/windows/src/support/kmxfonts/kmxfonts.dproj @@ -231,7 +231,7 @@ - + Cfg_2 Base diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr index fdabdaffae..6837444caa 100644 --- a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr +++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr @@ -9,7 +9,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', diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj index eee1aeedbf..9023ecca0b 100644 --- a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj +++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj @@ -91,7 +91,7 @@ - + diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr index b59c9dda05..1bd9aa5e8b 100644 --- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr +++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr @@ -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', diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj index 7e8a158e94..3bdbd31793 100644 --- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj +++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj @@ -94,7 +94,7 @@ - + diff --git a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr index 0905e3cb5a..716aa37def 100644 --- a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr +++ b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr @@ -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', diff --git a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj index e52340cb74..64ebf2d805 100644 --- a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj +++ b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj @@ -105,7 +105,7 @@ - + From ca17d9e31382436aca7f808f9187dab49e17b34e Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 23 Jun 2022 10:58:58 +1000 Subject: [PATCH 4/4] chore(developer): README and more path fixups --- developer/src/README.md | 119 +++++++++------ developer/src/kmcomp/kmcomp.dpr | 8 +- developer/src/kmcomp/kmcomp.dproj | 9 +- developer/src/kmconvert/kmconvert.dpr | 8 +- developer/src/kmconvert/kmconvert.dproj | 8 +- developer/src/test/auto/Makefile | 7 +- .../test/auto/developer-test-auto.groupproj | 108 ++++++++++++++ .../KeyboardPackageVersionsTestSuite.dpr | 8 +- .../KeyboardPackageVersionsTestSuite.dproj | 67 ++++----- .../passtructsize/passtructsize.dproj | 136 +++++++++++++++++- .../src/test/auto/kmconvert/kmconverttest.dpr | 2 +- .../test/auto/kmconvert/kmconverttest.dproj | 16 +-- .../model-ts-parser/ModelTsParserTest.dpr | 4 +- .../model-ts-parser/ModelTsParserTest.dproj | 135 ++++++++++++++++- .../src/test/auto}/package-info/.gitignore | 0 .../src/test/auto}/package-info/Makefile | 0 .../auto}/package-info/PackageInfoTest.pas | 0 .../package-info/PackageInfoTestSuite.dpr | 0 .../package-info/PackageInfoTestSuite.dproj | 2 +- .../package-info/PackageInfoTestSuite.res | Bin .../src/test/auto}/package-info/test/test.inf | 0 .../test/auto}/package-info/test/test.json | 0 .../src/test/auto}/package-info/test/test.xml | 0 developer/src/tike/Tike.dpr | 10 +- developer/src/tike/Tike.dproj | 10 +- windows/src/test/unit-tests/Makefile | 7 +- 26 files changed, 533 insertions(+), 131 deletions(-) create mode 100644 developer/src/test/auto/developer-test-auto.groupproj rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/.gitignore (100%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/Makefile (100%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/PackageInfoTest.pas (100%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/PackageInfoTestSuite.dpr (100%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/PackageInfoTestSuite.dproj (99%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/PackageInfoTestSuite.res (100%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/test/test.inf (100%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/test/test.json (100%) rename {windows/src/test/unit-tests => developer/src/test/auto}/package-info/test/test.xml (100%) diff --git a/developer/src/README.md b/developer/src/README.md index 5d8f102aa1..6054cd5a61 100644 --- a/developer/src/README.md +++ b/developer/src/README.md @@ -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. \ No newline at end of file diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr index 0fe7f296e2..1fcf977155 100644 --- a/developer/src/kmcomp/kmcomp.dpr +++ b/developer/src/kmcomp/kmcomp.dpr @@ -54,9 +54,9 @@ uses TouchLayout in '..\tike\oskbuilder\TouchLayout.pas', TouchLayoutDefinitions in '..\tike\oskbuilder\TouchLayoutDefinitions.pas', TouchLayoutUtils in '..\tike\oskbuilder\TouchLayoutUtils.pas', - KeyboardFonts in '..\common\windows\delphi\general\KeyboardFonts.pas', + KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas', KeyboardParser in '..\tike\main\KeyboardParser.pas', - WindowsLanguages in '..\common\windows\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', @@ -64,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 '..\common\windows\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', @@ -99,7 +99,7 @@ uses Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\common\windows\delphi\vcl\Keyman.System.RegExGroupHelperRSP19902.pas', Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas', Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas', - TextFileFormat in '..\common\windows\delphi\general\TextFileFormat.pas', + TextFileFormat in '..\common\delphi\general\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 '..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas', diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj index d0c1e020d4..8453e92639 100644 --- a/developer/src/kmcomp/kmcomp.dproj +++ b/developer/src/kmcomp/kmcomp.dproj @@ -62,7 +62,6 @@ $(BDS)\bin\delphi_PROJECTICNS.icns kmcomp true - ..\..\..\windows\src\global\delphi\vclzip;..\..\resellers;C:\keyman\8.0\src\global\delphi\jedi;$(DCC_UnitSearchPath) KPSMALL;VERSION_KEYMAN_DEVELOPER;$(DCC_Define) 00400000 false @@ -204,9 +203,9 @@ - + - + @@ -214,7 +213,7 @@ - + @@ -249,7 +248,7 @@ - + diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr index 35b98b67d7..1b0b9edda2 100644 --- a/developer/src/kmconvert/kmconvert.dpr +++ b/developer/src/kmconvert/kmconvert.dpr @@ -10,7 +10,7 @@ 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 '..\common\windows\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 '..\..\..\common\windows\delphi\general\StockFileNames.pas', @@ -21,12 +21,12 @@ 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 '..\common\windows\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\windows\delphi\general\TextFileFormat.pas', + TextFileFormat in '..\common\delphi\general\TextFileFormat.pas', kpsfile in '..\common\delphi\packages\kpsfile.pas', PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas', JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas', @@ -74,7 +74,7 @@ uses TouchLayout in '..\TIKE\oskbuilder\TouchLayout.pas', TouchLayoutDefinitions in '..\TIKE\oskbuilder\TouchLayoutDefinitions.pas', TouchLayoutUtils in '..\TIKE\oskbuilder\TouchLayoutUtils.pas', - KeyboardFonts in '..\common\windows\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 '..\common\delphi\compiler\CompileErrorCodes.pas', diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj index 5558b4de4e..148585112e 100644 --- a/developer/src/kmconvert/kmconvert.dproj +++ b/developer/src/kmconvert/kmconvert.dproj @@ -116,7 +116,7 @@ - + @@ -127,12 +127,12 @@ - + - + @@ -180,7 +180,7 @@ - + diff --git a/developer/src/test/auto/Makefile b/developer/src/test/auto/Makefile index e8570c8718..cf14e7cf18 100644 --- a/developer/src/test/auto/Makefile +++ b/developer/src/test/auto/Makefile @@ -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 diff --git a/developer/src/test/auto/developer-test-auto.groupproj b/developer/src/test/auto/developer-test-auto.groupproj new file mode 100644 index 0000000000..cf31a8f8ce --- /dev/null +++ b/developer/src/test/auto/developer-test-auto.groupproj @@ -0,0 +1,108 @@ + + + {39F157F7-EACA-4480-A268-2AEEF826DE21} + + + + + + + + + + + + + + + + + + + + + + + + + + Default.Personality.12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr index 04856f445c..44640edc55 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr @@ -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 '..\..\..\common\windows\delphi\general\UKeymanTargets.pas', + UKeymanTargets in '..\..\..\common\delphi\general\UKeymanTargets.pas', CompileKeymanWeb in '..\..\..\tike\compile\CompileKeymanWeb.pas', CompileErrorCodes in '..\..\..\common\delphi\compiler\CompileErrorCodes.pas', KeyboardParser in '..\..\..\tike\main\KeyboardParser.pas', - WindowsLanguages in '..\..\..\common\windows\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,7 +80,7 @@ uses TouchLayoutDefinitions in '..\..\..\tike\oskbuilder\TouchLayoutDefinitions.pas', TouchLayout in '..\..\..\tike\oskbuilder\TouchLayout.pas', TouchLayoutUtils in '..\..\..\tike\oskbuilder\TouchLayoutUtils.pas', - KeyboardFonts in '..\..\..\common\windows\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 '..\..\..\common\delphi\compiler\CompilePackageInstaller.pas', @@ -92,7 +92,7 @@ uses Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas', Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas', Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas', - TextFileFormat in '..\..\..\common\windows\delphi\general\TextFileFormat.pas', + TextFileFormat in '..\..\..\common\delphi\general\TextFileFormat.pas', Keyman.System.LexicalModelUtils in '..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas', Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas', Keyman.System.Standards.LangTagsRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas', diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj index 959ce2cc8d..0cb4eb7ad9 100644 --- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj +++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj @@ -93,9 +93,10 @@ MainSource - + + - + @@ -121,7 +122,7 @@ - + @@ -129,41 +130,41 @@ - + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - + + + + + + + @@ -172,14 +173,14 @@ - + - + - - + + Cfg_2 Base diff --git a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj index cb86d7b07e..e3fe3e8ed8 100644 --- a/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj +++ b/developer/src/test/auto/kmcomp-x64-structures/passtructsize/passtructsize.dproj @@ -1,7 +1,7 @@  {766E074A-91D9-4651-8CB0-66EAF581A91E} - 18.7 + 18.8 None passtructsize.dpr True @@ -91,14 +91,15 @@ MainSource - + - + + Cfg_2 @@ -172,12 +173,20 @@ classes 1 + + classes + 1 + res\xml 1 + + res\xml + 1 + @@ -190,138 +199,242 @@ library\lib\armeabi 1 + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + library\lib\mips 1 + + library\lib\mips + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + res\drawable 1 + + res\drawable + 1 + res\values 1 + + res\values + 1 + res\values-v21 1 + + res\values-v21 + 1 + res\values 1 + + res\values + 1 + res\drawable 1 + + res\drawable + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-ldpi 1 + + res\drawable-ldpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-xxxhdpi 1 + + res\drawable-xxxhdpi + 1 + res\drawable-small 1 + + res\drawable-small + 1 + res\drawable-normal 1 + + res\drawable-normal + 1 + res\drawable-large 1 + + res\drawable-large + 1 + res\drawable-xlarge 1 + + res\drawable-xlarge + 1 + res\values 1 + + res\values + 1 + @@ -410,6 +523,9 @@ 0 + + 0 + 0 @@ -699,6 +815,9 @@ 1 + + 1 + @@ -791,6 +910,10 @@ library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + 1 @@ -815,6 +938,12 @@ 0 + + + library\lib\armeabi-v7a + 1 + + 1 @@ -852,6 +981,7 @@ + True diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dpr b/developer/src/test/auto/kmconvert/kmconverttest.dpr index 2725ac47c2..238eae0b9b 100644 --- a/developer/src/test/auto/kmconvert/kmconverttest.dpr +++ b/developer/src/test/auto/kmconvert/kmconverttest.dpr @@ -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 '..\..\..\common\windows\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', diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dproj b/developer/src/test/auto/kmconvert/kmconverttest.dproj index ca80e02ecb..4c1c478cf3 100644 --- a/developer/src/test/auto/kmconvert/kmconverttest.dproj +++ b/developer/src/test/auto/kmconvert/kmconverttest.dproj @@ -148,8 +148,8 @@ MainSource - - + + @@ -191,6 +191,12 @@ + + + kmconverttest.exe + true + + true @@ -206,12 +212,6 @@ true - - - kmconverttest.exe - true - - 1 diff --git a/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dpr b/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dpr index 214fb595a2..3445fc918c 100644 --- a/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dpr +++ b/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dpr @@ -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; diff --git a/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dproj b/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dproj index bbfac6492b..5666347ea7 100644 --- a/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dproj +++ b/developer/src/test/auto/model-ts-parser/ModelTsParserTest.dproj @@ -1,7 +1,7 @@  {0158CB55-B9BC-4F32-B860-FD6073AE2EB7} - 18.7 + 18.8 None ModelTsParserTest.dpr True @@ -85,8 +85,8 @@ MainSource - - + + Cfg_2 Base @@ -143,12 +143,20 @@ classes 1 + + classes + 1 + res\xml 1 + + res\xml + 1 + @@ -161,138 +169,242 @@ library\lib\armeabi 1 + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + library\lib\mips 1 + + library\lib\mips + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + res\drawable 1 + + res\drawable + 1 + res\values 1 + + res\values + 1 + res\values-v21 1 + + res\values-v21 + 1 + res\values 1 + + res\values + 1 + res\drawable 1 + + res\drawable + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-ldpi 1 + + res\drawable-ldpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-xxxhdpi 1 + + res\drawable-xxxhdpi + 1 + res\drawable-small 1 + + res\drawable-small + 1 + res\drawable-normal 1 + + res\drawable-normal + 1 + res\drawable-large 1 + + res\drawable-large + 1 + res\drawable-xlarge 1 + + res\drawable-xlarge + 1 + res\values 1 + + res\values + 1 + @@ -362,6 +474,9 @@ 0 + + 0 + 0 @@ -649,6 +764,9 @@ 1 + + 1 + @@ -692,6 +810,10 @@ library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + 1 @@ -714,6 +836,12 @@ 0 + + + library\lib\armeabi-v7a + 1 + + 1 @@ -751,6 +879,7 @@ + True diff --git a/windows/src/test/unit-tests/package-info/.gitignore b/developer/src/test/auto/package-info/.gitignore similarity index 100% rename from windows/src/test/unit-tests/package-info/.gitignore rename to developer/src/test/auto/package-info/.gitignore diff --git a/windows/src/test/unit-tests/package-info/Makefile b/developer/src/test/auto/package-info/Makefile similarity index 100% rename from windows/src/test/unit-tests/package-info/Makefile rename to developer/src/test/auto/package-info/Makefile diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTest.pas b/developer/src/test/auto/package-info/PackageInfoTest.pas similarity index 100% rename from windows/src/test/unit-tests/package-info/PackageInfoTest.pas rename to developer/src/test/auto/package-info/PackageInfoTest.pas diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr b/developer/src/test/auto/package-info/PackageInfoTestSuite.dpr similarity index 100% rename from windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr rename to developer/src/test/auto/package-info/PackageInfoTestSuite.dpr diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj b/developer/src/test/auto/package-info/PackageInfoTestSuite.dproj similarity index 99% rename from windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj rename to developer/src/test/auto/package-info/PackageInfoTestSuite.dproj index 3bdbd31793..fec155a827 100644 --- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj +++ b/developer/src/test/auto/package-info/PackageInfoTestSuite.dproj @@ -103,7 +103,7 @@ - + diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.res b/developer/src/test/auto/package-info/PackageInfoTestSuite.res similarity index 100% rename from windows/src/test/unit-tests/package-info/PackageInfoTestSuite.res rename to developer/src/test/auto/package-info/PackageInfoTestSuite.res diff --git a/windows/src/test/unit-tests/package-info/test/test.inf b/developer/src/test/auto/package-info/test/test.inf similarity index 100% rename from windows/src/test/unit-tests/package-info/test/test.inf rename to developer/src/test/auto/package-info/test/test.inf diff --git a/windows/src/test/unit-tests/package-info/test/test.json b/developer/src/test/auto/package-info/test/test.json similarity index 100% rename from windows/src/test/unit-tests/package-info/test/test.json rename to developer/src/test/auto/package-info/test/test.json diff --git a/windows/src/test/unit-tests/package-info/test/test.xml b/developer/src/test/auto/package-info/test/test.xml similarity index 100% rename from windows/src/test/unit-tests/package-info/test/test.xml rename to developer/src/test/auto/package-info/test/test.xml diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr index 37481c615c..349d30de0b 100644 --- a/developer/src/tike/Tike.dpr +++ b/developer/src/tike/Tike.dpr @@ -73,7 +73,7 @@ uses UfrmVisualKeyboardImportKMX in 'dialogs\UfrmVisualKeyboardImportKMX.pas' {frmVisualKeyboardImportKMX}, ScanCodeMap in '..\..\..\common\windows\delphi\general\ScanCodeMap.pas', UfrmRegressionTestFailure in 'dialogs\UfrmRegressionTestFailure.pas' {frmRegressionTestFailure}, - XString in 'main\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', @@ -102,7 +102,7 @@ uses utilstr in '..\..\..\common\windows\delphi\general\utilstr.pas', utilkeyboard in '..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas', KeyboardParser in 'main\KeyboardParser.pas', - TextFileFormat in '..\common\windows\delphi\general\TextFileFormat.pas', + TextFileFormat in '..\common\delphi\general\TextFileFormat.pas', KMDActions in '..\common\delphi\components\KMDActions.pas', KMDActionInterfaces in '..\common\delphi\components\KMDActionInterfaces.pas', UfrmHelp in 'main\UfrmHelp.pas' {frmHelp}, @@ -146,7 +146,7 @@ uses 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 '..\common\windows\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', @@ -188,10 +188,10 @@ uses UfrmKeymanWizard in 'child\UfrmKeymanWizard.pas' {frmKeymanWizard}, UfrmKeyboardFonts in 'dialogs\UfrmKeyboardFonts.pas' {frmKeyboardFonts}, CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas', - KeyboardFonts in '..\common\windows\delphi\general\KeyboardFonts.pas', + KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas', JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas', TikeUnicodeData in 'main\TikeUnicodeData.pas', - UKeymanTargets in '..\common\windows\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', diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj index da58fef3d5..0afdc8c55b 100644 --- a/developer/src/tike/Tike.dproj +++ b/developer/src/tike/Tike.dproj @@ -214,7 +214,7 @@
frmRegressionTestFailure
 - +
frmMessageDlgWithSave
@@ -249,7 +249,7 @@ - + @@ -333,7 +333,7 @@
frmSelectBCP47Language
TTntForm - + @@ -419,10 +419,10 @@
frmKeyboardFonts
 - + - +
frmSMTPSetup
 diff --git a/windows/src/test/unit-tests/Makefile b/windows/src/test/unit-tests/Makefile index d538384984..b632081822 100644 --- a/windows/src/test/unit-tests/Makefile +++ b/windows/src/test/unit-tests/Makefile @@ -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)