Skip to content

Commit 746cc5f

Browse files
compnerdcharles-zablit
authored andcommitted
WiX: clean up the python packaging
Restructure the python installation to mimic the Unix style layout that we use throughout the components. Specifically, migrate the .exe and .dll files into a `/usr/bin` subdirectory under the installation and move the license into the package itself. (cherry picked from commit 23af485)
1 parent b0d1d67 commit 746cc5f

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

platforms/Windows/python/python.wxs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,17 @@
2121
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />
2222

2323
<DirectoryRef Id="INSTALLROOT">
24-
<Directory Id="python" Name="Python-$(PythonVersion)" />
24+
<Directory Id="python" Name="Python-$(PythonVersion)">
25+
<Directory Id="_usr" Name="usr">
26+
<Directory Id="_usr_bin" Name="bin" />
27+
<Directory Id="_usr_share" Name="share">
28+
<Directory Id="_usr_share_licenses" Name="licenses" />
29+
</Directory>
30+
</Directory>
31+
</Directory>
2532
</DirectoryRef>
2633

27-
<ComponentGroup Id="EmbeddedPython" Directory="python">
34+
<ComponentGroup Id="EmbeddedPython" Directory="_usr_bin">
2835
<Component>
2936
<File Source="$(PythonRoot)\libcrypto-1_1$(ArchSuffix).dll" />
3037
</Component>
@@ -124,17 +131,14 @@
124131
<Component>
125132
<File Source="$(PythonRoot)\_zoneinfo.pyd" />
126133
</Component>
127-
</ComponentGroup>
128134

129-
<ComponentGroup Id="EmbeddedPythonLicense">
130135
<Component Directory="_usr_share_licenses">
131-
<File Source="$(PythonRoot)\LICENSE.txt" />
136+
<File Name="python.txt" Source="$(PythonRoot)\LICENSE.txt" />
132137
</Component>
133138
</ComponentGroup>
134139

135140
<Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)">
136141
<ComponentGroupRef Id="EmbeddedPython" />
137-
<ComponentGroupRef Id="EmbeddedPythonLicense" />
138142
</Feature>
139143
</Package>
140-
</Wix>
144+
</Wix>

platforms/Windows/shared/shared.wxs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<Directory Id="_usr_share_docc" Name="docc">
5353
<Directory Id="_usr_share_docc_render" Name="render" />
5454
</Directory>
55-
<Directory Id="_usr_share_licenses" Name="licenses" />
5655
</Directory>
5756
</Directory>
5857
</Directory>

0 commit comments

Comments
 (0)