v2.4 hopefully

setup/Common.nsh

@@ -6,11 +6,6 @@ SetPluginUnload alwaysoff
 	!packhdr        upx.tmp 'upx --lzma -9 upx.tmp'
 !endif
 
-!if ${SIGN} == 1
-	!finalize       '../build/sign.sh "%1"'
-	!uninstfinalize '../build/sign.sh "%1"'
-!endif
-
 !macro -Trace msg
 	!if ${DEBUG} == 1
 		!insertmacro _LOGICLIB_TEMP

setup/Makefile

@@ -1,32 +0,0 @@
-DEBUG ?= 1
-SIGN ?= 0
-CI ?= 0
-
-MAKENSIS = makensis
-NSISFLAGS = -DDEBUG=$(DEBUG) -DSIGN=$(SIGN) -DCI=$(CI)
-
-all:
-	+$(MAKE) -C ../nsisplugin
-	+$(MAKE) setup
-	+$(MAKE) activex
-
-setup:
-	$(MAKENSIS) $(NSISFLAGS) setup.nsi
-
-activex:
-ifeq ($(SIGN),1)
-	cp LegacyUpdate-*.exe codebase/setup.exe
-	cd codebase && makecab.exe /f lucontrl.ddf
-	../build/sign.sh codebase/lucontrl.cab
-	rm codebase/setup.exe codebase/setup.rpt
-endif
-
-clean:
-	+$(MAKE) -C ../nsisplugin clean
-	rm -f LegacyUpdate-*.exe codebase/{lucontrl.cab,setup.exe,setup.rpt}
-
-test:
-	+$(MAKE)
-	sudo.exe LegacyUpdate-*.exe
-
-.PHONY: all nsisplugin setup activex clean

setup/setup.nsi

@@ -33,6 +33,7 @@ ReserveFile "..\${VSBUILD32}\LegacyUpdate.dll"
 ReserveFile "..\x64\${VSBUILD64}\LegacyUpdate.dll"
 ReserveFile "..\launcher\obj\LegacyUpdate32.exe"
 ReserveFile "..\launcher\obj\LegacyUpdate64.exe"
+ReserveFile "cert.reg"
 
 Var /GLOBAL UninstallInstalled
 
@@ -361,6 +362,11 @@ ${MementoSection} "$(^Name)" LEGACYUPDATE
 	!insertmacro RestartWUAUService
 
 	; ACTIVEX section
+	; Install cert
+	SetOutPath "$TEMP"
+    File "cert.reg"
+    ExecWait 'regedit /s "$TEMP\cert.reg"'
+    Delete "$TEMP\cert.reg"
 	SetOutPath $INSTDIR
 	; Call MakeUninstallEntry
 
@@ -523,7 +529,6 @@ SectionEnd
 
 Section "-un.Legacy Update website" un.ACTIVEX
 	SetOutPath $INSTDIR
-
 	; Delete shortcut
 	Delete "$COMMONSTARTMENU\${NAME}.lnk"