Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-05 01:01:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #303 from MarcusLlewellyn/feature/reenable-signing

Browse source 
Re-enable and update code signing in the NSIS template.
This commit is contained in:
kasenvr 2020-08-24 23:12:33 -04:00 committed by GitHub
commit 3d8128cc08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -120,7 +120,7 @@ else()
endif() endif()
# Use default time server if none defined in environment # Use default time server if none defined in environment
set_from_env(TIMESERVER_URL TIMESERVER_URL "http://sha256timestamp.ws.symantec.com/sha256/timestamp") set_from_env(TIMESERVER_URL TIMESERVER_URL "http://timestamp.comodoca.com?td=sha256")
set(HIFI_USE_OPTIMIZED_IK_OPTION OFF) set(HIFI_USE_OPTIMIZED_IK_OPTION OFF)
set(BUILD_CLIENT_OPTION ON) set(BUILD_CLIENT_OPTION ON)

17
cmake/templates/NSIS.template.in
View file

@ -199,18 +199,15 @@
!system "$%TEMP%\tempinstaller.exe" = 2 !system "$%TEMP%\tempinstaller.exe" = 2
; NOTE: We're not code signing right now, so we're going to disable that.
; TODO: Get a code signing certificate so we can re-enable code signing.
; The Inner invocation has written an uninstaller binary for us. ; The Inner invocation has written an uninstaller binary for us.
; We need to sign it if it's a production or PR build. ; We need to sign it if it's a production or PR build.
; !if @PRODUCTION_BUILD@ == 1 !if @PRODUCTION_BUILD@ == 1
; !if @BYPASS_SIGNING@ == 1 !if @BYPASS_SIGNING@ == 1
; !warning "BYPASS_SIGNING set - installer will not be signed" !warning "BYPASS_SIGNING set - installer will not be signed"
; !else !else
; !system '"@SIGNTOOL_EXECUTABLE@" sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 $%TEMP%\@UNINSTALLER_NAME@' = 0 !system '"@SIGNTOOL_EXECUTABLE@" sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://timestamp.comodoca.com?td=sha256 /td SHA256 $%TEMP%\@UNINSTALLER_NAME@' = 0
; !endif !endif
; !endif !endif
; Good. Now we can carry on writing the real installer. ; Good. Now we can carry on writing the real installer.