summaryrefslogtreecommitdiffstats
path: root/Tools/msi/lib
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-10-10 03:18:52 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-10-10 03:18:52 (GMT)
commit425ec150ea52a5c164d0770df251381159bb54bb (patch)
tree98949edd89999228957911b793f367ff0a6dbe4f /Tools/msi/lib
parentb1321fba53123fde88278e074b1e16ed206a18ad (diff)
downloadcpython-425ec150ea52a5c164d0770df251381159bb54bb.zip
cpython-425ec150ea52a5c164d0770df251381159bb54bb.tar.gz
cpython-425ec150ea52a5c164d0770df251381159bb54bb.tar.bz2
Issue #28402: Adds signed catalog files for stdlib on Windows.
Diffstat (limited to 'Tools/msi/lib')
-rw-r--r--Tools/msi/lib/lib.wixproj1
-rw-r--r--Tools/msi/lib/lib.wxs1
-rw-r--r--Tools/msi/lib/lib_files.wxs7
3 files changed, 9 insertions, 0 deletions
diff --git a/Tools/msi/lib/lib.wixproj b/Tools/msi/lib/lib.wixproj
index 64e5878..26311ea 100644
--- a/Tools/msi/lib/lib.wixproj
+++ b/Tools/msi/lib/lib.wixproj
@@ -27,6 +27,7 @@
<TargetBase>$(PySourcePath)Lib</TargetBase>
<Target_>Lib\</Target_>
<Group>lib_py</Group>
+ <IncludeInCat>true</IncludeInCat>
</InstallFiles>
</ItemGroup>
diff --git a/Tools/msi/lib/lib.wxs b/Tools/msi/lib/lib.wxs
index 2b04bcb..2a3b9ec 100644
--- a/Tools/msi/lib/lib.wxs
+++ b/Tools/msi/lib/lib.wxs
@@ -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 --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs
index 804ab01..eb26f8d 100644
--- a/Tools/msi/lib/lib_files.wxs
+++ b/Tools/msi/lib/lib_files.wxs
@@ -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>