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

chore(developer): fixup windows build with developer refs

Browse source
This commit is contained in:
Marc Durdin 2022-05-19 15:20:38 +10:00
parent 434d044ace
commit 3ec0edbead
5 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
windows/src/Makefile
View file

@ -68,7 +68,7 @@ buildtools: global
cd $(ROOT)\src
developer: global
cd $(ROOT)\src\developer
cd $(KEYMAN_ROOT)\developer\src
$(MAKE) $(TARGET)
cd $(ROOT)\src
@ -168,7 +168,10 @@ test-klog:
#
test-releaseexists:
cd $(ROOT)\src\developer\inst
cd $(KEYMAN_ROOT)\developer\src\inst
$(MAKE) test-releaseexists
cd $(ROOT)\src\desktop\inst
$(MAKE) test-releaseexists
cd $(ROOT)\src
@ -215,9 +218,9 @@ test-coverity:
# TODO: automated upload as part of build
test-coverity-internal:
cd $(ROOT)\src\developer\kmanalyze
cd $(KEYMAN_ROOT)\developer\src\kmanalyze
$(MAKE) build
cd $(ROOT)\src\developer\kmcmpdll
cd $(KEYMAN_ROOT)\developer\src\kmcmpdll
$(MAKE) build
cd $(ROOT)\src\engine\keyman32
$(MAKE) build
@ -259,7 +262,7 @@ build-release-wrapper: clean-output global-versions
cd $(ROOT)\src
$(MAKE) build-release-wrapper-oem
cd $(ROOT)\src\developer\inst
cd $(KEYMAN_ROOT)\developer\src\inst
$(MAKE)
!endif
@ -320,9 +323,6 @@ web-install:
cd $(ROOT)\src\desktop\help
$(MAKE) html install
cd $(ROOT)\src\developer\help
$(MAKE) html install
# ----------------------------------------------------------------------
test-certificate:

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

@ -20,15 +20,15 @@ uses
PackageFileFormats in '..\..\global\delphi\general\PackageFileFormats.pas',
GetOsVersion in '..\..\global\delphi\general\GetOsVersion.pas',
RegistryKeys in '..\..\global\delphi\general\RegistryKeys.pas',
KeymanDeveloperOptions in '..\..\developer\TIKE\main\KeymanDeveloperOptions.pas',
RedistFiles in '..\..\developer\TIKE\main\RedistFiles.pas',
KeymanDeveloperOptions in '..\..\..\..\developer\src\tike\main\KeymanDeveloperOptions.pas',
RedistFiles in '..\..\..\..\developer\src\tike\main\RedistFiles.pas',
DebugPaths in '..\..\global\delphi\general\DebugPaths.pas',
CustomisationStorage in '..\..\global\delphi\cust\CustomisationStorage.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
klog in '..\..\global\delphi\general\klog.pas',
httpuploader in '..\..\global\delphi\general\httpuploader.pas',
Upload_Settings in '..\..\global\delphi\general\Upload_Settings.pas',
UfrmTike in '..\..\developer\TIKE\main\UfrmTike.pas' {TikeForm: TTntForm},
UfrmTike in '..\..\..\..\developer\src\tike\main\UfrmTike.pas' {TikeForm: TTntForm},
utilhttp in '..\..\global\delphi\general\utilhttp.pas',
kmxfile in '..\..\global\delphi\general\kmxfile.pas',
utilkeyboard in '..\..\global\delphi\general\utilkeyboard.pas',
@ -40,7 +40,7 @@ uses
utilexecute in '..\..\global\delphi\general\utilexecute.pas',
KeymanVersion in '..\..\global\delphi\general\KeymanVersion.pas',
Glossary in '..\..\global\delphi\general\Glossary.pas',
Keyman.Developer.System.Project.ProjectLog in '..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas',
Keyman.Developer.System.Project.ProjectLog in '..\..\..\..\developer\src\tike\project\Keyman.Developer.System.Project.ProjectLog.pas',
UMD5Hash in '..\..\global\delphi\general\UMD5Hash.pas',
UserMessages in '..\..\global\delphi\general\UserMessages.pas',
VisualKeyboard in '..\..\global\delphi\visualkeyboard\VisualKeyboard.pas',
@ -75,7 +75,7 @@ uses
Keyman.System.PackageInfoRefreshLexicalModels in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
Keyman.System.Standards.LangTagsRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas',
Keyman.Developer.System.KeymanDeveloperPaths in '..\..\developer\TIKE\main\Keyman.Developer.System.KeymanDeveloperPaths.pas';
Keyman.Developer.System.KeymanDeveloperPaths in '..\..\..\..\developer\src\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas';
begin
Run;

6
windows/src/desktop/inst/Makefile
View file

@ -65,6 +65,12 @@ check-unicodedata:
cd $(ROOT)\src\global\inst
$(MAKE)
test-releaseexists:
cd $(ROOT)\src\desktop\inst
$(MKVER_U) download.in download.mak
$(MAKE) -fdownload.mak test-releaseexists
# ----------------------------------------------------------------------
!include ..\..\Target.mak

3
windows/src/desktop/inst/download.in
View file

@ -23,6 +23,9 @@ prepareredist:
clean:
rem clean
test-releaseexists:
if exist $(ROOT)\release\$Version\keymandesktop*.msi echo. & echo Release $Version already exists. Delete it or update VERSION.md and try again & exit 1
candle: candle-desktop candle-cef candle-locale
#

4
windows/src/global/delphi/keyman_components.dpk
View file

@ -61,7 +61,7 @@ contains
KMDActions in 'comp\KMDActions.pas',
CleartypeDrawCharacter in 'general\CleartypeDrawCharacter.pas',
OnScreenKeyboard in 'comp\OnScreenKeyboard.pas',
KMDActionInterfaces in '..\..\developer\TIKE\actions\KMDActionInterfaces.pas',
KMDActionInterfaces in '..\..\..\..\developer\src\tike\actions\KMDActionInterfaces.pas',
getosversion in 'general\getosversion.pas',
exImageList in 'comp\exImageList.pas',
KeymanTextEditorRichEdit in 'comp\KeymanTextEditorRichEdit.pas',
@ -75,7 +75,7 @@ contains
KeymanVersion in 'general\KeymanVersion.pas',
CloseButtonPageControl in 'comp\CloseButtonPageControl.pas',
KeymanDeveloperDebuggerMemo in 'comp\KeymanDeveloperDebuggerMemo.pas',
TextFileFormat in '..\..\developer\TIKE\main\TextFileFormat.pas',
TextFileFormat in '..\..\..\..\developer\src\tike\main\TextFileFormat.pas',
Browse4Folder in '..\..\ext\browse4folder\Browse4Folder.pas';
end.