erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 08:25:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

chore(windows): move general package units to common

Browse source
This commit is contained in:
Marc Durdin 2022-06-23 06:36:23 +10:00
parent 2aaa31eae2
commit 8cbebf7ade
25 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

@ -12,9 +12,9 @@ uses
CompilePackage in '..\..\..\windows\src\global\delphi\general\CompilePackage.pas',
CRC32 in '..\..\..\common\windows\delphi\general\CRC32.pas',
kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas',
PackageInfo in '..\..\..\windows\src\global\delphi\general\PackageInfo.pas',
PackageFileFormats in '..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas',
kmpinffile in '..\..\..\windows\src\global\delphi\general\kmpinffile.pas',
PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas',
PackageFileFormats in '..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
kmpinffile in '..\..\..\common\windows\delphi\packages\kmpinffile.pas',
RedistFiles in '..\tike\main\RedistFiles.pas',
DebugPaths in '..\..\..\common\windows\delphi\general\DebugPaths.pas',
httpuploader in '..\..\..\common\windows\delphi\general\httpuploader.pas',

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

@ -159,9 +159,9 @@
<DCCReference Include="..\..\..\windows\src\global\delphi\general\CompilePackage.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\CRC32.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\TIKE\main\RedistFiles.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\httpuploader.pas"/>

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

@ -28,10 +28,10 @@ uses
utildir in '..\..\..\common\windows\delphi\general\utildir.pas',
TextFileFormat in '..\common\delphi\general\TextFileFormat.pas',
kpsfile in '..\..\..\windows\src\global\delphi\general\kpsfile.pas',
PackageInfo in '..\..\..\windows\src\global\delphi\general\PackageInfo.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',
PackageFileFormats in '..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas',
PackageFileFormats in '..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
Keyman.Developer.System.Project.ProjectLog in '..\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas',
BCP47Tag in '..\..\..\common\windows\delphi\general\BCP47Tag.pas',
Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',

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

@ -134,10 +134,10 @@
<DCCReference Include="..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\common\delphi\general\TextFileFormat.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\BCP47Tag.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>

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

@ -14,10 +14,10 @@ uses
Keyman.Test.System.CompilePackageVersioningTest in 'Keyman.Test.System.CompilePackageVersioningTest.pas',
CompilePackage in '..\..\..\..\..\windows\src\global\delphi\general\CompilePackage.pas',
VisualKeyboard in '..\..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas',
kmpinffile in '..\..\..\..\..\windows\src\global\delphi\general\kmpinffile.pas',
kmpinffile in '..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
kpsfile in '..\..\..\..\..\windows\src\global\delphi\general\kpsfile.pas',
PackageFileFormats in '..\..\..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas',
PackageInfo in '..\..\..\..\..\windows\src\global\delphi\general\PackageInfo.pas',
PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',

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

@ -94,10 +94,10 @@
</DelphiCompile>
<DCCReference Include="Keyman.Test.System.CompilePackageVersioningTest.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\CompilePackage.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>

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

@ -60,9 +60,9 @@ uses
DebugBitBtn in '..\common\delphi\components\DebugBitBtn.pas',
DebugListBox in '..\common\delphi\components\DebugListBox.pas',
GetOsVersion in '..\..\..\common\windows\delphi\general\GetOsVersion.pas',
PackageFileFormats in '..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas',
PackageInfo in '..\..\..\windows\src\global\delphi\general\PackageInfo.pas',
kmpinffile in '..\..\..\windows\src\global\delphi\general\kmpinffile.pas',
PackageFileFormats in '..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas',
kmpinffile in '..\..\..\common\windows\delphi\packages\kmpinffile.pas',
RedistFiles in 'main\RedistFiles.pas',
UfrmBitmapEditor in 'child\UfrmBitmapEditor.pas' {frmBitmapEditor},
VisualKeyboard in '..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas',

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

@ -195,9 +195,9 @@
<DCCReference Include="..\common\delphi\components\DebugBitBtn.pas"/>
<DCCReference Include="..\common\delphi\components\DebugListBox.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\windows\src\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="main\RedistFiles.pas"/>
<DCCReference Include="child\UfrmBitmapEditor.pas">
<Form>frmBitmapEditor</Form>

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

