diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 04c71754..63970658 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -27,7 +27,7 @@ jobs:
- uses: actions/setup-python@v5
with:
- python-version: '3.8'
+ python-version: '3.14.2'
architecture: ${{ matrix.arch }}
- name: Install Dependencies
@@ -52,29 +52,28 @@ jobs:
Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/perl-5.20.0-${{ matrix.arch }}.7z -OutFile deps\perl-${{ matrix.arch }}.7z
& 7z.exe x deps\perl-${{ matrix.arch }}.7z -oC:\gtk-build\perl-5.20\${{ matrix.platform }}
- New-Item -Path "C:\gtk-build\python-3.8" -ItemType Directory -Force | Out-Null
-
+ # Resolve python root from setup-python
$pyRoot = $env:pythonLocation
- if (-not $pyRoot) {
- $pyRoot = & python -c "import sys; print(sys.prefix)"
+ if (-not $pyRoot) { $pyRoot = & python -c "import sys; print(sys.prefix)" }
+
+ # Create BOTH paths because the .vcxproj hard-codes python-3.14\...
+ foreach ($pyDir in @("C:\gtk-build\python-3.14.2", "C:\gtk-build\python-3.14")) {
+ New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
+ $target = Join-Path $pyDir "${{ matrix.platform }}"
+ if (Test-Path $target) { Remove-Item $target -Recurse -Force }
+ New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
}
- $target = "C:\gtk-build\python-3.8\${{ matrix.platform }}"
- if (Test-Path $target) { Remove-Item $target -Recurse -Force }
-
- New-Item -Path "C:\gtk-build\python-3.8" -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
-
python -m pip install --upgrade pip
python -m pip install cffi
-
- name: Build
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
- set "PYTHON_DIR=C:\gtk-build\python-3.8\${{ matrix.platform }}"
- if not exist "%PYTHON_DIR%\libs\python38.lib" (
- echo Missing %PYTHON_DIR%\libs\python38.lib
+ set "PYTHON_DIR=C:\gtk-build\python-3.14.2\${{ matrix.platform }}"
+ if not exist "%PYTHON_DIR%\libs\python314.lib" (
+ echo Missing %PYTHON_DIR%\libs\python314.lib
dir "%PYTHON_DIR%\libs"
exit /b 1
)
diff --git a/win32/installer/zoitechat-arm64.iss b/win32/installer/zoitechat-arm64.iss
index a2c96bfd..3edfe978 100644
--- a/win32/installer/zoitechat-arm64.iss
+++ b/win32/installer/zoitechat-arm64.iss
@@ -88,7 +88,7 @@ Name: "langs\lua"; Description: "Lua"; Types: normal custom; Flags: disablenouni
; These are kept for consistency, but hidden on ARM64 unless you later ship ARM64 installers for them.
Name: "langs\perl"; Description: "Perl (requires Perl 5.20)"; Types: custom; Flags: disablenouninstallwarning; Check: not IsArm64
-Name: "langs\python"; Description: "Python (requires Python 3.8)"; Types: custom; Flags: disablenouninstallwarning; Check: not IsArm64
+Name: "langs\python"; Description: "Python (requires Python 3.14.2)"; Types: custom; Flags: disablenouninstallwarning; Check: not IsArm64
[Tasks]
Name: portable; Description: "Yes"; GroupDescription: "Portable Mode: Stores configuration files within install directory for portable drives."; Flags: unchecked
diff --git a/win32/installer/zoitechat.iss.tt b/win32/installer/zoitechat.iss.tt
index 39621428..03521b7e 100644
--- a/win32/installer/zoitechat.iss.tt
+++ b/win32/installer/zoitechat.iss.tt
@@ -75,7 +75,7 @@ Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenoun
Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning
Name: "langs\lua"; Description: "Lua"; Types: normal custom; Flags: disablenouninstallwarning
Name: "langs\perl"; Description: "Perl (requires Perl 5.20)"; Types: custom; Flags: disablenouninstallwarning
-Name: "langs\python"; Description: "Python (requires Python 3.8)"; Types: custom; Flags: disablenouninstallwarning
+Name: "langs\python"; Description: "Python (requires Python 3.14.2)"; Types: custom; Flags: disablenouninstallwarning
[Tasks]
Name: portable; Description: "Yes"; GroupDescription: "Portable Mode: Stores configuration files within install directory for portable drives."; Flags: unchecked
@@ -298,12 +298,12 @@ begin
REDIST := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/vcredist_2015_x64.exe';
REDIST_2013 := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/vcredist_2013_x64.exe';
PERL := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/Perl.5.20.0.x64.msi';
- PY3 := 'https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe';
+ PY3 := 'https://www.python.org/ftp/python/3.14.2/python-3.14.2-amd64.exe';
#else
REDIST := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/vcredist_2015_x86.exe';
REDIST_2013 := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/vcredist_2013_x86.exe';
PERL := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/Perl.5.20.0.x86.msi';
- PY3 := 'https://www.python.org/ftp/python/3.8.10/python-3.8.10.exe';
+ PY3 := 'https://www.python.org/ftp/python/3.14.2/python-3.14.2.exe';
#endif
DOTNET := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/dotnet_40.exe';
SPELL := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/ZoiteChat.Spelling.Dictionaries.r2.exe';
@@ -327,7 +327,7 @@ begin
idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi'))
end;
- if IsComponentSelected('langs\python\python3') and not CheckDLL('python38.dll') then
+ if IsComponentSelected('langs\python\python3') and not CheckDLL('python314.dll') then
idpAddFile(PY3, ExpandConstant('{tmp}\python.exe'));
end;
end;
diff --git a/win32/zoitechat.props b/win32/zoitechat.props
index efa4cf10..3ae6f0b0 100644
--- a/win32/zoitechat.props
+++ b/win32/zoitechat.props
@@ -7,7 +7,7 @@
c:\gtk-build\gtk
c:\gtk-build\gendef
c:\gtk-build\perl-5.20
- c:\gtk-build\python-3.8
+ c:\gtk-build\python-3.14
c:\gtk-build\WinSparkle
@@ -22,7 +22,7 @@
$(YourPerlPath)\$(PlatformName)
perl520
$(YourPython3Path)\$(PlatformName)
- python38
+ python314
hcpython3
$(DepsRoot)\include\luajit-2.1
hclua