|
27 | 27 | <ComponentRef Id="ProductComponent" /> |
28 | 28 | <ComponentRef Id="RuntimeComponent" /> |
29 | 29 | <ComponentRef Id="TemplatesComponent" /> |
30 | | - <!-- TODO: Platform-specific components for pyshellext. |
31 | | - Ensure only one is installed based on the _real_ processor type! |
32 | | -
|
33 | | - <File Source="pyshellext-64.dll"> |
34 | | - <Class Id="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}" Advertise="no" Context="InProcServer32" /> |
35 | | - </File> |
36 | | - <File Source="pyshellext-arm64.dll"> |
37 | | - <Class Id="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}" Advertise="no" Context="InProcServer32" /> |
38 | | - </File> |
39 | | -
|
40 | | - --> |
| 30 | + <ComponentRef Id="PyShellExt64Component" /> |
| 31 | + <ComponentRef Id="PyShellExtARM64Component" /> |
41 | 32 | </Feature> |
42 | 33 |
|
43 | 34 | <util:BroadcastEnvironmentChange /> |
| 35 | + <util:QueryNativeMachine /> |
44 | 36 |
|
45 | 37 | <Component Id="ProductComponent" Directory="INSTALLFOLDER" Guid="8BEC1259-B220-499B-9656-DC59B7F5BE24"> |
46 | 38 | <File KeyPath="yes" Source="py-manager.exe" Name="python.exe" Id="python.exe" /> |
|
114 | 106 | <File Source="templates\launcherw-32.exe" Name="launcherw-32.exe" /> |
115 | 107 | </Component> |
116 | 108 |
|
| 109 | + <!-- IMAGE_FILE_MACHINE_AMD64 = 0x8664 = 34404 --> |
| 110 | + <Component Id="PyShellExt64Component" Directory="INSTALLFOLDER" Guid="D1946F6C-FB98-4395-BE63-D714A221A590" |
| 111 | + Condition="WIX_NATIVE_MACHINE = 34404"> |
| 112 | + <File Source="pyshellext-64.dll"> |
| 113 | + <Class Id="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}" Advertise="no" Context="InprocServer32" /> |
| 114 | + </File> |
| 115 | + </Component> |
| 116 | + |
| 117 | + <!-- IMAGE_FILE_MACHINE_ARM64 = 0xAA64 = 43620 --> |
| 118 | + <Component Id="PyShellExtARM64Component" Directory="INSTALLFOLDER" Guid="D1946F6C-FB98-4395-BE63-D714A221A591" |
| 119 | + Condition="WIX_NATIVE_MACHINE = 43620"> |
| 120 | + <File Source="pyshellext-arm64.dll"> |
| 121 | + <Class Id="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}" Advertise="no" Context="InprocServer32" /> |
| 122 | + </File> |
| 123 | + </Component> |
| 124 | + |
117 | 125 | </Package> |
118 | 126 | </Wix> |
0 commit comments