This commit is contained in:
Simon Rozman 2015-05-04 07:19:22 +00:00
parent 01871e13ba
commit 2d7f06c6ab

View File

@ -34,7 +34,7 @@
!ENDIF !ENDIF
!IFDEF MSIBUILD_CAB !IFDEF MSIBUILD_CAB
MSIBUILD_SETCAB_SWITCH=/V MSIBUILD_SETCAB_SWITCH=/E
!ELSE !ELSE
MSIBUILD_SETCAB_SWITCH= MSIBUILD_SETCAB_SWITCH=
!ENDIF !ENDIF
@ -62,7 +62,7 @@ All : \
cscript.exe "$(MSIBUILD_ROOT)\MSI.wsf" //Job:SetCAB //Nologo "$(@:"=).tmp" "$(MSIBUILD_INF)" $(MSIBUILD_SETCAB_SWITCH) cscript.exe "$(MSIBUILD_ROOT)\MSI.wsf" //Job:SetCAB //Nologo "$(@:"=).tmp" "$(MSIBUILD_INF)" $(MSIBUILD_SETCAB_SWITCH)
msiinfo.exe "$(@:"=).tmp" /nologo /U 4 msiinfo.exe "$(@:"=).tmp" /nologo /U 4
!IFDEF MANIFESTCERTIFICATETHUMBPRINT !IFDEF MANIFESTCERTIFICATETHUMBPRINT
signtool.exe /sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" /t "$(MANIFESTTIMESTAMPURL)" /d "$(MSIBUILD_PRODUCT_NAME)" /du "$(MSIBUILD_VENDOR_URL)" /q "$(@:"=).tmp" signtool.exe sign /sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" /t "$(MANIFESTTIMESTAMPURL)" /d "$(MSIBUILD_PRODUCT_NAME)" /du "$(MSIBUILD_VENDOR_URL)" /q "$(@:"=).tmp"
!ENDIF !ENDIF
attrib.exe +r "$(@:"=).tmp" attrib.exe +r "$(@:"=).tmp"
move /y "$(@:"=).tmp" $@ > NUL move /y "$(@:"=).tmp" $@ > NUL