changeset:   104431:e050ed5da06d
branch:      3.6
parent:      104428:004d1809db41
user:        Steve Dower <steve.dower@microsoft.com>
date:        Sun Oct 09 20:18:52 2016 -0700
files:       Misc/NEWS PCbuild/pyproject.props Tools/msi/common.wxs Tools/msi/lib/lib.wixproj Tools/msi/lib/lib.wxs Tools/msi/lib/lib_files.wxs Tools/msi/msi.props Tools/msi/msi.targets Tools/msi/tools/tools.wixproj Tools/msi/tools/tools.wxs Tools/msi/tools/tools_files.wxs
description:
Issue #28402: Adds signed catalog files for stdlib on Windows.


diff -r 004d1809db41 -r e050ed5da06d Misc/NEWS
--- a/Misc/NEWS	Mon Oct 10 00:38:21 2016 +0000
+++ b/Misc/NEWS	Sun Oct 09 20:18:52 2016 -0700
@@ -226,6 +226,8 @@
 Windows
 -------
 
+- Issue #28402: Adds signed catalog files for stdlib on Windows.
+
 - Issue #28333: Enables Unicode for ps1/ps2 and input() prompts. (Patch by
   Eryk Sun)
 
diff -r 004d1809db41 -r e050ed5da06d PCbuild/pyproject.props
--- a/PCbuild/pyproject.props	Mon Oct 10 00:38:21 2016 +0000
+++ b/PCbuild/pyproject.props	Sun Oct 09 20:18:52 2016 -0700
@@ -147,11 +147,13 @@
              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)">
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/common.wxs
--- a/Tools/msi/common.wxs	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/common.wxs	Sun Oct 09 20:18:52 2016 -0700
@@ -63,7 +63,9 @@
     <!-- Top-level directories -->
     <Fragment>
         <DirectoryRef Id="InstallDirectory">
-            <Directory Id="DLLs" Name="DLLs" />
+            <Directory Id="DLLs" Name="DLLs">
+                <Directory Id="Catalogs" />
+            </Directory>
         </DirectoryRef>
     </Fragment>
 
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/lib/lib.wixproj
--- a/Tools/msi/lib/lib.wixproj	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/lib/lib.wixproj	Sun Oct 09 20:18:52 2016 -0700
@@ -27,6 +27,7 @@
             <TargetBase>$(PySourcePath)Lib</TargetBase>
             <Target_>Lib\</Target_>
             <Group>lib_py</Group>
+            <IncludeInCat>true</IncludeInCat>
         </InstallFiles>
     </ItemGroup>
     
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/lib/lib.wxs
--- a/Tools/msi/lib/lib.wxs	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/lib/lib.wxs	Sun Oct 09 20:18:52 2016 -0700
@@ -11,6 +11,7 @@
             <ComponentGroupRef Id="lib_py" />
             <ComponentGroupRef Id="lib_files" />
             <ComponentGroupRef Id="lib_extensions" />
+            <ComponentGroupRef Id="lib_cat" />
             <ComponentRef Id="OptionalFeature" />
         </Feature>
     </Product>
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/lib/lib_files.wxs
--- a/Tools/msi/lib/lib_files.wxs	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/lib/lib_files.wxs	Sun Oct 09 20:18:52 2016 -0700
@@ -70,4 +70,11 @@
             </Component>
         </ComponentGroup>
     </Fragment>
+    <Fragment>
+        <ComponentGroup Id="lib_cat">
+            <Component Id="lib_cat" Directory="Catalogs" Guid="*">
+                <File Name="python_lib.cat" KeyPath="yes" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
 </Wix>
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/msi.props
--- a/Tools/msi/msi.props	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/msi.props	Sun Oct 09 20:18:52 2016 -0700
@@ -11,6 +11,7 @@
         <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
         <Platform Condition="'$(Platform)' == ''">x86</Platform>
         <InstallScope Condition="'$(InstallScope)' != 'perMachine'">perUser</InstallScope>
+        <_MakeCatCommand Condition="'$(_MakeCatCommand)' == ''">makecat</_MakeCatCommand>
     </PropertyGroup>
 
     <Import Project="wix.props" />
@@ -103,6 +104,7 @@
             <Group>generated_filelist</Group>
             <Condition></Condition>
             <DiskId></DiskId>
+            <IncludeInCat>false</IncludeInCat>
         </InstallFiles>
         <LinkerBindInputPaths>
             <Visible>false</Visible>
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/msi.targets
--- a/Tools/msi/msi.targets	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/msi.targets	Sun Oct 09 20:18:52 2016 -0700
@@ -12,8 +12,10 @@
                 <_Source>%(Source)$([msbuild]::MakeRelative(%(SourceBase), %(FullPath)))</_Source>
                 <_Target>%(Target_)$([msbuild]::MakeRelative(%(TargetBase), %(FullPath)))</_Target>
             </InstallFiles>