@ -8,15 +8,15 @@ uses
CompilePackageInstaller in '..\..\global\delphi\general\CompilePackageInstaller.pas',
utilsystem in '..\..\..\..\common\windows\delphi\general\utilsystem.pas',
CompilePackage in '..\..\global\delphi\general\CompilePackage.pas',
kmpinffile in '..\..\global\delphi\general\kmpinffile.pas',
kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
kpsfile in '..\..\global\delphi\general\kpsfile.pas',
PackageInfo in '..\..\global\delphi\general\PackageInfo.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',
utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
Unicode in '..\..\..\..\common\windows\delphi\general\Unicode.pas',
VersionInfo in '..\..\..\..\common\windows\delphi\general\VersionInfo.pas',
PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas',
PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
GetOsVersion in '..\..\..\..\common\windows\delphi\general\GetOsVersion.pas',
RegistryKeys in '..\..\..\..\common\windows\delphi\general\RegistryKeys.pas',
KeymanDeveloperOptions in '..\..\..\..\developer\src\tike\main\KeymanDeveloperOptions.pas',

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

@ -95,15 +95,15 @@
<DCCReference Include="..\..\global\delphi\general\CompilePackageInstaller.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilsystem.pas"/>
<DCCReference Include="..\..\global\delphi\general\CompilePackage.pas"/>
<DCCReference Include="..\..\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\RegistryKeys.pas"/>
<DCCReference Include="..\..\..\..\developer\src\tike\main\KeymanDeveloperOptions.pas"/>

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

@ -109,9 +109,9 @@ uses
CRC32 in '..\..\..\..\common\windows\delphi\general\CRC32.pas',
input_installlayoutortip in '..\..\global\delphi\winapi\input_installlayoutortip.pas',
KPInstallPackageStartMenu in '..\..\global\delphi\general\KPInstallPackageStartMenu.pas',
kmpinffile in '..\..\global\delphi\general\kmpinffile.pas',
PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas',
PackageInfo in '..\..\global\delphi\general\PackageInfo.pas',
kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas',
utilwow64 in '..\..\global\delphi\general\utilwow64.pas',
KPUninstallPackageStartMenu in '..\..\global\delphi\general\KPUninstallPackageStartMenu.pas',

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

@ -250,9 +250,9 @@
<DCCReference Include="..\..\..\..\common\windows\delphi\general\CRC32.pas"/>
<DCCReference Include="..\..\global\delphi\winapi\input_installlayoutortip.pas"/>
<DCCReference Include="..\..\global\delphi\general\KPInstallPackageStartMenu.pas"/>
<DCCReference Include="..\..\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\global\delphi\general\utilwow64.pas"/>
<DCCReference Include="..\..\global\delphi\general\KPUninstallPackageStartMenu.pas"/>

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

@ -32,14 +32,14 @@ uses
Keyman.System.UpgradeRegistryKeys in '..\..\global\delphi\general\Keyman.System.UpgradeRegistryKeys.pas',
Keyman.Setup.System.InstallInfo in 'Keyman.Setup.System.InstallInfo.pas',
Keyman.Setup.System.OnlineResourceCheck in 'Keyman.Setup.System.OnlineResourceCheck.pas',
PackageInfo in '..\..\global\delphi\general\PackageInfo.pas',
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',
utildir in '..\..\..\..\common\windows\delphi\general\utildir.pas',
JsonUtil in '..\..\..\..\common\windows\delphi\general\JsonUtil.pas',
kmpinffile in '..\..\global\delphi\general\kmpinffile.pas',
PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas',
kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
Keyman.Setup.System.ResourceDownloader in 'Keyman.Setup.System.ResourceDownloader.pas',
httpuploader in '..\..\..\..\common\windows\delphi\general\httpuploader.pas',
Keyman.System.MITLicense in '..\..\global\delphi\general\Keyman.System.MITLicense.pas',

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

@ -135,14 +135,14 @@
<DCCReference Include="..\..\global\delphi\general\Keyman.System.UpgradeRegistryKeys.pas"/>
<DCCReference Include="Keyman.Setup.System.InstallInfo.pas"/>
<DCCReference Include="Keyman.Setup.System.OnlineResourceCheck.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utildir.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<DCCReference Include="..\..\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="Keyman.Setup.System.ResourceDownloader.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\httpuploader.pas"/>
<DCCReference Include="..\..\global\delphi\general\Keyman.System.MITLicense.pas"/>

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

@ -61,9 +61,9 @@ uses
keymancontext in 'keymancontext.pas',
utilvararray in 'util\utilvararray.pas',
kpinstallpackage in 'processes\package\kpinstallpackage.pas',
kmpinffile in '..\..\global\delphi\general\kmpinffile.pas',
PackageInfo in '..\..\global\delphi\general\PackageInfo.pas',
PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas',
kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
ttinfo in '..\..\..\..\common\windows\delphi\general\ttinfo.pas',
keymanerrorcodes in 'util\keymanerrorcodes.pas',
kpuninstallpackage in 'processes\package\kpuninstallpackage.pas',

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

