mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-17 19:35:03 +01:00
Python screens: ship Pillow with the Windows build, and the screen module for Pillow 10+
- The Windows build job installs Pillow into the Python 3.14 whose Lib, with site-packages, CMake copies next to the executable as python64\Lib, as the Linux job already does; the README says the same for a local build. - Both build jobs copy staticFiles/python/local (the Python 3 version of the module every cab screen subclasses) into python/local of the build. - The module puts back what Pillow 10 removed and the screen scripts use: ImageFont.getsize() and ImageDraw.textsize() on top of getbbox() / textbbox(), and Image.ANTIALIAS as LANCZOS. With an older Pillow nothing changes. Part of #300.
This commit is contained in:
25
.github/workflows/build_bin.yml
vendored
25
.github/workflows/build_bin.yml
vendored
@@ -45,6 +45,15 @@ jobs:
|
||||
python-version: "3.14"
|
||||
architecture: "x64"
|
||||
|
||||
# the cab screens are drawn with Pillow; CMake copies this Python's Lib, site-packages included, next to the
|
||||
# executable as python64\Lib, so Pillow has to be installed here to come with the build (as on Linux)
|
||||
- name: Install Pillow for the screens
|
||||
shell: pwsh
|
||||
run: |
|
||||
$pythonExe = "${{ steps.python.outputs.python-path }}"
|
||||
& $pythonExe -m pip install --no-cache-dir Pillow
|
||||
& $pythonExe -c "from PIL import Image; print('Pillow:', Image.__version__)"
|
||||
|
||||
- name: Show environment
|
||||
shell: pwsh
|
||||
run: |
|
||||
@@ -114,6 +123,18 @@ jobs:
|
||||
-Recurse `
|
||||
-Force
|
||||
|
||||
# the Python 3 version of the module every cab screen builds on; the game data still has the Python 2 one
|
||||
New-Item `
|
||||
-ItemType Directory `
|
||||
-Force `
|
||||
-Path "$output/python/local" | Out-Null
|
||||
|
||||
Copy-Item `
|
||||
-Path "staticFiles/python/local/*" `
|
||||
-Destination "$output/python/local" `
|
||||
-Recurse `
|
||||
-Force
|
||||
|
||||
- name: Upload Windows build
|
||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||
with:
|
||||
@@ -251,9 +272,11 @@ jobs:
|
||||
|
||||
- name: Copy shaders and translations
|
||||
run: |
|
||||
mkdir -p build/bin/shaders build/bin/lang
|
||||
mkdir -p build/bin/shaders build/bin/lang build/bin/python/local
|
||||
cp -R shaders/. build/bin/shaders/
|
||||
cp -R lang/. build/bin/lang/
|
||||
# the Python 3 version of the module every cab screen builds on; the game data still has the Python 2 one
|
||||
cp -R staticFiles/python/local/. build/bin/python/local/
|
||||
|
||||
- name: Upload Linux build
|
||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||
|
||||
Reference in New Issue
Block a user