File tree 4 files changed +26
-14
lines changed
4 files changed +26
-14
lines changed Original file line number Diff line number Diff line change
1
+ Drag and drop of files onto Python files in Windows Explorer has been
2
+ enabled for Windows ARM64.
Original file line number Diff line number Diff line change 11
11
EnableFeatureSelection =" yes"
12
12
Permanent =" yes"
13
13
Visible =" yes"
14
- InstallCondition =" (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher" />
14
+ InstallCondition =" (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher" >
15
+ <?if $(var.Platform)~=" ARM64" ?>
16
+ <MsiProperty Name =" ARM64_SHELLEXT" Value =" 1" />
17
+ <?endif ?>
18
+ </MsiPackage >
15
19
16
20
<MsiPackage Id =" launcher_JustForMe"
17
21
SourceFile =" !(bindpath.build32)en-us\launcher.msi"
21
25
EnableFeatureSelection =" yes"
22
26
Permanent =" yes"
23
27
Visible =" yes"
24
- InstallCondition =" not (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher" />
28
+ InstallCondition =" not (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher" >
29
+ <?if $(var.Platform)~=" ARM64" ?>
30
+ <MsiProperty Name =" ARM64_SHELLEXT" Value =" 1" />
31
+ <?endif ?>
32
+ </MsiPackage >
25
33
</PackageGroup >
26
34
</Fragment >
27
35
</Wix >
Original file line number Diff line number Diff line change 3
3
<Product Id =" *" Language =" !(loc.LCID)" Name =" !(loc.Title)" Version =" $(var.Version)" Manufacturer =" !(loc.Manufacturer)" UpgradeCode =" $(var.UpgradeCode)" >
4
4
<Package InstallerVersion =" 500" Compressed =" yes" InstallScope =" perUser" />
5
5
<MediaTemplate EmbedCab =" yes" CompressionLevel =" high" />
6
-
6
+
7
7
<Property Id =" Suppress_TARGETDIR_Check" Value =" 1" />
8
8
<Icon Id =" ARPIcon" SourceFile =" !(bindpath.src)PC\icons\launcher.ico" />
9
9
<Property Id =" ARPPRODUCTICON" Value =" ARPIcon" />
10
10
<Property Id =" ARPNOMODIFY" Value =" 1" />
11
11
<Property Id =" DISABLEADVTSHORTCUTS" Value =" 1" />
12
12
13
+ <Property Id =" ARM64_SHELLEXT" >
14
+ <ComponentSearch Id =" RegistrySearch_ARM64_SHELLEXT_Detected"
15
+ Guid =" {C591963D-7FC6-4FCE-8642-5E01E6B8848F}" />
16
+ </Property >
17
+
13
18
<Feature Id =" DefaultFeature" AllowAdvertise =" no" Title =" !(loc.Title)" Description =" !(loc.Description)" >
14
19
<ComponentGroupRef Id =" launcher_exe" Primary =" yes" />
15
20
</Feature >
16
21
<Feature Id =" AssociateFiles" AllowAdvertise =" no" Title =" !(loc.Title)" Description =" !(loc.Description)" >
17
22
<ComponentGroupRef Id =" launcher_exe" />
18
23
<ComponentGroupRef Id =" launcher_reg" />
19
24
</Feature >
20
-
25
+
21
26
<Directory Id =" TARGETDIR" Name =" SourceDir" >
22
27
<Directory Id =" LauncherInstallDirectory" />
23
28
</Directory >
24
-
29
+
25
30
<CustomAction Id =" SetLauncherInstallDirectoryLM" Property =" LauncherInstallDirectory" Value =" [WindowsFolder]" />
26
31
<CustomAction Id =" SetLauncherInstallDirectoryCU" Property =" LauncherInstallDirectory" Value =" [LocalAppDataFolder]Programs\Python\Launcher" />
27
-
32
+
28
33
<InstallExecuteSequence >
29
34
<Custom Before =" SetLauncherInstallDirectoryLM" Action =" SetLauncherInstallDirectoryCU" >NOT Installed AND NOT ALLUSERS=1</Custom >
30
35
<Custom Before =" CostFinalize" Action =" SetLauncherInstallDirectoryLM" >NOT Installed AND ALLUSERS=1</Custom >
Original file line number Diff line number Diff line change 22
22
</Component >
23
23
24
24
<Component Id =" pyshellext_amd64.dll" Directory =" LauncherInstallDirectory" Guid =" {E7411EFD-F1DD-40EB-B0C7-4BA02BF3E75F}" Win64 =" yes" >
25
- <Condition >VersionNT64</Condition >
25
+ <Condition >VersionNT64 AND NOT ARM64_SHELLEXT </Condition >
26
26
<File Id =" pyshellext_amd64.dll" Name =" pyshellext.amd64.dll" Source =" !(bindpath.Build64)\pyshellext.dll" >
27
27
<Class Id =" {BEA218D2-6950-497B-9434-61683EC065FE}" Advertise =" no" Context =" InprocServer32" ThreadingModel =" apartment" />
28
28
</File >
29
29
</Component >
30
30
<Component Id =" pyshellext_win32.dll" Directory =" LauncherInstallDirectory" Guid =" {C5936696-9A5A-45A0-A830-D172C3329282}" >
31
- <Condition >NOT VersionNT64</Condition >
31
+ <Condition >NOT VersionNT64 AND NOT ARM64_SHELLEXT </Condition >
32
32
<File Id =" pyshellext_win32.dll" Name =" pyshellext.win32.dll" Source =" !(bindpath.Build32)\pyshellext.dll" >
33
33
<Class Id =" {BEA218D2-6950-497B-9434-61683EC065FE}" Advertise =" no" Context =" InprocServer32" ThreadingModel =" apartment" />
34
34
</File >
35
35
</Component >
36
- <!--
37
- Currently unclear how to detect ARM64 device at this point.
38
- In any case, the shell extension doesn't appear to work, so installing a non-functional
39
- pyshellext_amd64.dll for a different platform isn't any worse.
40
- <Component Id="pyshellext_arm64.dll" Directory="LauncherInstallDirectory" Guid="{C591963D-7FC6-4FCE-8642-5E01E6B8848F}">
36
+ <Component Id =" pyshellext_arm64.dll" Directory =" LauncherInstallDirectory" Guid =" {C591963D-7FC6-4FCE-8642-5E01E6B8848F}" Win64 =" yes" >
37
+ <Condition >ARM64_SHELLEXT</Condition >
41
38
<File Id =" pyshellext_arm64.dll" Name =" pyshellext.arm64.dll" Source =" !(bindpath.BuildARM64)\pyshellext.dll" >
42
39
<Class Id =" {BEA218D2-6950-497B-9434-61683EC065FE}" Advertise =" no" Context =" InprocServer32" ThreadingModel =" apartment" />
43
40
</File >
44
- </Component>-->
41
+ </Component >
45
42
</ComponentGroup >
46
43
</Fragment >
47
44
</Wix >
You can’t perform that action at this time.
0 commit comments