From 4dfacd516eb30b14765d2e8c6d276d4839990042 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 27 Jul 2017 14:03:33 +0700 Subject: [PATCH] Cleanup certificate code signing for Windows --- windows/src/Defines.mak | 2 +- windows/src/desktop/setup/Makefile | 2 +- windows/src/developer/setup/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/src/Defines.mak b/windows/src/Defines.mak index 698a14d880..f1c4a5040a 100644 --- a/windows/src/Defines.mak +++ b/windows/src/Defines.mak @@ -199,7 +199,7 @@ SC_PFX_SHA1="$(ROOT)\src\buildtools\certificates\keymantest-sha1.pfx" SC_PWD="" SIGNTOOL="C:\Program Files (x86)\Windows Kits\8.0\bin\x86\signtool.exe" -SIGNCODE=$(ROOT)\src\buildtools\signtime.bat $(SIGNTOOL) $(SC_PFX_SHA1) $(SC_PFX_SHA256) $(SC_URL) $(SC_PWD) +SIGNCODE=@$(ROOT)\src\buildtools\signtime.bat $(SIGNTOOL) $(SC_PFX_SHA1) $(SC_PFX_SHA256) $(SC_URL) $(SC_PWD) !ifdef USERDEFINES !include $(ROOT)\src\UserDefines.mak diff --git a/windows/src/desktop/setup/Makefile b/windows/src/desktop/setup/Makefile index 3022b45474..c9dd2c79b2 100644 --- a/windows/src/desktop/setup/Makefile +++ b/windows/src/desktop/setup/Makefile @@ -20,7 +20,7 @@ clean: def-clean rem if exist icons\icons.res del icons\icons.res signcode: - rem $(SIGNCODE) /d "Keyman Desktop Setup" $(PROGRAM)\desktop\setup.exe + rem SIGNCODE /d "Keyman Desktop Setup" $(PROGRAM)\desktop\setup.exe backup: $(WZZIP) $(BUILD)\desktop\setup.zip $(BACKUPDEFAULTS) setup.exe diff --git a/windows/src/developer/setup/Makefile b/windows/src/developer/setup/Makefile index b5e4ae53c1..30a159bbd0 100644 --- a/windows/src/developer/setup/Makefile +++ b/windows/src/developer/setup/Makefile @@ -23,7 +23,7 @@ clean: def-clean rem if exist icons\icons.res del icons\icons.res signcode: - rem $(SIGNCODE) /d "Keyman Developer Setup" $(PROGRAM)\developer\setup.exe + rem SIGNCODE /d "Keyman Developer Setup" $(PROGRAM)\developer\setup.exe backup: $(WZZIP) $(BUILD)\developer\devsetup.zip $(BACKUPDEFAULTS) setup.exe