diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-05 11:25:32 +0000 |
---|---|---|
committer | Simon Rozman <simon@rozman.si> | 2019-08-05 14:08:06 +0200 |
commit | 03f356c49215a8366e0aa9b472e7c751d640374f (patch) | |
tree | 68062b558f7fa3c90378f92631bb19a66dc46d36 | |
parent | Unify XML empty-element spacing (diff) | |
download | wintun-03f356c49215a8366e0aa9b472e7c751d640374f.tar.xz wintun-03f356c49215a8366e0aa9b472e7c751d640374f.zip |
Dynamically gather signtool full path
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r-- | installer/installer.vcxproj | 2 | ||||
-rw-r--r-- | installer/installer.wixproj | 2 | ||||
-rw-r--r-- | wintun.props | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj index 306f05f..29a5cf1 100644 --- a/installer/installer.vcxproj +++ b/installer/installer.vcxproj @@ -185,7 +185,7 @@ <CleanDependsOn>CleanSignTarget;$(CleanDependsOn)</CleanDependsOn> </PropertyGroup> <Target Name="SignTarget" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign"> - <Exec Command="signtool.exe sign /sha1 "$(SigningCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"" /> + <Exec Command=""$(SignToolPath)" sign /sha1 "$(SigningCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"" /> <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" /> </Target> <Target Name="CleanSignTarget"> diff --git a/installer/installer.wixproj b/installer/installer.wixproj index 90c7964..fd1d8c3 100644 --- a/installer/installer.wixproj +++ b/installer/installer.wixproj @@ -67,7 +67,7 @@ Name="SignTarget" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign"> - <Exec Command="signtool.exe sign /sha1 "$(SigningCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"" /> + <Exec Command=""$(SignToolPath)" sign /sha1 "$(SigningCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"" /> <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" /> </Target> <Target Name="CleanSignTarget"> diff --git a/wintun.props b/wintun.props index 2744bae..b09cde7 100644 --- a/wintun.props +++ b/wintun.props @@ -41,4 +41,9 @@ <Optimization>Disabled</Optimization> </ClCompile> </ItemDefinitionGroup> + <PropertyGroup> + <WindowsSdkToolchainPlatform>$(PROCESSOR_ARCHITECTURE)</WindowsSdkToolchainPlatform> + <WindowsSdkToolchainPlatform Condition="'$(PROCESSOR_ARCHITECTURE)'=='AMD64'">x64</WindowsSdkToolchainPlatform> + <SignToolPath>$(WindowsSdkDir)bin\$(TargetPlatformVersion)\$(WindowsSdkToolchainPlatform)\signtool.exe</SignToolPath> + </PropertyGroup> </Project> |