Skip to content

Commit 796d69c

Browse files
charles-zablitcharles-zablit
committed
address comments
1 parent 888fd5f commit 796d69c

File tree

4 files changed

+50
-50
lines changed

4 files changed

+50
-50
lines changed

‎platforms/Windows/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
ArePackageCabsEmbedded=$(ArePackageCabsEmbedded);
8282
BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl);
8383
ImageRoot=$(ImageRoot);
84+
PythonRoot=$(PythonRoot);
8485
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
8586
WindowsRuntimeX64=$(WindowsRuntimeX64);
8687
WindowsRuntimeX86=$(WindowsRuntimeX86);

‎platforms/Windows/python/asserts/python.wxs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<?define VariantCabinetName = python.asserts.cab?>
66
<?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?>
77
<?define VariantEnvironmentComponentGUID = 30629e0c-b376-47bc-bedf-fefb7d4ca61d?>
8-
<?define PythonRoot = "$(PythonRoot)"?>
9-
8+
<?if $(ProductArchitecture) = "arm64" ?>
9+
<?define ArchSuffix = "-arm64" ?>
10+
<?else?>
11+
<?define ArchSuffix = "" ?>
12+
<?endif?>
1013
<?include ../python.wxi ?>
11-
</Wix>
14+
</Wix>

‎platforms/Windows/python/python.wxi‎

Lines changed: 42 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -14,146 +14,141 @@
1414
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
1515
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />
1616

17-
<ComponentGroup Id="EmbeddedPython">
18-
<Component Directory="toolchain_$(VariantName)_usr_bin">
19-
<File Source="$(PythonRoot)\libcrypto-1_1-arm64.dll" />
17+
<ComponentGroup Id="EmbeddedPython" Directory="toolchain_$(VariantName)_usr_bin">
18+
<Component >
19+
<File Source="$(PythonRoot)\libcrypto-1_1$(ArchSuffix).dll" />
2020
</Component>
2121

22-
<Component Directory="toolchain_$(VariantName)_usr_bin">
22+
<Component>
2323
<File Source="$(PythonRoot)\libffi-7.dll" />
2424
</Component>
2525

26-
<Component Directory="toolchain_$(VariantName)_usr_bin">
27-
<File Source="$(PythonRoot)\libssl-1_1-arm64.dll" />
26+
<Component>
27+
<File Source="$(PythonRoot)\libssl-1_1$(ArchSuffix).dll" />
2828
</Component>
2929

30-
<Component Directory="toolchain_$(VariantName)_usr_bin">
31-
<File Source="$(PythonRoot)\LICENSE.txt" />
32-
</Component>
33-
34-
<Component Directory="toolchain_$(VariantName)_usr_bin">
30+
<Component>
3531
<File Source="$(PythonRoot)\pyexpat.pyd" />
3632
</Component>
3733

38-
<Component Directory="toolchain_$(VariantName)_usr_bin">
34+
<Component>
3935
<File Source="$(PythonRoot)\python.cat" />
4036
</Component>
4137

42-
<Component Directory="toolchain_$(VariantName)_usr_bin">
38+
<Component>
4339
<File Source="$(PythonRoot)\python.exe" />
4440
</Component>
4541

46-
<Component Directory="toolchain_$(VariantName)_usr_bin">
42+
<Component>
4743
<File Source="$(PythonRoot)\python3.dll" />
4844
</Component>
4945

50-
<Component Directory="toolchain_$(VariantName)_usr_bin">
46+
<Component>
5147
<File Source="$(PythonRoot)\python310.dll" />
5248
</Component>
5349

54-
<Component Directory="toolchain_$(VariantName)_usr_bin">
50+
<Component>
5551
<File Source="$(PythonRoot)\python310.zip" />
5652
</Component>
5753

58-
<Component Directory="toolchain_$(VariantName)_usr_bin">
54+
<Component>
5955
<File Source="$(PythonRoot)\python310._pth" />
6056
</Component>
6157

62-
<Component Directory="toolchain_$(VariantName)_usr_bin">
58+
<Component>
6359
<File Source="$(PythonRoot)\pythonw.exe" />
6460
</Component>
6561

66-
<Component Directory="toolchain_$(VariantName)_usr_bin">
62+
<Component>
6763
<File Source="$(PythonRoot)\select.pyd" />
6864
</Component>
6965

70-
<Component Directory="toolchain_$(VariantName)_usr_bin">
66+
<Component>
7167
<File Source="$(PythonRoot)\sqlite3.dll" />
7268
</Component>
7369

74-
<Component Directory="toolchain_$(VariantName)_usr_bin">
70+
<Component>
7571
<File Source="$(PythonRoot)\unicodedata.pyd" />
7672
</Component>
7773

