mirror of https://github.com/GNOME/gimp.git
build: MSYS2 python package is now Python 3.9.
The MSYS2 package got recently bumped from 3.8 to 3.9.6. At first I wanted to update our packaging and installer scripts to be more generic using glob patterns (so that they should work now and should continue to work even if bumping to a higher minor version in the future). Unfortunately this would work for `package-gimp-msys2.sh` but in `files.isi`, it would only work for `libpython3.*.dll`, not for the python3.9/ folder. InnoSetup apparently doesn't support using a folder as source (or maybe just a folder with glob like `python3.*`) as it resulted in a "No files found matching" error. So leave everything with the accurate version (because anyway it's much better to get an early failure than only at the very last step).
This commit is contained in:
parent
bd71814e8b
commit
681d8e7454
|
@ -101,7 +101,7 @@ cp -fr ${GIMP_PREFIX}/lib/gio ${GIMP_DISTRIB}/lib/
|
|||
cp -fr ${MSYS_PREFIX}/lib/gdk-pixbuf-2.0 ${GIMP_DISTRIB}/lib/
|
||||
cp -fr ${GIMP_PREFIX}/lib/gtk-3.0 ${GIMP_DISTRIB}/lib/
|
||||
|
||||
cp -fr ${MSYS_PREFIX}/lib/python3.8 ${GIMP_DISTRIB}/lib/
|
||||
cp -fr ${MSYS_PREFIX}/lib/python3.9 ${GIMP_DISTRIB}/lib/
|
||||
|
||||
cp -fr ${MSYS_PREFIX}/share/ghostscript ${GIMP_DISTRIB}/share/
|
||||
cp -fr ${GIMP_PREFIX}/share/glib-2.0 ${GIMP_DISTRIB}/share/
|
||||
|
@ -230,7 +230,7 @@ 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}/ ${GIMP_DISTRIB}
|
||||
python3 build/windows/gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/libgirepository-1.0-1.dll ${MSYS_PREFIX}/ ${GIMP_DISTRIB}
|
||||
|
||||
for dll in ${GIMP_DISTRIB}/lib/python3.8/site-packages/*/*.dll; do
|
||||
for dll in ${GIMP_DISTRIB}/lib/python3.9/site-packages/*/*.dll; do
|
||||
python3 build/windows/gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
|
||||
python3 build/windows/gitlab-ci/dll_link.py $dll ${MSYS_PREFIX}/ ${GIMP_DISTRIB};
|
||||
done
|
||||
|
|
|
@ -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.8.dll"; DestDir: "{app}\bin"; Components: py and gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
|
||||
Source: "{#DEPS_DIR}\{#DDIR}\lib\python3.8\*"; DestDir: "{app}\lib\python3.8"; Components: py and gimp{#PLATFORM}; Flags: recursesubdirs 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
|
||||
#endif
|
||||
|
||||
#ifdef LUA
|
||||
|
|
Loading…
Reference in New Issue