Skip to content

Commit 977aab5

Browse files
switch to using the PythonRoot parameter
1 parent 12e3337 commit 977aab5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

platforms/Windows/python/asserts/python.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define VariantCabinetName = python.asserts.cab?>
66
<?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?>
77
<?define VariantEnvironmentComponentGUID = 30629e0c-b376-47bc-bedf-fefb7d4ca61d?>
8-
<?define PythonRoot = "$(ImageRoot)\Python"?>
8+
<?define PythonRoot = "$(PythonRoot)"?>
99

1010
<?include ../python.wxi ?>
1111
</Wix>

platforms/Windows/readme.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ To support the three architecture flavors of the SDK and RTL MSI packages, you n
178178
| MSBuild property | Description |
179179
| ---------------- | ----------- |
180180
| ImageRoot | Path to the root of the installed Swift image to package |
181+
| PythonRoot | Path to the root of the Python distribution to package |
181182
| Platforms | Semicolon delimited list of platforms to package (android;windows) |
182183
| AndroidArchitectures | Semicolon delimited list of architectures the Android platform supports (aarch54;armv7;i686;x86_64) |
183184
| ToolchainVariants | Semicolon delimited list of toolchain variants to package (assert;noassert) |
@@ -195,10 +196,11 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
195196
-p:Configuration=Release ^
196197
-p:BaseOutputPath=%PackageRoot%\online\ ^
197198
-p:ImageRoot=%ImageRoot%\Program Files\Swift ^
199+
-p:PythonRoot=%ImageRoot%\Program Files\Python-3.10.1 ^
198200
-p:Platforms="android;windows" ^
199201
-p:AndroidArchitectures="aarch64;armv7;i686;x86_64" ^
200202
-p:WindowsArchitectures="aarch64;i686;x86_64" ^
201-
-p:WindowsRuntimeARM64=%ImageRoot%\Prograam Files (Arm64)\Swift\Runtimes\0.0.0 ^
203+
-p:WindowsRuntimeARM64=%ImageRoot%\Program Files (Arm64)\Swift\Runtimes\0.0.0 ^
202204
-p:WindowsRuntimeX64=%ImageRoot%\Program Files\Swift\Runtimes\0.0.0 ^
203205
-p:WindowsRuntimeX86=%ImageRoot%\Program Files (x86)\Swift\Runtimes\0.0.0
204206
```

0 commit comments

Comments
 (0)