@ -199,9 +199,9 @@
<DCCReference Include="keymancontext.pas"/>
<DCCReference Include="util\utilvararray.pas"/>
<DCCReference Include="processes\package\kpinstallpackage.pas"/>
<DCCReference Include="..\..\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\ttinfo.pas"/>
<DCCReference Include="util\keymanerrorcodes.pas"/>
<DCCReference Include="processes\package\kpuninstallpackage.pas"/>

6
windows/src/test/manual-tests/inffiletests/packageinftool.dpr
View file

@ -6,7 +6,7 @@ program packageinftool;
uses
System.SysUtils,
PackageInfo in '..\..\global\delphi\general\PackageInfo.pas',
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',
@ -19,9 +19,9 @@ uses
RegistryKeys in '..\..\..\..\common\windows\delphi\general\RegistryKeys.pas',
GetOsVersion in '..\..\..\..\common\windows\delphi\general\GetOsVersion.pas',
kpsfile in '..\..\global\delphi\general\kpsfile.pas',
PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas',
PackageFileFormats in '..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
packageinf in 'packageinf.pas',
kmpinffile in '..\..\global\delphi\general\kmpinffile.pas',
kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
JsonUtil in '..\..\..\..\common\windows\delphi\general\JsonUtil.pas';
begin

6
windows/src/test/manual-tests/inffiletests/packageinftool.dproj
View file

@ -88,7 +88,7 @@
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
@ -101,9 +101,9 @@
<DCCReference Include="..\..\..\..\common\windows\delphi\general\RegistryKeys.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="packageinf.pas"/>
<DCCReference Include="..\..\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>

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

@ -8,7 +8,7 @@ uses
{$IFDEF TESTINSIGHT}
TestInsight.DUnitX,
{$ENDIF }
PackageInfo in '..\..\..\global\delphi\general\PackageInfo.pas',
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',
@ -21,7 +21,7 @@ uses
RegistryKeys in '..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas',
GetOsVersion in '..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas',
kpsfile in '..\..\..\global\delphi\general\kpsfile.pas',
PackageFileFormats in '..\..\..\global\delphi\general\PackageFileFormats.pas',
PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
DUnitX.Loggers.Console,
DUnitX.Loggers.Xml.NUnit,
DUnitX.TestFramework,

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

@ -91,7 +91,7 @@
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
<DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
@ -104,7 +104,7 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\RegistryKeys.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\kpsfile.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="PackageInfoTest.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\DUnitX.Loggers.TeamCity.pas"/>

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

@ -13,7 +13,7 @@ uses
DUnitX.TestFramework,
Keyman.System.Test.InstallInfoTest in 'Keyman.System.Test.InstallInfoTest.pas',
Keyman.Setup.System.InstallInfo in '..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas',
PackageInfo in '..\..\..\global\delphi\general\PackageInfo.pas',
PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas',
utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
@ -27,8 +27,8 @@ uses
GetOsVersion in '..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas',
VersionInfo in '..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas',
SetupStrings in '..\..\..\desktop\setup\SetupStrings.pas',
kmpinffile in '..\..\..\global\delphi\general\kmpinffile.pas',
PackageFileFormats in '..\..\..\global\delphi\general\PackageFileFormats.pas',
kmpinffile in '..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
Keyman.Setup.System.SetupUILanguageManager in '..\..\..\desktop\setup\Keyman.Setup.System.SetupUILanguageManager.pas',
Keyman.System.UILanguageManager in '..\..\..\global\delphi\general\Keyman.System.UILanguageManager.pas',
Keyman.Setup.System.MsiUtils in '..\..\..\desktop\setup\Keyman.Setup.System.MsiUtils.pas';

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

@ -103,7 +103,7 @@
</DelphiCompile>
<DCCReference Include="Keyman.System.Test.InstallInfoTest.pas"/>
<DCCReference Include="..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
<DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
@ -117,8 +117,8 @@
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
<DCCReference Include="..\..\..\desktop\setup\SetupStrings.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\kmpinffile.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
<DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
<DCCReference Include="..\..\..\desktop\setup\Keyman.Setup.System.SetupUILanguageManager.pas"/>
<DCCReference Include="..\..\..\global\delphi\general\Keyman.System.UILanguageManager.pas"/>
<DCCReference Include="..\..\..\desktop\setup\Keyman.Setup.System.MsiUtils.pas"/>