diff options
Diffstat (limited to 'Tools/msi/lib')
| -rw-r--r-- | Tools/msi/lib/lib.wixproj | 1 | ||||
| -rw-r--r-- | Tools/msi/lib/lib.wxs | 1 | ||||
| -rw-r--r-- | Tools/msi/lib/lib_files.wxs | 15 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Tools/msi/lib/lib.wixproj b/Tools/msi/lib/lib.wixproj index 64e58787b8..26311ea327 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 2b04bcb304..2a3b9ecfee 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 a992784939..a83f544db6 100644 --- a/Tools/msi/lib/lib_files.wxs +++ b/Tools/msi/lib/lib_files.wxs @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3 ?> + <?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio ?> <Fragment> <ComponentGroup Id="lib_extensions"> <?foreach ext in $(var.exts)?> @@ -63,16 +63,17 @@ <RegistryValue Key="PythonPath" Type="string" Value="[Lib];[DLLs]" /> </RegistryKey> </Component> - <Component Id="Lib_site_packages_README" Directory="Lib_site_packages" Guid="*"> - <File Id="Lib_site_packages_README" Name="README.txt" Source="!(bindpath.src)Lib\site-packages\README" KeyPath="yes" /> - </Component> <Component Id="Lib2to3_pickle_remove" Directory="Lib_lib2to3" Guid="$(var.RemoveLib2to3PickleComponentGuid)"> <RemoveFile Id="Lib2to3_pickle_remove_files" Name="*.pickle" On="uninstall" /> <RemoveFolder Id="Lib2to3_pickle_remove_folder" On="uninstall" /> </Component> </ComponentGroup> - <DirectoryRef Id="Lib"> - <Directory Id="Lib_site_packages" Name="site-packages" /> - </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="lib_cat"> + <Component Id="lib_cat" Directory="Catalogs" Guid="*"> + <File Name="python_lib.cat" KeyPath="yes" /> + </Component> + </ComponentGroup> </Fragment> </Wix> |