+            
+            <_CatalogFiles Include="@(InstallFiles)" Condition="%(InstallFiles.IncludeInCat) and ''!=$([System.IO.File]::ReadAllText(%(InstallFiles.FullPath)))" />
         </ItemGroup>
-        
+
         <WriteLinesToFile File="$(_FileListTarget)" Lines="@(InstallFiles->'&quot;%(_Source)&quot;,&quot;%(_Target)&quot;,&quot;%(Group)&quot;,&quot;%(DiskId)&quot;,&quot;%(Condition)&quot;')" Overwrite="true" />
         <Exec Command='"$(PythonExe)" csv_to_wxs.py "$(_FileListTarget)" "$(_InstallFilesTarget)"'
               WorkingDirectory="$(MSBuildThisFileDirectory)" />
@@ -24,6 +26,35 @@
         </ItemGroup>
     </Target>
 
+    <Target Name="GenerateCatalog" AfterTargets="ProcessInstallFiles" Condition="'@(_CatalogFiles)' != ''">
+        <PropertyGroup>
+            <_CatFileSourceTarget>$(IntermediateOutputPath)$(MSBuildProjectName).cdf</_CatFileSourceTarget>
+            <_CatFileTarget>$(IntermediateOutputPath)python_$(MSBuildProjectName).cat</_CatFileTarget>
+            <_CatFile>[CatalogHeader]
+Name=$([System.IO.Path]::GetFileName($(_CatFileTarget)))
+ResultDir=$([System.IO.Path]::GetDirectoryName($(_CatFileTarget)))
+PublicVersion=1
+CatalogVersion=2
+HashAlgorithms=SHA256
+PageHashes=false
+EncodingType=
+
+[CatalogFiles]
+@(_CatalogFiles->'&lt;HASH&gt;%(Filename)%(Extension)=%(FullPath)','
+')
+</_CatFile>
+        </PropertyGroup>
+
+        <WriteLinesToFile File="$(_CatFileSourceTarget)" Lines="$(_CatFile)" Overwrite="true" />
+        <Exec Command='$(_MakeCatCommand) "$(_CatFileSourceTarget)"' WorkingDirectory="$(MSBuildThisFileDirectory)" />
+        <Exec Command='$(_SignCommand) "$(_CatFileTarget)"' WorkingDirectory="$(MSBuildThisFileDirectory)"
+              Condition="Exists($(_CatFileTarget)) and '$(_SignCommand)' != ''" />
+
+        <ItemGroup>
+            <FileWrites Include="$(_CatFileSourceTarget);$(_CatFileTarget)" />
+        </ItemGroup>
+    </Target>
+
     <Target Name="_TransformWxlTemplates" AfterTargets="PrepareForBuild" Inputs="@(WxlTemplate);$(PySourcePath)include\patchlevel.h" Outputs="$(IntermediateOutputPath)%(Filename).wxl">
         <PropertyGroup Condition="'@(WxlTemplate)' != ''">
             <_Content>$([System.IO.File]::ReadAllText(%(WxlTemplate.FullPath)).Replace(`{{ShortVersion}}`, `$(MajorVersionNumber).$(MinorVersionNumber)$(PyTestExt)`).Replace(`{{LongVersion}}`, `$(PythonVersion)$(PyTestExt)`).Replace(`{{Bitness}}`, `$(Bitness)`))</_Content>
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/tools/tools.wixproj
--- a/Tools/msi/tools/tools.wixproj	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/tools/tools.wixproj	Sun Oct 09 20:18:52 2016 -0700
@@ -36,6 +36,7 @@
                 <TargetBase>$(PySourcePath)</TargetBase>
                 <Target_></Target_>
                 <Group>tools_py</Group>
+                <IncludeInCat>true</IncludeInCat>
         </InstallFiles>
     </ItemGroup>
     
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/tools/tools.wxs
--- a/Tools/msi/tools/tools.wxs	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/tools/tools.wxs	Sun Oct 09 20:18:52 2016 -0700
@@ -9,6 +9,7 @@
         <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
             <ComponentGroupRef Id="tools_py" />
             <ComponentGroupRef Id="tools_scripts" />
+            <ComponentGroupRef Id="tools_cat" />
             <ComponentRef Id="OptionalFeature" />
         </Feature>
     </Product>
diff -r 004d1809db41 -r e050ed5da06d Tools/msi/tools/tools_files.wxs
--- a/Tools/msi/tools/tools_files.wxs	Mon Oct 10 00:38:21 2016 +0000
+++ b/Tools/msi/tools/tools_files.wxs	Sun Oct 09 20:18:52 2016 -0700
@@ -13,4 +13,11 @@
             </Component>
         </ComponentGroup>
     </Fragment>
+    <Fragment>
+        <ComponentGroup Id="tools_cat">
+            <Component Id="tools_cat" Directory="Catalogs" Guid="*">
+                <File Name="python_tools.cat" KeyPath="yes" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
 </Wix>