Skip to content

🍒 [windows] add Embeddable Python 3.10.1 to build.ps1 #85695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: release/6.2.2
Choose a base branch
from
+85 −65
Open

🍒 [windows] add Embeddable Python 3.10.1 to build.ps1 #85695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2c22b3
XFAIL `wasilibc_function.swift` as failing on Amazon Linux 2023
MaxDesiatov Nov 3, 2025
89c3674
Mark the test as `UNSUPPORTED`
MaxDesiatov Nov 3, 2025
3a0ae61
Delete test/embedded/wasm/wasilibc_functions.swift
MaxDesiatov Nov 3, 2025
04482d6
Add support for Swift 6.2.2 release branch scheme
shahmishal Nov 11, 2025
7c296f2
[windows] add Embeddable Python to build.ps1
charles-zablit Oct 6, 2025
3dbdb30
utils: adjust the python path
compnerd Nov 20, 2025
a29f662
[windows] remove pip installation
charles-zablit Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions test/embedded/wasm/wasilibc_functions.swift
View file
Open in desktop

This file was deleted.

59 changes: 48 additions & 11 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,18 @@ $KnownPythons = @{
URL = "https://www.nuget.org/api/v2/package/python/3.10.1";
SHA256 = "987a0e446d68900f58297bc47dc7a235ee4640a49dace58bc9f573797d3a8b33";
};
AMD64_Embedded = @{
URL = "https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-amd64.zip";
SHA256 = "502670dcdff0083847abf6a33f30be666594e7e5201cd6fccd4a523b577403de";
};
ARM64 = @{
URL = "https://www.nuget.org/api/v2/package/pythonarm64/3.10.1";
SHA256 = "16becfccedf1269ff0b8695a13c64fac2102a524d66cecf69a8f9229a43b10d3";
};
ARM64_Embedded = @{
URL = "https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-arm64.zip";
SHA256 = "1f9e215fe4e8f22a8e8fba1859efb1426437044fb3103ce85794630e3b511bc2";
};
};
}

