From 00a97442531664b31574078e391c08bd8d75e2a5 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Fri, 6 Nov 2020 17:44:31 +1100 Subject: [PATCH] chore(windows): symbol server support, initial steps --- windows/src/Defines.mak | 18 ++++++++++++++++++ windows/src/Header.mak | 9 ++++++++- windows/src/Target.mak | 10 ++++++++++ windows/src/buildtools/importkeyboard/Makefile | 4 ++++ windows/src/desktop/insthelp/Makefile | 4 ++++ windows/src/desktop/kmbrowserhost/Makefile | 4 ++++ windows/src/desktop/kmconfig/Makefile | 4 ++++ windows/src/desktop/kmshell/Makefile | 4 ++++ windows/src/desktop/setup/Makefile | 4 ++++ windows/src/developer/TIKE/Makefile | 4 ++++ windows/src/developer/kmanalyze/Makefile | 8 ++++++-- windows/src/developer/kmcmpdll/Makefile | 14 ++++++++++---- windows/src/developer/kmcomp/Makefile | 6 ++++++ windows/src/developer/kmconvert/Makefile | 4 ++++ windows/src/developer/kmdecomp/Makefile | 10 +++++++--- .../src/developer/samples/imsample/Makefile | 5 +++++ windows/src/developer/setup/Makefile | 7 +++++++ windows/src/engine/inst/insthelper/Makefile | 4 ++++ windows/src/engine/keyman/Makefile | 4 ++++ windows/src/engine/keyman32/Makefile | 4 ++++ windows/src/engine/keyman64/Makefile | 4 ++++ windows/src/engine/keymanmc/Makefile | 5 ++++- windows/src/engine/keymanx64/Makefile | 4 ++++ windows/src/engine/kmcomapi/Makefile | 6 ++++++ windows/src/engine/kmtip/Makefile | 6 ++++++ windows/src/engine/mcompile/Makefile | 4 ++++ windows/src/engine/tsysinfo/Makefile | 4 ++++ windows/src/engine/tsysinfox64/Makefile | 4 ++++ windows/src/support/charident/Makefile | 6 +++++- windows/src/support/etl2log/Makefile | 4 ++++ windows/src/support/km_yim/Makefile | 6 ++++-- windows/src/support/kmkb0045/Makefile | 4 ++-- 32 files changed, 172 insertions(+), 16 deletions(-) diff --git a/windows/src/Defines.mak b/windows/src/Defines.mak index 0c1aaceb8d..868ded4c8a 100644 --- a/windows/src/Defines.mak +++ b/windows/src/Defines.mak @@ -273,3 +273,21 @@ MKVER_V=$(MKVER_APP) $(MKVER_COMMON_PARAMS) -v $(MKVER_VERSION_TXT) version.in v MKVER_M=$(MKVER_APP) $(MKVER_COMMON_PARAMS) -m manifest.in manifest.xml # Token replacement for all other file types; pattern: $(MKVER_U) MKVER_U=$(MKVER_APP) $(MKVER_COMMON_PARAMS) -u + +# +# Symstore +# + +# KEYMAN_SYMSTOREPATH defaults to sibling folder "symbols". If it is not present, +# then we won't attempt to write symbols to the store. +!IFNDEF KEYMAN_SYMSTOREPATH +KEYMAN_SYMSTOREPATH=$(KEYMAN_ROOT)\..\symbols +!ENDIF + +# This command depends on VERSION_WIN and VERSION_TIER being defined, through +# `make symbols` (i.e. don't call `make wrap-symbols`) +SYMSTORE="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe" add \ + /s "$(KEYMAN_SYMSTOREPATH)" \ + /v "$(VERSION_WIN)" \ + /c "Version: $(VERSION_WIN)-$(VERSION_TIER)" \ + /compress /f diff --git a/windows/src/Header.mak b/windows/src/Header.mak index 1511f70af2..82ef95f6bb 100644 --- a/windows/src/Header.mak +++ b/windows/src/Header.mak @@ -17,7 +17,8 @@ ROOT=c:\keyman\windows !include $(ROOT)\src\Defines.mak # -# These three targets are the standard targets for all +# The targets build, signcode, symbols, backup are standard +# targets for all projects # build: $(BUILDPREREQ) @@ -27,12 +28,18 @@ build: $(BUILDPREREQ) signcode: $(MAKE) -DTARGET=signcode $(TARGETS) +symbols: + $(MAKE) -DTARGET=symbols $(TARGETS) + backup: $(MAKE) -DTARGET=backup $(TARGETS) !ELSE signcode: rem no signcode required +symbols: + rem no symbols required + backup: rem no backup required !ENDIF diff --git a/windows/src/Target.mak b/windows/src/Target.mak index 6a4594eab0..08ef664dcd 100644 --- a/windows/src/Target.mak +++ b/windows/src/Target.mak @@ -66,3 +66,13 @@ dirs: vcvars32: vcvars32.bat + +# This command injects the current version and tier into the VERSION_WIN and VERSION_TIER defines and then +# calls "make wrap-symbols", but it only runs if the symbols folder exists + +symbols: + if exist $(KEYMAN_SYMSTOREPATH) \ + cmd /C \ + for /f %v in ($(KEYMAN_ROOT)\VERSION.md) do \ + for /f %t in ($(KEYMAN_ROOT)\TIER.md) do \ + $(MAKE) -DVERSION_TIER=%t -DVERSION_WIN=%v wrap-symbols diff --git a/windows/src/buildtools/importkeyboard/Makefile b/windows/src/buildtools/importkeyboard/Makefile index c0fd710689..52695c8476 100644 --- a/windows/src/buildtools/importkeyboard/Makefile +++ b/windows/src/buildtools/importkeyboard/Makefile @@ -15,6 +15,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Developer Tools" $(PROGRAM)\buildtools\importkeyboard.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\buildtools\importkeyboard.exe /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\buildtools\importkeyboard.pdb /t keyman-developer + backup: $(WZZIP) $(BUILD)\buildtools\importkeyboard.zip $(BACKUPDEFAULTS) importkeyboard.exe diff --git a/windows/src/desktop/insthelp/Makefile b/windows/src/desktop/insthelp/Makefile index 93840f415e..2fd7f158f2 100644 --- a/windows/src/desktop/insthelp/Makefile +++ b/windows/src/desktop/insthelp/Makefile @@ -20,6 +20,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Desktop Install Helper" $(ROOT)\bin\desktop\insthelp.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\desktop\insthelp.exe /t keyman-windows + $(SYMSTORE) $(DEBUGPATH)\desktop\insthelp.dbg /t keyman-windows + backup: $(WZZIP) $(BUILD)\desktop\insthelp.zip $(BACKUPDEFAULTS) insthelp.exe diff --git a/windows/src/desktop/kmbrowserhost/Makefile b/windows/src/desktop/kmbrowserhost/Makefile index fea44e36e8..8dea82e831 100644 --- a/windows/src/desktop/kmbrowserhost/Makefile +++ b/windows/src/desktop/kmbrowserhost/Makefile @@ -23,6 +23,10 @@ signcode: install: $(COPY) $(PROGRAM)\desktop\kmbrowserhost.exe "$(INSTALLPATH_KEYMANDESKTOP)" +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\desktop\kmbrowserhost.exe /t keyman-windows + $(SYMSTORE) $(DEBUGPATH)\desktop\kmbrowserhost.dbg /t keyman-windows + backup: $(WZZIP) $(BUILD)\desktop\kmbrowserhost.zip $(BACKUPDEFAULTS) $(WIN32_TARGET_PATH)\kmbrowserhost.exe $(WIN32_TARGET_PATH)\kmbrowserhost.dbg diff --git a/windows/src/desktop/kmconfig/Makefile b/windows/src/desktop/kmconfig/Makefile index 449837349a..447de763bc 100644 --- a/windows/src/desktop/kmconfig/Makefile +++ b/windows/src/desktop/kmconfig/Makefile @@ -19,6 +19,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman for Windows" $(PROGRAM)\desktop\kmconfig.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\desktop\kmconfig.exe /t keyman-windows + $(SYMSTORE) $(DEBUGPATH)\desktop\kmconfig.dbg /t keyman-windows + backup: $(WZZIP) $(BUILD)\desktop\kmconfig.zip $(BACKUPDEFAULTS) kmconfig.exe diff --git a/windows/src/desktop/kmshell/Makefile b/windows/src/desktop/kmshell/Makefile index bc177886ba..b54031d5bc 100644 --- a/windows/src/desktop/kmshell/Makefile +++ b/windows/src/desktop/kmshell/Makefile @@ -34,6 +34,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Desktop" $(PROGRAM)\desktop\kmshell.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\desktop\kmshell.exe /t keyman-windows + $(SYMSTORE) $(DEBUGPATH)\desktop\kmshell.dbg /t keyman-windows + backup: $(WZZIP) $(BUILD)\desktop\kmshell.zip $(BACKUPDEFAULTS) kmshell.exe diff --git a/windows/src/desktop/setup/Makefile b/windows/src/desktop/setup/Makefile index 03ad64a602..c13be474c5 100644 --- a/windows/src/desktop/setup/Makefile +++ b/windows/src/desktop/setup/Makefile @@ -25,6 +25,10 @@ clean: def-clean signcode: rem SIGNCODE /d "Keyman Desktop Setup" $(PROGRAM)\desktop\setup.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\desktop\setup.exe /t keyman-windows + $(SYMSTORE) $(DEBUGPATH)\desktop\setup.dbg /t keyman-windows + backup: $(WZZIP) $(BUILD)\desktop\setup.zip $(BACKUPDEFAULTS) setup.exe diff --git a/windows/src/developer/TIKE/Makefile b/windows/src/developer/TIKE/Makefile index 1629bab9f1..d81baf7e22 100644 --- a/windows/src/developer/TIKE/Makefile +++ b/windows/src/developer/TIKE/Makefile @@ -72,6 +72,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Developer" $(PROGRAM)\developer\tike.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\developer\tike.exe /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\tike.dbg /t keyman-developer + backup: $(WZZIP) $(BUILD)\developer\tike.zip $(BACKUPDEFAULTS) tike.exe diff --git a/windows/src/developer/kmanalyze/Makefile b/windows/src/developer/kmanalyze/Makefile index 2213ad2a23..3cc017abd7 100644 --- a/windows/src/developer/kmanalyze/Makefile +++ b/windows/src/developer/kmanalyze/Makefile @@ -15,13 +15,17 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Developer Keyboard Analyzer" $(PROGRAM)\developer\kmanalyze.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\developer\kmanalyze.exe /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\kmanalyze.pdb /t keyman-developer + backup: $(WZZIP) $(BUILD)\developer\kmanalyze.exe $(BACKUPDEFAULTS) kmanalyze.exe test-manifest: - @rem + @rem #install: # $(COPY) $(PROGRAM)\developer\kmanalyze.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmanalyze.exe" - + !include ..\..\Target.mak diff --git a/windows/src/developer/kmcmpdll/Makefile b/windows/src/developer/kmcmpdll/Makefile index e6ccbf316b..7723fa74d1 100644 --- a/windows/src/developer/kmcmpdll/Makefile +++ b/windows/src/developer/kmcmpdll/Makefile @@ -16,14 +16,14 @@ build: version.res dirs $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.dll ..\tike\kmcmpdll.dll -mkdir ..\kmcomp\$(WIN32_TARGET_PATH) $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.dll ..\kmcomp\$(WIN32_TARGET_PATH)\kmcmpdll.dll - + $(MSBUILD) kmcmpdll.sln $(MSBUILD_BUILD) /p:Platform=x64 $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.dll $(PROGRAM)\developer\kmcmpdll.x64.dll $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.lib $(OUTLIB)\kmcmpdll.x64.lib $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.pdb $(DEBUGPATH)\developer\kmcmpdll.x64.pdb -mkdir ..\kmcomp\$(WIN64_TARGET_PATH) $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.dll ..\kmcomp\$(WIN64_TARGET_PATH)\kmcmpdll.x64.dll - + clean: def-clean $(MSBUILD) kmcmpdll.sln $(MSBUILD_CLEAN) @@ -32,14 +32,20 @@ signcode: $(SIGNCODE) /d "Keyman Developer Compiler" $(PROGRAM)\developer\kmcmpdll.dll $(SIGNCODE) /d "Keyman Developer Compiler" $(PROGRAM)\developer\kmcmpdll.x64.dll +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\developer\kmcmpdll.dll /t keyman-developer + $(SYMSTORE) $(PROGRAM)\developer\kmcmpdll.x64.dll /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\kmcmpdll.pdb /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\kmcmpdll.x64.pdb /t keyman-developer + backup: $(WZZIP) $(BUILD)\developer\kmcmpdll.zip $(BACKUPDEFAULTS) $(PROGRAM)\developer\kmcmpdll.dll $(PROGRAM)\developer\kmcmpdll.x64.dll - + test-manifest: @rem This target needed as dependency for TIKE and KMCMPDLL install: $(COPY) $(PROGRAM)\developer\kmcmpdll.dll "$(INSTALLPATH_KEYMANDEVELOPER)\kmcmpdll.dll" $(COPY) $(PROGRAM)\developer\kmcmpdll.x64.dll "$(INSTALLPATH_KEYMANDEVELOPER)\kmcmpdll.x64.dll" - + !include ..\..\Target.mak diff --git a/windows/src/developer/kmcomp/Makefile b/windows/src/developer/kmcomp/Makefile index b8e1da64ff..059810af2c 100644 --- a/windows/src/developer/kmcomp/Makefile +++ b/windows/src/developer/kmcomp/Makefile @@ -39,6 +39,12 @@ signcode: $(SIGNCODE) /d "Keyman Developer Command-Line Compiler" $(PROGRAM)\developer\kmcomp.exe $(SIGNCODE) /d "Keyman Developer Command-Line Compiler" $(PROGRAM)\developer\kmcomp.x64.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\developer\kmcomp.exe /t keyman-developer + $(SYMSTORE) $(PROGRAM)\developer\kmcomp.x64.exe /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\kmcomp.dbg /t keyman-developer + #TODO: $(SYMSTORE) $(DEBUGPATH)\developer\kmcomp.x64.dbg /t keyman-developer + backup: $(WZZIP) $(BUILD)\developer\kmcomp.zip $(BACKUPDEFAULTS) $(PROGRAM)\developer\kmcomp.exe $(PROGRAM)\developer\kmcomp.x64.exe diff --git a/windows/src/developer/kmconvert/Makefile b/windows/src/developer/kmconvert/Makefile index f54f1d6902..7b85027076 100644 --- a/windows/src/developer/kmconvert/Makefile +++ b/windows/src/developer/kmconvert/Makefile @@ -21,6 +21,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Developer Conversion Utility" $(PROGRAM)\developer\kmconvert.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\developer\kmconvert.exe /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\kmconvert.dbg /t keyman-developer + backup: $(WZZIP) $(BUILD)\developer\kmconvert.zip $(BACKUPDEFAULTS) kmconvert.exe diff --git a/windows/src/developer/kmdecomp/Makefile b/windows/src/developer/kmdecomp/Makefile index 4fa5b3ef8e..7bf26de79c 100644 --- a/windows/src/developer/kmdecomp/Makefile +++ b/windows/src/developer/kmdecomp/Makefile @@ -16,13 +16,17 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Developer Decompiler" $(PROGRAM)\developer\kmdecomp.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\developer\kmdecomp.exe /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\kmdecomp.pdb /t keyman-developer + backup: - $(WZZIP) $(BUILD)\developer\kmdecomp.zip $(BACKUPDEFAULTS) $(PROGRAM)\developer\kmdecomp.exe - + $(WZZIP) $(BUILD)\developer\kmdecomp.zip $(BACKUPDEFAULTS) $(PROGRAM)\developer\kmdecomp.exe + test-manifest: @rem This target needed as dependency for KMDECOMP install: $(COPY) $(PROGRAM)\developer\kmdecomp.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmdecomp.exe" - + !include ..\..\Target.mak diff --git a/windows/src/developer/samples/imsample/Makefile b/windows/src/developer/samples/imsample/Makefile index adcc8736db..07853d41f4 100644 --- a/windows/src/developer/samples/imsample/Makefile +++ b/windows/src/developer/samples/imsample/Makefile @@ -9,10 +9,15 @@ VERSION_TXT_PATH=..\.. build: dirs version.res $(MSBUILD) imsample.sln $(MSBUILD_BUILD) $(COPY) imsample.dll $(PROGRAM)\developer + $(COPY) imsample.pdb $(PROGRAM)\developer signcode: $(SIGNCODE) /d "Keyman IMX Sample" $(PROGRAM)\developer\imsample.dll +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\developer\imsample.dll /t keyman-developer + $(SYMSTORE) $(DEBUGPATH)\developer\imsample.pdb /t keyman-developer + backup: $(WZZIP) $(BUILD)\developer\imsample.zip $(BACKUPDEFAULTS) imsample.dll diff --git a/windows/src/developer/setup/Makefile b/windows/src/developer/setup/Makefile index 5b89a38ac2..8aa0767d51 100644 --- a/windows/src/developer/setup/Makefile +++ b/windows/src/developer/setup/Makefile @@ -25,6 +25,13 @@ clean: def-clean signcode: rem SIGNCODE /d "Keyman Developer Setup" $(PROGRAM)\developer\setup.exe +wrap-symbols: + # This is slightly non-standard due to renamed devsetup.dbg above + # we should be able to clean this up in the future when we remove the + # zipped debug symbols + $(SYMSTORE) $(PROGRAM)\developer\setup.exe /t keyman-developer + $(SYMSTORE) $(ROOT)\src\developer\setup\setup.dbg /t keyman-developer + backup: $(WZZIP) $(BUILD)\developer\devsetup.zip $(BACKUPDEFAULTS) setup.exe diff --git a/windows/src/engine/inst/insthelper/Makefile b/windows/src/engine/inst/insthelper/Makefile index 2661777465..59443cab32 100644 --- a/windows/src/engine/inst/insthelper/Makefile +++ b/windows/src/engine/inst/insthelper/Makefile @@ -19,6 +19,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine Install Helper" $(PROGRAM)\inst\insthelper.dll +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\inst\insthelper.dll /t keyman-windows + $(SYMSTORE) $(DEBUGPATH)\inst\insthelper.dbg /t keyman-windows + backup: $(WZZIP) $(BUILD)\inst\insthelper.zip $(BACKUPDEFAULTS) insthelper.dll diff --git a/windows/src/engine/keyman/Makefile b/windows/src/engine/keyman/Makefile index f28ab0fb46..0c0b3c8f90 100644 --- a/windows/src/engine/keyman/Makefile +++ b/windows/src/engine/keyman/Makefile @@ -17,6 +17,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine" $(PROGRAM)\engine\keyman.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\keyman.dll /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\keyman.dbg /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\keyman.zip $(BACKUPDEFAULTS) keyman.exe diff --git a/windows/src/engine/keyman32/Makefile b/windows/src/engine/keyman32/Makefile index b7ecb8b996..b57852a6cb 100644 --- a/windows/src/engine/keyman32/Makefile +++ b/windows/src/engine/keyman32/Makefile @@ -21,6 +21,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine" $(PROGRAM)\engine\keyman32.dll +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\keyman32.dll /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\keyman32.pdb /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\keyman32.zip $(BACKUPDEFAULTS) keyman32.dll diff --git a/windows/src/engine/keyman64/Makefile b/windows/src/engine/keyman64/Makefile index 5597da5dbf..2547cf2d48 100644 --- a/windows/src/engine/keyman64/Makefile +++ b/windows/src/engine/keyman64/Makefile @@ -21,6 +21,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine x64" $(PROGRAM)\engine\keyman64.dll +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\keyman64.dll /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\keyman64.pdb /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\keyman64.zip $(BACKUPDEFAULTS) keyman64.dll diff --git a/windows/src/engine/keymanmc/Makefile b/windows/src/engine/keymanmc/Makefile index 558b80a018..57b35df8ce 100644 --- a/windows/src/engine/keymanmc/Makefile +++ b/windows/src/engine/keymanmc/Makefile @@ -4,7 +4,7 @@ !include ..\..\Defines.mak -build: +build: mc -U keymanmc.mc rc keymanmc.rc link -dll -noentry keymanmc.res @@ -20,6 +20,9 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine" $(PROGRAM)\engine\keymanmc.dll +wrap-symbols: + rem no symbols + backup: $(WZZIP) $(BUILD)\engine\keymanmc.zip $(BACKUPDEFAULTS) keymanmc.dll diff --git a/windows/src/engine/keymanx64/Makefile b/windows/src/engine/keymanx64/Makefile index a322efee73..ca108c1a9f 100644 --- a/windows/src/engine/keymanx64/Makefile +++ b/windows/src/engine/keymanx64/Makefile @@ -22,6 +22,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine x64" $(PROGRAM)\engine\keymanx64.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\keymanx64.exe /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\keymanx64.pdb /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\keymanx64.exe $(BACKUPDEFAULTS) keymanx64.exe diff --git a/windows/src/engine/kmcomapi/Makefile b/windows/src/engine/kmcomapi/Makefile index c64a73b561..d39b830626 100644 --- a/windows/src/engine/kmcomapi/Makefile +++ b/windows/src/engine/kmcomapi/Makefile @@ -44,6 +44,12 @@ install: $(COPY) $(PROGRAM)\engine\kmcomapi.x64.dll "$(INSTALLPATH_KEYMANENGINE)" cmd /c regsvr32 /s "$(INSTALLPATH_KEYMANENGINE)\kmcomapi.x64.dll" +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\kmcomapi.dll /t keyman-engine-windows + $(SYMSTORE) $(PROGRAM)\engine\kmcomapi.x64.dll /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\kmcomapi.dbg /t keyman-engine-windows + #TODO: $(SYMSTORE) $(PROGRAM)\engine\kmcomapi.x64.dbg /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\kmcomapi.zip $(BACKUPDEFAULTS) $(WIN32_TARGET_PATH)\kmcomapi.dll $(WIN64_TARGET_PATH)\kmcomapi.x64.dll $(WIN32_TARGET_PATH)\kmcomapi.dbg diff --git a/windows/src/engine/kmtip/Makefile b/windows/src/engine/kmtip/Makefile index 001e074dfc..e4795a185e 100644 --- a/windows/src/engine/kmtip/Makefile +++ b/windows/src/engine/kmtip/Makefile @@ -20,6 +20,12 @@ signcode: $(SIGNCODE) /d "Keyman Engine Text Service" $(PROGRAM)\engine\kmtip.dll $(SIGNCODE) /d "Keyman Engine Text Service" $(PROGRAM)\engine\kmtip64.dll +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\kmtip.dll /t keyman-engine-windows + $(SYMSTORE) $(PROGRAM)\engine\kmtip64.dll /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\kmtip.pdb /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\kmtip64.pdb /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\kmtip.zip x86\kmtip.pdb $(BACKUPDEFAULTS) x86\kmtip.dll $(WZZIP) $(BUILD)\engine\kmtip64.zip x64\kmtip64.pdb $(BACKUPDEFAULTS) x64\kmtip64.dll diff --git a/windows/src/engine/mcompile/Makefile b/windows/src/engine/mcompile/Makefile index 07aa392e3b..979b775ce4 100644 --- a/windows/src/engine/mcompile/Makefile +++ b/windows/src/engine/mcompile/Makefile @@ -18,6 +18,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine Mnemonic Keyboard Recompiler" $(PROGRAM)\engine\mcompile.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\mcompile.exe /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\mcompile.pdb /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\mcompile.exe $(BACKUPDEFAULTS) mcompile.exe diff --git a/windows/src/engine/tsysinfo/Makefile b/windows/src/engine/tsysinfo/Makefile index 19812f1d4d..7ebb2c3e87 100644 --- a/windows/src/engine/tsysinfo/Makefile +++ b/windows/src/engine/tsysinfo/Makefile @@ -28,6 +28,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine Diagnostics" $(PROGRAM)\engine\tsysinfo.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\tsysinfo.exe /t keyman-engine-windows + $(SYMSTORE) $(DEBUGPATH)\engine\tsysinfo.dbg /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\tsysinfo.zip $(BACKUPDEFAULTS) tsysinfo.exe diff --git a/windows/src/engine/tsysinfox64/Makefile b/windows/src/engine/tsysinfox64/Makefile index f8fc150f36..9ec8e58049 100644 --- a/windows/src/engine/tsysinfox64/Makefile +++ b/windows/src/engine/tsysinfox64/Makefile @@ -14,6 +14,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine x64 Diagnostics" $(PROGRAM)\engine\tsysinfox64.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\engine\tsysinfox64.exe /t keyman-engine-windows + #$(SYMSTORE) $(DEBUGPATH)\engine\tsysinfox64.dbg /t keyman-engine-windows + backup: $(WZZIP) $(BUILD)\engine\tsysinfox64.zip $(BACKUPDEFAULTS) $(WIN64_TARGET_PATH)\*.map $(WIN64_TARGET_PATH)\tsysinfox64.exe diff --git a/windows/src/support/charident/Makefile b/windows/src/support/charident/Makefile index 0ef7e9f662..d3c91a1ca6 100644 --- a/windows/src/support/charident/Makefile +++ b/windows/src/support/charident/Makefile @@ -13,7 +13,11 @@ clean: def-clean signcode: $(SIGNCODE) /d "Character Identifier" $(PROGRAM)\support\charident.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\support\charident.exe /t keyman-windows + #TODO: $(SYMSTORE) $(DEBUGPATH)\support\charident.dbg /t keyman-windows + backup: - $(WZZIP) $(BUILD)\online\charident.zip $(BACKUPDEFAULTS) charident.exe + $(WZZIP) $(BUILD)\support\charident.zip $(BACKUPDEFAULTS) charident.exe !include ..\..\Target.mak diff --git a/windows/src/support/etl2log/Makefile b/windows/src/support/etl2log/Makefile index 0e8b041af4..6c5c9591bc 100644 --- a/windows/src/support/etl2log/Makefile +++ b/windows/src/support/etl2log/Makefile @@ -15,6 +15,10 @@ clean: def-clean signcode: $(SIGNCODE) /d "Keyman Engine Tools" $(PROGRAM)\support\etl2log.exe +wrap-symbols: + $(SYMSTORE) $(PROGRAM)\support\etl2log.exe /t keyman-windows + $(SYMSTORE) $(DEBUGPATH)\support\etl2log.pdb /t keyman-windows + backup: $(WZZIP) $(BUILD)\support\etl2log.zip $(BACKUPDEFAULTS) etl2log.exe diff --git a/windows/src/support/km_yim/Makefile b/windows/src/support/km_yim/Makefile index 5b883d8d01..661c17e12a 100644 --- a/windows/src/support/km_yim/Makefile +++ b/windows/src/support/km_yim/Makefile @@ -1,5 +1,5 @@ # -# KMShell Makefile +# TODO: remove this project # !include ..\..\Defines.mak @@ -7,7 +7,7 @@ build: # version.res $(DCC32) km_yim.dpr rem $(TDSPACK) $(PROGRAM)\desktop\km_yim.exe km_yim.tds - rem $(TDS2DBG) $(PROGRAM)\desktop\km_yim.exe + rem $(TDS2DBG) $(PROGRAM)\desktop\km_yim.exe $(WZZIP) inst_km_yim.zip km_yim.exe # $(WZSE) inst_km_yim -setup -t inst_km_yim.dialog.txt -st "Tavultesoft Keyman Desktop Yahoo Messenger Addin" -c km_yim.exe @@ -17,6 +17,8 @@ clean: def-clean signcode: $(SIGNCODE) /d "Tavultesoft Keyman Desktop Yahoo Messenger Addin" inst_km_yim.exe +wrap-symbols: + rem backup: $(WZZIP) $(BUILD)\desktop\km_yim.zip $(BACKUPDEFAULTS) km_yim.exe diff --git a/windows/src/support/kmkb0045/Makefile b/windows/src/support/kmkb0045/Makefile index e82b8185fd..b521bfd026 100644 --- a/windows/src/support/kmkb0045/Makefile +++ b/windows/src/support/kmkb0045/Makefile @@ -1,13 +1,13 @@ # -# KMKB0045 Makefile +# TODO: remove this project # !include ..\..\Defines.mak build: version.res manifest.res $(DCC32) kmkb0045.dpr - $(TDS2DBG) kmkb0045.exe $(SENTRYTOOL_DELPHIPREP) kmkb0045.exe -dpr kmkb0045.dpr + $(TDS2DBG) kmkb0045.exe $(COPY) kmkb0045.exe $(PROGRAM)\support clean: def-clean