Adds missing _asyncio.pyd to installer and generally tidies pyd management.

diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs
index 9ecb277920c5c8873f67095fbd5fb817fc4cc1e7..a83f544db634bdd17949b8ef3eabd068036ff003 100644 (file)
--- 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)?>

diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index ebb1766b33be894a6d9fdaf8ad59128e4a9c18f3..f070cb91a9589f61a7c1c3d2594cd5ff0c7cff56 100644 (file)
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -19,6 +19,7 @@ DEBUG_FILES = {
     '_ctypes_test',
     '_testbuffer',
     '_testcapi',
+    '_testconsole',
     '_testimportmultiple',
     '_testmultiphase',
     'xxlimited',

diff --git a/Tools/msi/test/test_files.wxs b/Tools/msi/test/test_files.wxs
index 07535721fca17fc4abc7d0aff4e2f0dbb5f31cfe..82a9115f75902311892573c8353e2cdc73cc70d7 100644 (file)
--- a/Tools/msi/test/test_files.wxs
+++ b/Tools/msi/test/test_files.wxs
@@ -1,89 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <?define exts=_testcapi;_ctypes_test;_testbuffer;_testimportmultiple;_testmultiphase;_testconsole ?>
     <Fragment>
         <ComponentGroup Id="test_extensions">
-            <Component Id="_testcapi.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testcapi.pyd" Name="_testcapi.pyd" KeyPath="yes" />
-            </Component>
-            <Component Id="_ctypes_test.pyd" Directory="DLLs" Guid="*">
-                <File Id="_ctypes_test.pyd" Name="_ctypes_test.pyd" KeyPath="yes" />
-            </Component>
-            <Component Id="_testbuffer.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testbuffer.pyd" Name="_testbuffer.pyd" KeyPath="yes" />
-            </Component>
-            <Component Id="_testimportmultiple.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testimportmultiple.pyd" Name="_testimportmultiple.pyd" KeyPath="yes" />
-            </Component>
-            <Component Id="_testmultiphase.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testmultiphase.pyd" Name="_testmultiphase.pyd" KeyPath="yes" />
-            </Component>
-            <Component Id="_testconsole.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testconsole.pyd" Name="_testconsole.pyd" KeyPath="yes" />
+            <?foreach ext in $(var.exts)?>
+        
+            <Component Id="$(var.ext).pyd" Directory="DLLs" Guid="*">
+                <File Name="$(var.ext).pyd" KeyPath="yes" />
             </Component>
+            
+            <?endforeach ?>
         </ComponentGroup>
     </Fragment>
     
     <Fragment>
         <ComponentGroup Id="test_extensions_symbols">
-            <Component Id="_testcapi.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testcapi.pdb" Name="_testcapi.pdb" />
-            </Component>
-            <Component Id="_ctypes_test.pdb" Directory="DLLs" Guid="*">
-                <File Id="_ctypes_test.pdb" Name="_ctypes_test.pdb" />
-            </Component>
-            <Component Id="_testbuffer.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testbuffer.pdb" Name="_testbuffer.pdb" />
-            </Component>
-            <Component Id="_testimportmultiple.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testimportmultiple.pdb" Name="_testimportmultiple.pdb" />
-            </Component>
-            <Component Id="_testmultiphase.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testmultiphase.pdb" Name="_testmultiphase.pdb" />
-            </Component>
-            <Component Id="_testconsole.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testconsole.pdb" Name="_testconsole.pdb" />
+            <?foreach ext in $(var.exts)?>
+            
+            <Component Id="$(var.ext).pdb" Directory="DLLs" Guid="*">
+                <File Name="$(var.ext).pdb" />
             </Component>
+            
+            <?endforeach ?>
         </ComponentGroup>
     </Fragment>
     
     <Fragment>
         <ComponentGroup Id="test_extensions_d">
-            <Component Id="_testcapi_d.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testcapi_d.pyd" Name="_testcapi_d.pyd" />
-            </Component>
-            <Component Id="_ctypes_test_d.pyd" Directory="DLLs" Guid="*">
-                <File Id="_ctypes_test_d.pyd" Name="_ctypes_test_d.pyd" />
-            </Component>
-            <Component Id="_testbuffer_d.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testbuffer_d.pyd" Name="_testbuffer_d.pyd" />
-            </Component>
-            <Component Id="_testimportmultiple_d.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testimportmultiple_d.pyd" Name="_testimportmultiple_d.pyd" />
-            </Component>
-            <Component Id="_testmultiphase_d.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testmultiphase_d.pyd" Name="_testmultiphase_d.pyd" />
-            </Component>
-            <Component Id="_testconsole_d.pyd" Directory="DLLs" Guid="*">
-                <File Id="_testconsole_d.pyd" Name="_testconsole_d.pyd" />
-            </Component>
-            <Component Id="_testcapi_d.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testcapi_d.pdb" Name="_testcapi_d.pdb" />
-            </Component>
-            <Component Id="_ctypes_test_d.pdb" Directory="DLLs" Guid="*">
-                <File Id="_ctypes_test_d.pdb" Name="_ctypes_test_d.pdb" />
-            </Component>
-            <Component Id="_testbuffer_d.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testbuffer_d.pdb" Name="_testbuffer_d.pdb" />
-            </Component>
-            <Component Id="_testimportmultiple_d.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testimportmultiple_d.pdb" Name="_testimportmultiple_d.pdb" />
-            </Component>
-            <Component Id="_testmultiphase_d.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testmultiphase_d.pdb" Name="_testmultiphase_d.pdb" />
+            <?foreach ext in $(var.exts)?>
+            
+            <Component Id="$(var.ext)_d.pyd" Directory="DLLs" Guid="*">
+                <File Name="$(var.ext)_d.pyd" />
             </Component>
-            <Component Id="_testconsole_d.pdb" Directory="DLLs" Guid="*">
-                <File Id="_testconsole_d.pdb" Name="_testconsole_d.pdb" />
+            <Component Id="$(var.ext)_d.pdb" Directory="DLLs" Guid="*">
+                <File Name="$(var.ext)_d.pdb" />
             </Component>
+            
+            <?endforeach ?>
         </ComponentGroup>
     </Fragment>
 </Wix>