erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-12 03:45:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix(windows): remove makejcldbg references

Browse source
This commit is contained in:
Marc Durdin 2020-03-18 20:26:55 +11:00
parent f2f2add7a6
commit b61949ca41
4 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
windows/src/Defines.mak
View file

@ -186,8 +186,6 @@ TDS2DBG=$(ROOT)\bin\buildtools\tds2dbg
SENTRYTOOL=$(ROOT)\bin\buildtools\sentrytool
SENTRYTOOL_DELPHIPREP=$(SENTRYTOOL) delphiprep -r $(KEYMAN_ROOT) -i $(DELPHIINCLUDES)
MAKEJCLDBG=$(ROOT)\bin\buildtools\makejcldbg.exe -E
WIXPATH="c:\program files (x86)\WiX Toolset v3.11\bin"
WIXCANDLE=$(WIXPATH)\candle.exe -wx -nologo

6
windows/src/buildtools/Makefile
View file

@ -4,7 +4,7 @@
NOTARGET_SIGNCODE=yes
TARGETS=devtools sentrytool makejcldbg tds2dbg genkmnp getfilelocks isadmin mkver stockeditor \
TARGETS=devtools sentrytool tds2dbg genkmnp getfilelocks isadmin mkver stockeditor \
xslt buildunidata build_standards_data buildpkg test-klog delphiprojectmanager #help
CLEANS=inst clean-buildtools
@ -24,10 +24,6 @@ sentrytool:
cd $(ROOT)\src\buildtools\sentrytool
$(MAKE) $(TARGET)
makejcldbg:
cd $(ROOT)\src\ext\jedi
$(MAKE) $(TARGET)
buildunidata:
cd $(ROOT)\src\buildtools\buildunidata
$(MAKE) $(TARGET)

21
windows/src/developer/kmcomp/Makefile
View file

@ -9,21 +9,20 @@ TARGET_EXT=exe
TARGET_GROUP=developer
build: version.res manifest.res dirs icons
$(DELPHI_MSBUILD) $(TARGET_BASE).dproj /p:Platform=Win32
$(DELPHI_MSBUILD) kmcomp.dproj /p:Platform=Win32
$(TDS2DBG) $(WIN32_TARGET_PATH)\$(TARGET_BASE).$(TARGET_EXT)
$(SENTRYTOOL_DELPHIPREP) $(WIN32_TARGET_PATH)\$(TARGET_BASE).$(TARGET_EXT) -dpr $(TARGET_BASE).dpr
$(COPY) $(WIN32_TARGET_PATH)\$(TARGET_BASE).$(TARGET_EXT) $(PROGRAM)\$(TARGET_GROUP)
if exist $(WIN32_TARGET_PATH)\$(TARGET_BASE).dbg $(COPY) $(WIN32_TARGET_PATH)\$(TARGET_BASE).dbg $(DEBUGPATH)\$(TARGET_GROUP)
$(TDS2DBG) $(WIN32_TARGET_PATH)\kmcomp.exe
$(SENTRYTOOL_DELPHIPREP) $(WIN32_TARGET_PATH)\kmcomp.exe -dpr kmcomp.dpr
$(COPY) $(WIN32_TARGET_PATH)\kmcomp.exe $(PROGRAM)\developer
if exist $(WIN32_TARGET_PATH)\kmcomp.dbg $(COPY) $(WIN32_TARGET_PATH)\kmcomp.dbg $(DEBUGPATH)\developer
$(DELPHI_MSBUILD) $(TARGET_BASE).dproj /p:Platform=Win64
$(DELPHI_MSBUILD) kmcomp.dproj /p:Platform=Win64
if exist $(WIN64_TARGET_PATH)\$(TARGET_BASE).x64.$(TARGET_EXT) del $(WIN64_TARGET_PATH)\$(TARGET_BASE).x64.$(TARGET_EXT)
$(MAKEJCLDBG) $(WIN64_TARGET_PATH)\$(TARGET_BASE).map
if exist $(WIN64_TARGET_PATH)\kmcomp.x64.exe del $(WIN64_TARGET_PATH)\kmcomp.x64.exe
# Delphi does not allow us to build to a different target filename so we rename after build
ren $(WIN64_TARGET_PATH)\$(TARGET_BASE).$(TARGET_EXT) $(TARGET_BASE).x64.$(TARGET_EXT)
$(COPY) $(WIN64_TARGET_PATH)\$(TARGET_BASE).x64.$(TARGET_EXT) $(PROGRAM)\$(TARGET_GROUP)\$(TARGET_BASE).x64.$(TARGET_EXT)
if exist $(WIN64_TARGET_PATH)\$(TARGET_BASE).dbg $(COPY) $(WIN64_TARGET_PATH)\$(TARGET_BASE).dbg $(DEBUGPATH)\$(TARGET_GROUP)\$(TARGET_BASE).x64.dbg
ren $(WIN64_TARGET_PATH)\kmcomp.exe kmcomp.x64.exe
$(COPY) $(WIN64_TARGET_PATH)\kmcomp.x64.exe $(PROGRAM)\developer\kmcomp.x64.exe
if exist $(WIN64_TARGET_PATH)\kmcomp.dbg $(COPY) $(WIN64_TARGET_PATH)\kmcomp.dbg $(DEBUGPATH)\developer\kmcomp.x64.dbg
icons:
rc icons.rc

1
windows/src/engine/kmcomapi/Makefile
View file

@ -16,7 +16,6 @@ build: version.res manifest.res kbd_noicon.res dirs
$(DELPHI_MSBUILD) kmcomapi.dproj /p:Platform=Win64
if exist $(WIN64_TARGET_PATH)\kmcomapi.x64.dll del $(WIN64_TARGET_PATH)\kmcomapi.x64.dll
$(MAKEJCLDBG) $(WIN64_TARGET_PATH)\kmcomapi.map
# Delphi does not allow us to build to a different target filename so we rename after build
ren $(WIN64_TARGET_PATH)\kmcomapi.dll kmcomapi.x64.dll
$(COPY) $(WIN64_TARGET_PATH)\kmcomapi.x64.dll $(PROGRAM)\engine\kmcomapi.x64.dll