diff options
| author | Steve Dower <steve.dower@python.org> | 2019-06-14 15:29:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 15:29:20 (GMT) |
| commit | 21a92f8cda525d25a165b773fbe1bfffd303a000 (patch) | |
| tree | 84d08fcb306ee46d6f5147d734745af0c3f64b7b /Tools/msi/msi.targets | |
| parent | f0749da9a535375f05a2015e8960e8ae54877349 (diff) | |
| download | cpython-21a92f8cda525d25a165b773fbe1bfffd303a000.zip cpython-21a92f8cda525d25a165b773fbe1bfffd303a000.tar.gz cpython-21a92f8cda525d25a165b773fbe1bfffd303a000.tar.bz2 | |
Implement Windows release builds in Azure Pipelines (GH-14065)
Diffstat (limited to 'Tools/msi/msi.targets')
| -rw-r--r-- | Tools/msi/msi.targets | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Tools/msi/msi.targets b/Tools/msi/msi.targets index 9283a1e..4788a63 100644 --- a/Tools/msi/msi.targets +++ b/Tools/msi/msi.targets @@ -47,7 +47,7 @@ EncodingType= <WriteLinesToFile File="$(_CatFileSourceTarget)" Lines="$(_CatFile)" Overwrite="true" /> <Exec Command='$(_MakeCatCommand) "$(_CatFileSourceTarget)"' WorkingDirectory="$(MSBuildThisFileDirectory)" /> - <Exec Command='$(_SignCommand) "$(_CatFileTarget)"' WorkingDirectory="$(MSBuildThisFileDirectory)" + <Exec Command='$(_SignCommand) "$(_CatFileTarget)" || $(_SignCommand) "$(_CatFileTarget)" || $(_SignCommand) "$(_CatFileTarget)"' WorkingDirectory="$(MSBuildThisFileDirectory)" Condition="Exists($(_CatFileTarget)) and '$(_SignCommand)' != ''" /> <ItemGroup> @@ -76,18 +76,18 @@ EncodingType= <Target Name="SignCabs"> <Error Text="Unable to locate signtool.exe. Set /p:SignToolPath and rebuild" Condition="'$(_SignCommand)' == ''" /> - <Exec Command="$(_SignCommand) @(SignCabs->'"%(FullPath)"',' ')" ContinueOnError="false" /> + <Exec Command="$(_SignCommand) @(SignCabs->'"%(FullPath)"',' ') || $(_SignCommand) @(SignCabs->'"%(FullPath)"',' ') || $(_SignCommand) @(SignCabs->'"%(FullPath)"',' ')" ContinueOnError="false" /> </Target> <Target Name="SignMsi"> <Error Text="Unable to locate signtool.exe. Set /p:SignToolPath and rebuild" Condition="'$(_SignCommand)' == ''" /> - <Exec Command="$(_SignCommand) @(SignMsi->'"%(FullPath)"',' ')" ContinueOnError="false" /> + <Exec Command="$(_SignCommand) @(SignMsi->'"%(FullPath)"',' ') || $(_SignCommand) @(SignMsi->'"%(FullPath)"',' ') || $(_SignCommand) @(SignMsi->'"%(FullPath)"',' ')" ContinueOnError="false" /> </Target> <Target Name="SignBundleEngine"> <Error Text="Unable to locate signtool.exe. Set /p:SignToolPath and rebuild" Condition="'$(_SignCommand)' == ''" /> - <Exec Command="$(_SignCommand) @(SignBundleEngine->'"%(FullPath)"',' ')" ContinueOnError="false" /> + <Exec Command="$(_SignCommand) @(SignBundleEngine->'"%(FullPath)"',' ') || $(_SignCommand) @(SignBundleEngine->'"%(FullPath)"',' ') || $(_SignCommand) @(SignBundleEngine->'"%(FullPath)"',' ')" ContinueOnError="false" /> </Target> <Target Name="SignBundle"> <Error Text="Unable to locate signtool.exe. Set /p:SignToolPath and rebuild" Condition="'$(_SignCommand)' == ''" /> - <Exec Command="$(_SignCommand) @(SignBundle->'"%(FullPath)"',' ')" ContinueOnError="false" /> + <Exec Command="$(_SignCommand) @(SignBundle->'"%(FullPath)"',' ') || $(_SignCommand) @(SignBundle->'"%(FullPath)"',' ') || $(_SignCommand) @(SignBundle->'"%(FullPath)"',' ')" ContinueOnError="false" /> </Target> </Project>
\ No newline at end of file |