[gimp] build:windows: migrate to Python3.10 on MSYS
- From: Daniel Novomeský <dnovomesky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build:windows: migrate to Python3.10 on MSYS
- Date: Fri, 24 Jun 2022 15:57:20 +0000 (UTC)
commit 1c50e60e9cf0dd891be1a8ab7dc4722d79693328
Author: lloyd konneker <konnekerl gmail com>
Date: Thu Jun 23 07:43:53 2022 -0400
build:windows: migrate to Python3.10 on MSYS
Evidently MSYS no longer has 3.9, see recent pipeline failures.
Note reports of issues with meson on 3.10, but it might not impact this build.
build/windows/gitlab-ci/package-gimp-msys2.sh | 4 ++--
build/windows/installer/files.isi | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index ccbf55cf7c..9abc3ca991 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -105,7 +105,7 @@ cp -fr ${MSYS_PREFIX}/lib/gio ${GIMP_DISTRIB}/lib/
cp -fr ${MSYS_PREFIX}/lib/gdk-pixbuf-2.0 ${GIMP_DISTRIB}/lib/
cp -fr ${MSYS_PREFIX}/lib/gtk-3.0 ${GIMP_DISTRIB}/lib/
-cp -fr ${MSYS_PREFIX}/lib/python3.9 ${GIMP_DISTRIB}/lib/
+cp -fr ${MSYS_PREFIX}/lib/python3.10 ${GIMP_DISTRIB}/lib/
cp -fr ${MSYS_PREFIX}/share/ghostscript ${GIMP_DISTRIB}/share/
cp -fr ${MSYS_PREFIX}/share/glib-2.0 ${GIMP_DISTRIB}/share/
@@ -216,6 +216,6 @@ done
cp -fr ${MSYS_PREFIX}/bin/libgirepository-1.0-1.dll ${GIMP_DISTRIB}/bin/
python3 build/windows/gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/libgirepository-1.0-1.dll ${GIMP_PREFIX}/
${MSYS_PREFIX}/ ${GIMP_DISTRIB} --output-dll-list done-dll.list
-for dll in ${GIMP_DISTRIB}/lib/python3.9/site-packages/*/*.dll; do
+for dll in ${GIMP_DISTRIB}/lib/python3.10/site-packages/*/*.dll; do
python3 build/windows/gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${MSYS_PREFIX}/ ${GIMP_DISTRIB}
--output-dll-list done-dll.list;
done
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index bec807f018..003a219259 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -48,8 +48,8 @@ Source: "{#DEPS_DIR}\{#DDIR}\lib\gio\*.dll"; DestDir: "{app}\lib\gio"; Component
#ifdef PYTHON
Source: "{#DEPS_DIR}\{#DDIR}\bin\python3w.exe"; DestDir: "{app}\bin"; DestName: "pythonw.exe"; Components:
py and gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
Source: "{#DEPS_DIR}\{#DDIR}\bin\python3.exe"; DestDir: "{app}\bin"; DestName: "python.exe"; Components: py
and gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
-Source: "{#DEPS_DIR}\{#DDIR}\bin\libpython3.9.dll"; DestDir: "{app}\bin"; Components: py and
gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
-Source: "{#DEPS_DIR}\{#DDIR}\lib\python3.9\*"; DestDir: "{app}\lib\python3.9"; Components: py and
gimp{#PLATFORM}; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
+Source: "{#DEPS_DIR}\{#DDIR}\bin\libpython3.10.dll"; DestDir: "{app}\bin"; Components: py and
gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
+Source: "{#DEPS_DIR}\{#DDIR}\lib\python3.10\*"; DestDir: "{app}\lib\python3.10"; Components: py and
gimp{#PLATFORM}; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
#endif
#ifdef LUA
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]