erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-18 14:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

chore(windows): tweak Makefiles for devtools

Browse source
This commit is contained in:
Marc Durdin 2022-06-10 11:32:31 +10:00
parent 6b8cf27ffd
commit f3ea7c4625
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
windows/src/Makefile
View file

@ -99,7 +99,6 @@ unit-tests:
release: clean-pathdefines test-release-cef-path test-releasebuildcheck test-uiaccess test-klog test-releaseexists test-cert test-hhc test-7zip test-wix clean
cd $(ROOT)\src
$(MAKE) devtools-app
$(MAKE) global-versions
$(MAKE) build-release-wrapper
# $(MAKE) clean <-- this makes it harder to do OEM builds
cd $(ROOT)\src
@ -264,14 +263,7 @@ build-release-wrapper-oem:
# Tools needed to complete a build
#
global-versions:
# Build our root version.txt
cd $(ROOT)\src
$(MKVER_U) $(ROOT)\src\global\inc\keymanversion_build.in $(ROOT)\src\global\inc\keymanversion_build.h
$(MKVER_U) $(ROOT)\src\global\delphi\general\keymanversion_build.in $(ROOT)\src\global\delphi\general\keymanversion_build.inc
build-tools: global-versions
build-tools:
!ifdef NODELPHI
echo Skipping build-tools
!else
@ -287,8 +279,10 @@ message-constants: build-tools
!ifdef NODELPHI
echo Skipping message-constants
!else
!if "$(TARGET)" != "clean"
$(DEVTOOLS) -buildmessageconstants $(ROOT)\src\desktop\kmshell\xml\strings.xml $(ROOT)\src\global\delphi\cust\MessageIdentifierConsts.pas
!endif
!endif
#
# Remove all files from output folders to ensure no legacy files left in a release

10
windows/src/Target.mak
View file

@ -15,7 +15,17 @@ versionhistory-app2:
cd $(ROOT)\src\buildtools
$(MAKE) versionhistory
# TODO: move to common
global-versions:
# Build our root version.txt
cd $(ROOT)\src
$(MKVER_U) $(ROOT)\src\global\inc\keymanversion_build.in $(ROOT)\src\global\inc\keymanversion_build.h
$(MKVER_U) $(ROOT)\src\global\delphi\general\keymanversion_build.in $(ROOT)\src\global\delphi\general\keymanversion_build.inc
devtools-app: dirs
@if not exist $(WINDOWS_ROOT)\src\global\inc\keymanversion_build.h $(MAKE) global-versions
cd $(COMMON_ROOT)\tools\devtools
$(MAKE)
cd $(ROOT)\src