chore(windows): reorganise windows/src folders
- Dominant language
- Pascal
- Stars
- 534
- Forks
- 143
- Avg merge
- 2d 10h
- Merged PRs (30d)
- 113
Description
We want to rename windows/src/desktop to windows/src/app (and corresponding bin folder). This is a reasonably complete list:
```
105 results - 34 files
common\windows\delphi\general\KeymanPaths.pas:
283: Result := keyman_root + 'windows\bin\desktop\' + S_CEF_SubProcess;
287: Result := keyman_root + 'windows\bin\desktop\kmbrowserhost\win32\debug\' + S_CEF_SubProcess;
290: Result := keyman_root + 'windows\bin\desktop\kmbrowserhost\win32\release\' + S_CEF_SubProcess;
362: Exit(keyman_root + 'windows\src\desktop\kmshell\xml\' + filename);
389: Result := IncludeTrailingPathDelimiter(keyman_root) + 'windows\src\desktop\branding';
406: Result := keyman_root + 'windows\bin\desktop\' + HelpFile;
common\windows\delphi\tools\devtools\devtools.dpr:
23: SetupStrings in '..\..\..\..\..\windows\src\desktop\setup\SetupStrings.pas',
common\windows\delphi\tools\devtools\devtools.dproj:
114:
developer\src\Makefile:
140: cd $(WINDOWS_ROOT)\src\desktop\kmbrowserhost
developer\src\inst\kmdev.wxs:
163:
developer\src\tike\main\RedistFiles.pas:
113: Result := GetDebugPath('Debug_RedistDesktopPath', ExtractFilePath(ParamStr(0))+'redist\desktop\');
oem\firstvoices\windows\src\inst\firstvoices.wxs:
47:
66:
186:
windows\src\Makefile:
165: cd $(ROOT)\src\desktop\inst
244: cd $(ROOT)\src\desktop\inst
288: $(DEVTOOLS) -buildmessageconstants $(ROOT)\src\desktop\kmshell\xml\strings.xml $(ROOT)\src\global\delphi\cust\MessageIdentifierConsts.pas
307: cd $(ROOT)\src\desktop\help
windows\src\nightly_patchbuild.bat:
4: cd /d c:\keyman\7.0\src\desktop\inst
windows\src\Target.mak:
51: -mkdir $(ROOT)\bin\desktop\xml 2>nul
windows\src\desktop\Makefile:
20: cd $(ROOT)\src\desktop\kmshell
24: cd $(ROOT)\src\desktop\kmconfig
28: cd $(ROOT)\src\desktop\kmbrowserhost
32: cd $(ROOT)\src\desktop\setup
36: cd $(ROOT)\src\desktop\help
40: cd $(ROOT)\src\desktop\insthelp
44: cd $(ROOT)\src\desktop\inst
windows\src\desktop\inst\download.in:
18: copy /Y $(ROOT)\bin\desktop\setup.exe $(ROOT)\release\$Version\setup.exe
21: $(WZZIP) $(ROOT)\release\$Version\setup-redist.zip $(ROOT)\bin\desktop\setup-redist.exe
windows\src\desktop\inst\keymandesktop.wxs:
66:
106:
113:
117:
121:
125:
129:
133:
307:
308:
310:
windows\src\desktop\inst\Makefile:
19: cd $(ROOT)\src\desktop\inst
40: cd $(ROOT)\src\desktop\inst
69: cd $(ROOT)\src\desktop\inst
windows\src\desktop\insthelp\Makefile:
11: $(COPY) $(WIN32_TARGET_PATH)\insthelp.exe $(ROOT)\bin\desktop\insthelp.exe
15: @rem $(MT) -nologo -inputresource:$(PROGRAM)\desktop\insthelp.exe -validate_manifest
21: $(SIGNCODE) /d "Keyman Install Helper" $(ROOT)\bin\desktop\insthelp.exe
24: $(SYMSTORE) $(PROGRAM)\desktop\insthelp.exe /t keyman-windows
25: $(SYMSTORE) $(DEBUGPATH)\desktop\insthelp.dbg /t keyman-windows
windows\src\desktop\kmbrowserhost\Makefile:
21: $(SIGNCODE) /d "Keyman" $(PROGRAM)\desktop\kmbrowserhost.exe
24: $(COPY) $(PROGRAM)\desktop\kmbrowserhost.exe "$(INSTALLPATH_KEYMANDESKTOP)"
27: $(SYMSTORE) $(PROGRAM)\desktop\kmbrowserhost.exe /t keyman-windows
28: $(SYMSTORE) $(DEBUGPATH)\desktop\kmbrowserhost.dbg /t keyman-windows
windows\src\desktop\kmconfig\Makefile:
17: $(SIGNCODE) /d "Keyman for Windows" $(PROGRAM)\desktop\kmconfig.exe
20: $(SYMSTORE) $(PROGRAM)\desktop\kmconfig.exe /t keyman-windows
21: $(SYMSTORE) $(DEBUGPATH)\desktop\kmconfig.dbg /t keyman-windows
25: $(MT) -nologo -inputresource:$(PROGRAM)\desktop\kmconfig.exe -validate_manifest
28: copy $(ROOT)\bin\desktop\kmconfig.exe "$(INSTALLPATH_KEYMANDESKTOP)"
windows\src\desktop\kmshell\Makefile:
18: cd $(ROOT)\src\desktop\kmshell\xml
19: -del /q $(ROOT)\bin\desktop\xml\*
20: copy * $(ROOT)\bin\desktop\xml
21: cd $(ROOT)\src\desktop\kmshell
22: -rmdir /S /Q $(ROOT)\bin\desktop\locale
23: mkdir $(ROOT)\bin\desktop\locale
24: xcopy /S /I $(ROOT)\src\desktop\kmshell\locale $(ROOT)\bin\desktop\locale\
27: cd $(ROOT)\src\desktop\kmshell\xml
35: $(SIGNCODE) /d "Keyman" $(PROGRAM)\desktop\kmshell.exe
38: $(SYMSTORE) $(PROGRAM)\desktop\kmshell.exe /t keyman-windows
39: $(SYMSTORE) $(DEBUGPATH)\desktop\kmshell.dbg /t keyman-windows
43: $(MT) -nologo -inputresource:$(PROGRAM)\desktop\kmshell.exe -validate_manifest
46: copy $(ROOT)\bin\desktop\kmshell.exe "$(INSTALLPATH_KEYMANDESKTOP)"
47: copy $(ROOT)\bin\desktop\xml\* "$(INSTALLPATH_KEYMANDESKTOP)\xml\"
windows\src\desktop\setup\Makefile:
15: $(COPY) $(WIN32_TARGET_PATH)\setup.exe $(PROGRAM)\desktop\setup-redist.exe
30: $(SIGNCODE) /d "Keyman Setup" $(PROGRAM)\desktop\setup.exe
33: $(SYMSTORE) $(PROGRAM)\desktop\setup.exe /t keyman-windows
34: $(SYMSTORE) $(DEBUGPATH)\desktop\setup.dbg /t keyman-windows
38: $(MT) -nologo -inputresource:$(PROGRAM)\desktop\setup.exe -validate_manifest
windows\src\engine\keyman\icons.rc:
2: 1 ICON DISCARDABLE "..\\..\\desktop\\branding\\keymandesktop90-32.ico"
windows\src\engine\keyman\keyman.dpr:
75: UILanguages in '..\..\desktop\kmshell\util\UILanguages.pas',
windows\src\engine\keyman\keyman.dproj:
193:
windows\src\engine\keymanx64\keymanx64.rc:
5: 1 ICON "..\\..\\desktop\\branding\\keymandesktop90-64.ico"
windows\src\engine\kmcomapi\kmcomapi.dproj:
127: ..\..\desktop\kmshell\bin\win32\debug\kmshell.exe
windows\src\support\km_yim\Makefile:
9: rem $(TDSPACK) $(PROGRAM)\desktop\km_yim.exe km_yim.tds
10: rem $(TDS2DBG) $(PROGRAM)\desktop\km_yim.exe
windows\src\test\manual-tests\default-ui-language\DefaultUILanguage.dpr:
10: Keyman.Configuration.System.InstallDefaultUILanguage in '..\..\..\desktop\kmshell\main\Keyman.Configuration.System.InstallDefaultUILanguage.pas',
windows\src\test\manual-tests\default-ui-language\DefaultUILanguage.dproj:
90:
windows\src\test\manual-tests\test-starttask\test_starttask.dpr:
9: Keyman.System.KeymanStartTask in '..\..\desktop\kmshell\util\Keyman.System.KeymanStartTask.pas',
windows\src\test\manual-tests\test-starttask\test_starttask.dproj:
132:
windows\src\test\manual-tests\test_sfx\testsfx.dpr:
7: SFXgbls in '..\..\desktop\setup\SFXgbls.pas',
8: SFXinflt in '..\..\desktop\setup\SFXinflt.pas',
9: SFXmisc in '..\..\desktop\setup\SFXmisc.pas',
10: sfxstrings in '..\..\desktop\setup\sfxstrings.pas',
12: keymanstrings in '..\..\desktop\setup\keymanstrings.pas';
windows\src\test\test_i3633\Makefile:
13: $(SIGCHECK) $(ROOT)\bin\desktop\* > sig1
windows\src\test\unit-tests\jsonutil\JsonUtilTests.dproj:
974: C:\Projects\keyman\app\windows\src\desktop\kmshell\kmshell.dproj
windows\src\test\unit-tests\windows-setup\WindowsSetupTest.dpr:
15: Keyman.Setup.System.InstallInfo in '..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas',
29: SetupStrings in '..\..\..\desktop\setup\SetupStrings.pas',
32: Keyman.Setup.System.SetupUILanguageManager in '..\..\..\desktop\setup\Keyman.Setup.System.SetupUILanguageManager.pas',
34: Keyman.Setup.System.MsiUtils in '..\..\..\desktop\setup\Keyman.Setup.System.MsiUtils.pas';
windows\src\test\unit-tests\windows-setup\WindowsSetupTest.dproj:
105:
119:
122:
124:
```
Also, the following arising from #5816 would be helpful to cleanup at the same time:
* Other chores and renames:
- [ ] windows/src/buildtools -> windows/src/tools
- [ ] windows/src/global -> windows/src/common
- [ ] windows/src/test/unit-tests -> windows/src/test/auto
- [ ] Consolidate multiple crc32.cpp (https://github.com/keymanapp/keyman/pull/6747)
- [ ] Consolidate multiple VKScanCodes.cpp ((https://github.com/keymanapp/keyman/pull/6747)
* File moves in windows/src/global/delphi/general:
File | Final location | notes | PR
---------------------------------------|----------------|-------|----
BaseKeyboards.pas | kmshell | kmshell only |
BitmapIPicture.pas | windows | |
HotkeyUtils.pas | kmshell | referenced by kmcomapi but unused there |
IntegerList.pas | keyman | used only by keyman
InterfaceHotkeys.pas | windows | |
Keyman.System.MITLicense.pas | setup | used only by setup |
Keyman.System.Security.pas | windows | |
Keyman.System.Settings.pas | windows | global/delphi/settings |
Keyman.System.SettingsManager.pas | windows | global/delphi/settings |
Keyman.System.SettingsManagerFile.pas | windows | global/delphi/settings |
Keyman.System.UILanguageManager.pas | windows | global/delphi/settings |
Keyman.System.UpgradeRegistryKeys.pas | windows | |
Keyman.UI.UfrmProgress.pas | kmshell | kmshell only |
keyman32_int.pas | regressiontest | used only in manual test |
KeymanControlMessages.pas | windows | |
KeymanEngineControl.pas | windows | |
KeymanMutex.pas | windows | |
KeymanOptionNames.pas | windows | global/delphi/settings |
kmcomapi_errors.pas | windows | |
kmxfileusedchars.pas | windows | |
kmxfileusedscripts.pas | windows | |
KPInstallPackageStartMenu.pas | windows | |
KPUninstallPackageStartMenu.pas | windows | |
RegKeyboards.pas | kmcomapi | |
ShellUserRegistry.pas | setup | only setup |
UnicodeBlocks.pas | windows | |
USendInputString.pas | keyman | |
utilcheckfonts.pas | windows | |
utilhotkey.pas | windows | |
utiltsf.pas | windows | |
utiluac.pas | windows | |
utilwow64.pas | windows | |
Windows8LanguageList.pas | windows | |
Contributor guide
Assessment
This issue has not been assessed yet.