Skip to content

Commit 0b6e085

Browse files
committed
Add MSI code for shell extension installation
1 parent 03d279f commit 0b6e085

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

src/pymanager/msi.wxs

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,12 @@
2727
<ComponentRef Id="ProductComponent" />
2828
<ComponentRef Id="RuntimeComponent" />
2929
<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" />
4132
</Feature>
4233

4334
<util:BroadcastEnvironmentChange />
35+
<util:QueryNativeMachine />
4436

4537
<Component Id="ProductComponent" Directory="INSTALLFOLDER" Guid="8BEC1259-B220-499B-9656-DC59B7F5BE24">
4638
<File KeyPath="yes" Source="py-manager.exe" Name="python.exe" Id="python.exe" />
@@ -114,5 +106,21 @@
114106
<File Source="templates\launcherw-32.exe" Name="launcherw-32.exe" />
115107
</Component>
116108

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+
117125
</Package>
118126
</Wix>

0 commit comments

Comments
 (0)