diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-10-10 03:19:21 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-10-10 03:19:21 (GMT) |
| commit | 15d3d8bd145c905b14ba97514f9ff6c08137fe34 (patch) | |
| tree | 8b42aa7cc8db6a11ea551ad4ca55e9c37ab35dde /PCbuild | |
| parent | dd21cc35168d30776c592b18b90809945738d3f6 (diff) | |
| parent | 425ec150ea52a5c164d0770df251381159bb54bb (diff) | |
| download | cpython-15d3d8bd145c905b14ba97514f9ff6c08137fe34.zip cpython-15d3d8bd145c905b14ba97514f9ff6c08137fe34.tar.gz cpython-15d3d8bd145c905b14ba97514f9ff6c08137fe34.tar.bz2 | |
Issue #28402: Adds signed catalog files for stdlib on Windows.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.props | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 543b4ca..7012170 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -147,11 +147,13 @@ foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses Targets="CleanAll" /> </Target> - <PropertyGroup Condition="'$(SigningCertificate)' != '' and $(SupportSigning)"> - <SignToolPath Condition="'$(SignToolPath)' == '' or !Exists($(SignToolPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86\signtool.exe</SignToolPath> - <SignToolPath Condition="!Exists($(SignToolPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86\signtool.exe</SignToolPath> - <SignToolPath Condition="!Exists($(SignToolPath))">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\signtool.exe</SignToolPath> - <_SignCommand Condition="Exists($(SignToolPath))">"$(SignToolPath)" sign /q /n "$(SigningCertificate)" /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d "Python $(PythonVersion)"</_SignCommand> + <PropertyGroup> + <SdkBinPath Condition="'$(SdkBinPath)' == '' or !Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\x86</SdkBinPath> + <SdkBinPath Condition="!Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86</SdkBinPath> + <SdkBinPath Condition="!Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86</SdkBinPath> + <SdkBinPath Condition="!Exists($(SdkBinPath))">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\</SdkBinPath> + <_SignCommand Condition="Exists($(SdkBinPath)) and '$(SigningCertificate)' != '' and $(SupportSigning)">"$(SdkBinPath)\signtool.exe" sign /q /n "$(SigningCertificate)" /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d "Python $(PythonVersion)"</_SignCommand> + <_MakeCatCommand Condition="Exists($(SdkBinPath))">"$(SdkBinPath)\makecat.exe"</_MakeCatCommand> </PropertyGroup> <Target Name="_SignBuild" AfterTargets="AfterBuild" Condition="'$(SigningCertificate)' != '' and $(SupportSigning)"> |