diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-10-29 16:23:52 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-10-29 16:23:52 (GMT) |
| commit | 27c22f900c8267148d2ffecce8f0a474774420f1 (patch) | |
| tree | 5e151dd4903a50d367cd09dec2806f13d571893a /Tools/msi/test/test_files.wxs | |
| parent | d920d053814379946660a1e27b4060a786e4c505 (diff) | |
| parent | 4782ab3aa36554efb3f43f4f6ed70f8837801151 (diff) | |
| download | cpython-27c22f900c8267148d2ffecce8f0a474774420f1.zip cpython-27c22f900c8267148d2ffecce8f0a474774420f1.tar.gz cpython-27c22f900c8267148d2ffecce8f0a474774420f1.tar.bz2 | |
Adds missing _asyncio.pyd to installer and generally tidies pyd management.
Diffstat (limited to 'Tools/msi/test/test_files.wxs')
| -rw-r--r-- | Tools/msi/test/test_files.wxs | 89 |
1 files changed, 21 insertions, 68 deletions
diff --git a/Tools/msi/test/test_files.wxs b/Tools/msi/test/test_files.wxs index 0753572..82a9115 100644 --- 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> |