diff options
Diffstat (limited to 'installer/installer.vcxproj')
| -rw-r--r-- | installer/installer.vcxproj | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj index d334ca6..b40bd90 100644 --- a/installer/installer.vcxproj +++ b/installer/installer.vcxproj @@ -190,15 +190,16 @@ </ImportGroup> <Import Project="..\wintun.vcxproj.user" Condition="exists('..\wintun.vcxproj.user')" /> <PropertyGroup> - <SigningCertificate Condition="$(SignMode)=='TestSign' And '$(TestCertificate)'!=''">$(TestCertificate)</SigningCertificate> - <SigningCertificate Condition="$(SignMode)=='ProductionSign' And '$(ProductionCertificate)'!=''">$(ProductionCertificate)</SigningCertificate> - <BuildDependsOn Condition="'$(SigningCertificate)'!='' And '$(TimeStampServer)'!=''">$(BuildDependsOn);SignTarget</BuildDependsOn> - <MSMDependsOn>$(MSMDependsOn);WixCompile;WixLink</MSMDependsOn> - <MSMDependsOn Condition="'$(SigningCertificate)'!='' And '$(TimeStampServer)'!=''">$(MSMDependsOn);WixSign</MSMDependsOn> + <BuildDependsOn>$(BuildDependsOn);TestSignTarget;ProductionSignTarget</BuildDependsOn> + <MSMDependsOn>$(MSMDependsOn);WixCompile;WixLink;WixTestSign;WixProductionSign</MSMDependsOn> <CleanDependsOn>CleanSignTarget;WixClean;$(CleanDependsOn)</CleanDependsOn> </PropertyGroup> - <Target Name="SignTarget" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign"> - <Exec Command=""$(SignToolPath)" sign /sha1 "$(SigningCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"" /> + <Target Name="TestSignTarget" Condition="$(SignMode)=='TestSign'" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign"> + <Exec Command=""$(SignToolPath)" sign /sha1 "$(TestCertificate)" /fd sha256 "$(TargetPath)"" /> + <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" /> + </Target> + <Target Name="ProductionSignTarget" Condition="$(SignMode)=='ProductionSign'" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign"> + <Exec Command=""$(SignToolPath)" sign /sha1 "$(ProductionCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"" /> <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" /> </Target> <Target Name="CleanSignTarget"> @@ -218,8 +219,12 @@ <Target Name="WixLink" DependsOnTargets="Build;WixCompile" Inputs="$(IntDir)installer.wixobj;$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(WixOutputPath)$(WixOutputName)$(WixOutputExt)"> <Exec Command=""$(WIX)bin\light.exe" $(WixLightFlags) -out "$(WixOutputPath)$(WixOutputName)$(WixOutputExt)" "$(IntDir)installer.wixobj"" /> </Target> - <Target Name="WixSign" DependsOnTargets="WixLink" Inputs="$(WixOutputPath)$(WixOutputName)$(WixOutputExt)" Outputs="$(IntDir)$(WixOutputName).sign"> - <Exec Command=""$(SignToolPath)" sign /sha1 "$(SigningCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(WixOutputPath)$(WixOutputName)$(WixOutputExt)"" /> + <Target Name="WixTestSign" Condition="$(SignMode)=='TestSign'" DependsOnTargets="WixLink" Inputs="$(WixOutputPath)$(WixOutputName)$(WixOutputExt)" Outputs="$(IntDir)$(WixOutputName).sign"> + <Exec Command=""$(SignToolPath)" sign /sha1 "$(TestCertificate)" /fd sha256 "$(WixOutputPath)$(WixOutputName)$(WixOutputExt)"" /> + <Touch Files="$(IntDir)$(WixOutputName).sign" AlwaysCreate="true" /> + </Target> + <Target Name="WixProductionSign" Condition="$(SignMode)=='ProductionSign'" DependsOnTargets="WixLink" Inputs="$(WixOutputPath)$(WixOutputName)$(WixOutputExt)" Outputs="$(IntDir)$(WixOutputName).sign"> + <Exec Command=""$(SignToolPath)" sign /sha1 "$(ProductionCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(WixOutputPath)$(WixOutputName)$(WixOutputExt)"" /> <Touch Files="$(IntDir)$(WixOutputName).sign" AlwaysCreate="true" /> </Target> <Target Name="WixClean"> |