Expand Down Expand Up @@ -537,6 +545,10 @@ function Get-PythonPath([Hashtable] $Platform) {
return [IO.Path]::Combine("$BinaryCache\", "Python$($Platform.Architecture.CMakeName)-$PythonVersion")
}

function Get-EmbeddedPythonPath([Hashtable] $Platform) {
return [IO.Path]::Combine("$BinaryCache\", "EmbeddedPython$($Platform.Architecture.CMakeName)-$PythonVersion")
}

function Get-PythonExecutable {
return [IO.Path]::Combine((Get-PythonPath $BuildPlatform), "tools", "python.exe")
}
Expand All @@ -545,6 +557,10 @@ function Get-PythonScriptsPath {
return [IO.Path]::Combine((Get-PythonPath $BuildPlatform), "tools", "Scripts")
}

function Get-EmbeddedPythonInstallDir() {
return [IO.Path]::Combine("$ImageRoot\", "Program Files", "Swift", "Python-$PythonVersion")
}

function Get-InstallDir([Hashtable] $Platform) {
if ($Platform -eq $HostPlatform) {
return [IO.Path]::Combine("$ImageRoot\", "Program Files", "Swift")
Expand Down Expand Up @@ -862,6 +878,10 @@ function Invoke-VsDevShell([Hashtable] $Platform) {
}
}

function Get-PythonLibName() {
return "python{0}{1}" -f ([System.Version]$PythonVersion).Major, ([System.Version]$PythonVersion).Minor
}

function Get-Dependencies {
Write-Host "[$([DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss"))] Fetch-Dependencies ..." -ForegroundColor Cyan
$ProgressPreference = "SilentlyContinue"
Expand Down Expand Up @@ -977,18 +997,21 @@ function Get-Dependencies {
New-Item -ItemType Directory -ErrorAction Ignore $BinaryCache\toolchains | Out-Null
Export-Toolchain "$PinnedToolchain.exe" $BinaryCache $PinnedToolchain

function Get-KnownPython([string] $ArchName) {
function Get-KnownPython([string] $ArchName, [bool] $EmbeddedPython = $false) {
if (-not $KnownPythons.ContainsKey($PythonVersion)) {
throw "Unknown python version: $PythonVersion"
}
return $KnownPythons[$PythonVersion].$ArchName
$Key = $(if ($EmbeddedPython) { "${ArchName}_Embedded" } else { $ArchName })
return $KnownPythons[$PythonVersion][$Key]
}

function Install-Python([string] $ArchName) {
$Python = Get-KnownPython $ArchName
DownloadAndVerify $Python.URL "$BinaryCache\Python$ArchName-$PythonVersion.zip" $Python.SHA256
function Install-Python([string] $ArchName, [bool] $EmbeddedPython = $false) {
$Python = Get-KnownPython $ArchName $EmbeddedPython
$FileName = $(if ($EmbeddedPython) { "EmbeddedPython$ArchName-$PythonVersion" } else { "Python$ArchName-$PythonVersion" })
DownloadAndVerify $Python.URL "$BinaryCache\$FileName.zip" $Python.SHA256
if (-not $ToBatch) {
Expand-ZipFile Python$ArchName-$PythonVersion.zip "$BinaryCache" Python$ArchName-$PythonVersion
Expand-ZipFile "$FileName.zip" "$BinaryCache" "$FileName"
Write-Ouptut "$ArchName Python $PythonVersion installed."
}
}

Expand Down Expand Up @@ -1027,12 +1050,13 @@ function Get-Dependencies {
}
}

# Ensure Python modules that are required as host build tools
Install-Python $HostArchName
Install-Python $HostArchName $true
if ($IsCrossCompiling) {
Install-Python $BuildArchName
Install-Python $BuildArchName $true
}

# Ensure Python modules that are required as host build tools
Install-PythonModules

if ($Android) {
Expand Down Expand Up @@ -1716,7 +1740,7 @@ function Load-LitTestOverrides($Filename) {
function Get-CompilersDefines([Hashtable] $Platform, [switch] $Test) {
$BuildTools = [IO.Path]::Combine((Get-ProjectBinaryCache $BuildPlatform BuildTools), "bin")
$PythonRoot = [IO.Path]::Combine((Get-PythonPath $Platform), "tools")
$PythonLibName = "python{0}{1}" -f ([System.Version]$PythonVersion).Major, ([System.Version]$PythonVersion).Minor
$PythonLibName = Get-PythonLibName

$TestDefines = if ($Test) {
@{
Expand Down Expand Up @@ -1755,6 +1779,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [switch] $Test) {
LLDB_PYTHON_EXE_RELATIVE_PATH = "python.exe";
LLDB_PYTHON_EXT_SUFFIX = ".pyd";
LLDB_PYTHON_RELATIVE_PATH = "lib/site-packages";
LLDB_PYTHON_DLL_RELATIVE_PATH = "../../../../Python-$PythonVersion/usr/bin";
LLDB_TABLEGEN = (Join-Path -Path $BuildTools -ChildPath "lldb-tblgen.exe");
LLDB_TEST_MAKE = "$BinaryCache\GnuWin32Make-4.4.1\bin\make.exe";
LLVM_CONFIG_PATH = (Join-Path -Path $BuildTools -ChildPath "llvm-config.exe");
Expand All @@ -1768,6 +1793,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [switch] $Test) {
Python3_INCLUDE_DIR = "$PythonRoot\include";
Python3_LIBRARY = "$PythonRoot\libs\$PythonLibName.lib";
Python3_ROOT_DIR = $PythonRoot;
Python3_VERSION = $PythonVersion;
SWIFT_TOOLCHAIN_VERSION = "${ToolchainIdentifier}";
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
Expand Down Expand Up @@ -3082,8 +3108,18 @@ function Install-HostToolchain() {

# Switch to swift-driver
$SwiftDriver = ([IO.Path]::Combine((Get-ProjectBinaryCache $HostPlatform Driver), "bin", "swift-driver.exe"))
Copy-Item -Force $SwiftDriver "$($HostPlatform.ToolchainInstallRoot)\usr\bin\swift.exe"
Copy-Item -Force $SwiftDriver "$($HostPlatform.ToolchainInstallRoot)\usr\bin\swiftc.exe"
Copy-Item -Force `
-Path $SwiftDriver `
-Destination "$($HostPlatform.ToolchainInstallRoot)\usr\bin\swift.exe"
Copy-Item -Force `
-Path $SwiftDriver `
-Destination "$($HostPlatform.ToolchainInstallRoot)\usr\bin\swiftc.exe"

# Copy embeddable Python
New-Item -Type Directory -Path "$(Get-EmbeddedPythonInstallDir)" -ErrorAction Ignore | Out-Null
Copy-Item -Force -Recurse `
-Path "$(Get-EmbeddedPythonPath $HostPlatform)\*" `
-Destination "$(Get-EmbeddedPythonInstallDir)"
}

function Build-Inspect([Hashtable] $Platform) {
Expand Down Expand Up @@ -3156,6 +3192,7 @@ function Build-Installer([Hashtable] $Platform) {
INCLUDE_SWIFT_DOCC = $INCLUDE_SWIFT_DOCC;
SWIFT_DOCC_BUILD = "$(Get-ProjectBinaryCache $HostPlatform DocC)\release";
SWIFT_DOCC_RENDER_ARTIFACT_ROOT = "${SourceCache}\swift-docc-render-artifact";
PythonVersion = $PythonVersion
}

Invoke-IsolatingEnvVars {
Expand Down
73 changes: 37 additions & 36 deletions utils/update_checkout/update-checkout-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,58 +345,59 @@
"mimalloc": "v3.0.1"
}
},
"release/6.1.1": {
"aliases": ["swift/release/6.1.1", "release/6.1.1"],
"release/6.2.2": {
"aliases": ["swift/release/6.2.2", "release/6.2.2"],
"repos": {
"llvm-project": "swift/release/6.1.1",
"swift-llvm-bindings": "swift/release/6.1.1",
"swift": "release/6.1.1",
"cmark": "release/6.1.1",
"llbuild": "release/6.1.1",
"llvm-project": "swift/release/6.2.2",
"swift-llvm-bindings": "swift/release/6.2.2",
"swift": "release/6.2.2",
"cmark": "gfm",
"llbuild": "release/6.2.2",
"swift-build": "release/6.2.2",
"swift-toolchain-sqlite": "1.0.1",
"swift-tools-support-core": "release/6.1.1",
"swiftpm": "release/6.1.1",
"swift-tools-support-core": "release/6.2.2",
"swiftpm": "release/6.2.2",
"swift-argument-parser": "1.4.0",
"swift-atomics": "1.2.0",
"swift-collections": "1.1.3",
"swift-crypto": "3.0.0",
"swift-certificates": "1.0.1",
"swift-asn1": "1.0.0",
"swift-async-algorithms": "1.0.1",
"swift-driver": "release/6.1.1",
"swift-driver": "release/6.2.2",
"swift-log": "1.5.4",
"swift-numerics": "1.0.2",
"swift-syntax": "release/6.1.1",
"swift-system": "1.3.0",
"swift-stress-tester": "release/6.1.1",
"swift-testing": "release/6.1.1",
"swift-corelibs-xctest": "release/6.1.1",
"swift-corelibs-foundation": "release/6.1.1",
"swift-foundation-icu": "release/6.1.1",
"swift-foundation": "release/6.1.1",
"swift-corelibs-libdispatch": "release/6.1.1",
"swift-integration-tests": "release/6.1.1",
"swift-xcode-playground-support": "release/6.1.1",
"swift-syntax": "release/6.2.2",
"swift-system": "1.5.0",
"swift-stress-tester": "release/6.2.2",
"swift-testing": "release/6.2.2",
"swift-corelibs-xctest": "release/6.2.2",
"swift-corelibs-foundation": "release/6.2.2",
"swift-foundation-icu": "release/6.2.2",
"swift-foundation": "release/6.2.2",
"swift-corelibs-libdispatch": "release/6.2.2",
"swift-integration-tests": "release/6.2.2",
"swift-xcode-playground-support": "release/6.2.2",
"ninja": "v1.11.1",
"yams": "5.0.6",
"cmake": "v3.30.2",
"indexstore-db": "release/6.1.1",
"sourcekit-lsp": "release/6.1.1",
"swift-format": "release/6.1.1",
"swift-installer-scripts": "release/6.1.1",
"swift-docc": "release/6.1.1",
"swift-lmdb": "release/6.1.1",
"swift-docc-render-artifact": "release/6.1.1",
"swift-docc-symbolkit": "release/6.1.1",
"swift-markdown": "release/6.1.1",
"indexstore-db": "release/6.2.2",
"sourcekit-lsp": "release/6.2.2",
"swift-format": "release/6.2.2",
"swift-installer-scripts": "release/6.2.2",
"swift-docc": "release/6.2.2",
"swift-lmdb": "release/6.2.2",
"swift-docc-render-artifact": "release/6.2.2",
"swift-docc-symbolkit": "release/6.2.2",
"swift-markdown": "release/6.2.2",
"swift-nio": "2.65.0",
"swift-experimental-string-processing": "swift/release/6.1.1",
"swift-sdk-generator": "release/6.1.1",
"wasi-libc": "wasi-sdk-22",
"wasmkit": "0.1.2",
"swift-experimental-string-processing": "release/6.2.2",
"swift-sdk-generator": "release/6.2.2",
"wasi-libc": "wasi-sdk-24",
"wasmkit": "0.1.6",
"curl": "curl-8_9_1",
"libxml2": "v2.11.5",
"zlib": "v1.3.1"
"zlib": "v1.3.1",
"mimalloc": "v3.0.1"
}
},
"release/6.1": {
Expand Down