78-
<Component Directory="toolchain_$(VariantName)_usr_bin">
79-
<File Source="$(PythonRoot)\vcruntime140.dll" />
80-
</Component>
81-
82-
<Component Directory="toolchain_$(VariantName)_usr_bin">
83-
<File Source="$(PythonRoot)\vcruntime140_1.dll" />
84-
</Component>
85-
86-
<Component Directory="toolchain_$(VariantName)_usr_bin">
74+
<Component>
8775
<File Source="$(PythonRoot)\winsound.pyd" />
8876
</Component>
8977

90-
<Component Directory="toolchain_$(VariantName)_usr_bin">
78+
<Component>
9179
<File Source="$(PythonRoot)\_asyncio.pyd" />
9280
</Component>
9381

94-
<Component Directory="toolchain_$(VariantName)_usr_bin">
82+
<Component>
9583
<File Source="$(PythonRoot)\_bz2.pyd" />
9684
</Component>
9785

98-
<Component Directory="toolchain_$(VariantName)_usr_bin">
86+
<Component>
9987
<File Source="$(PythonRoot)\_ctypes.pyd" />
10088
</Component>
10189

102-
<Component Directory="toolchain_$(VariantName)_usr_bin">
90+
<Component>
10391
<File Source="$(PythonRoot)\_decimal.pyd" />
10492
</Component>
10593

106-
<Component Directory="toolchain_$(VariantName)_usr_bin">
94+
<Component>
10795
<File Source="$(PythonRoot)\_elementtree.pyd" />
10896
</Component>
10997

110-
<Component Directory="toolchain_$(VariantName)_usr_bin">
98+
<Component>
11199
<File Source="$(PythonRoot)\_hashlib.pyd" />
112100
</Component>
113101

114-
<Component Directory="toolchain_$(VariantName)_usr_bin">
102+
<Component>
115103
<File Source="$(PythonRoot)\_lzma.pyd" />
116104
</Component>
117105

118-
<Component Directory="toolchain_$(VariantName)_usr_bin">
106+
<Component>
119107
<File Source="$(PythonRoot)\_msi.pyd" />
120108
</Component>
121109

122-
<Component Directory="toolchain_$(VariantName)_usr_bin">
110+
<Component>
123111
<File Source="$(PythonRoot)\_multiprocessing.pyd" />
124112
</Component>
125113

126-
<Component Directory="toolchain_$(VariantName)_usr_bin">
114+
<Component>
127115
<File Source="$(PythonRoot)\_overlapped.pyd" />
128116
</Component>
129117

130-
<Component Directory="toolchain_$(VariantName)_usr_bin">
118+
<Component>
131119
<File Source="$(PythonRoot)\_queue.pyd" />
132120
</Component>
133121

134-
<Component Directory="toolchain_$(VariantName)_usr_bin">
122+
<Component>
135123
<File Source="$(PythonRoot)\_socket.pyd" />
136124
</Component>
137125

138-
<Component Directory="toolchain_$(VariantName)_usr_bin">
126+
<Component>
139127
<File Source="$(PythonRoot)\_sqlite3.pyd" />
140128
</Component>
141129

142-
<Component Directory="toolchain_$(VariantName)_usr_bin">
130+
<Component>
143131
<File Source="$(PythonRoot)\_ssl.pyd" />
144132
</Component>
145133

146-
<Component Directory="toolchain_$(VariantName)_usr_bin">
134+
<Component>
147135
<File Source="$(PythonRoot)\_uuid.pyd" />
148136
</Component>
149137

150-
<Component Directory="toolchain_$(VariantName)_usr_bin">
138+
<Component>
151139
<File Source="$(PythonRoot)\_zoneinfo.pyd" />
152140
</Component>
153141
</ComponentGroup>
154142

155-
<Feature Id="EmbeddedPython" AllowAbsent="yes" Title="$(VariantProductName)">
143+
<ComponentGroup Id="EmbeddedPythonLicense">
144+
<Component Directory="toolchain_$(VariantName)_usr_share_licenses">
145+
<File Source="$(PythonRoot)\LICENSE.txt" />
146+
</Component>
147+
</ComponentGroup>
148+
149+
<Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)">
156150
<ComponentGroupRef Id="EmbeddedPython" />
151+
<ComponentGroupRef Id="EmbeddedPythonLicense" />
157152
</Feature>
158153
</Package>
159154
</Include>

‎platforms/Windows/shared/shared.wxs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<Directory Id="toolchain_asserts_usr_share_docc" Name="docc">
5656
<Directory Id="toolchain_asserts_usr_share_docc_render" Name="render" />
5757
</Directory>
58+
<Directory Id="toolchain_asserts_usr_share_licenses" Name="licenses" />
5859
</Directory>
5960
</Directory>
6061
</Directory>

0 commit comments

Comments
 (0)