dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build/windows: Alternative approach to broken PyGobject bundling (#13170)

Browse source 
Reverts: 093f31dc

My approach avoids bundling build-time deps (that increase about 100MB and
creates expectancy of support of some not-used things like 'Tcl/Tk').

However, this hardcoded approach of mine is more fragile.
This commit is contained in:
Bruno Lopes 2025-03-23 09:15:03 -03:00
parent 7cfb94b1d5
commit d58e69119a
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/windows/2_bundle-gimp-uni_base.sh
View file

@ -183,10 +183,11 @@ if [ -z "$GIMP_UNSTABLE" ]; then
bundle "$MSYSTEM_PREFIX" bin/gspawn*-helper.exe
fi
### Optional binaries for GObject Introspection support
### Optional binaries for GObject Introspection support. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/13170
if [ -z "$QUASI_MSYS2_ROOT" ]; then
bundle "$GIMP_PREFIX" lib/girepository-*
bundle "$MSYSTEM_PREFIX" lib/girepository-*
bundle "$MSYSTEM_PREFIX" lib/libgirepository-*.dll
#FIXME: luajit crashes at startup: See: https://gitlab.gnome.org/GNOME/gimp/-/issues/11597
#bundle "$MSYSTEM_PREFIX" bin/luajit.exe
@ -212,12 +213,12 @@ fi
### Deps (DLLs) of the binaries in 'bin' and 'lib' dirs
echo "Searching for dependencies of $GIMP_DISTRIB/bin in $MSYSTEM_PREFIX and $GIMP_PREFIX"
binArray=($(find "$GIMP_DISTRIB/bin" \( -iname '*.dll' -or -iname '*.exe' -or -iname '*.pyd' \)))
binArray=($(find "$GIMP_DISTRIB/bin" \( -iname '*.dll' -or -iname '*.exe' \)))
for dep in "${binArray[@]}"; do
python3 $GIMP_SOURCE/build/windows/2_bundle-gimp-uni_dep.py $dep $MSYSTEM_PREFIX/ $GIMP_PREFIX/ $GIMP_DISTRIB --output-dll-list done-dll.list;
done
echo "Searching for dependencies of $GIMP_DISTRIB/lib in $MSYSTEM_PREFIX and $GIMP_PREFIX"
libArray=($(find "$GIMP_DISTRIB/lib" \( -iname '*.dll' -or -iname '*.exe' -or -iname '*.pyd' \)))
libArray=($(find "$GIMP_DISTRIB/lib" \( -iname '*.dll' -or -iname '*.exe' \)))
for dep in "${libArray[@]}"; do
python3 $GIMP_SOURCE/build/windows/2_bundle-gimp-uni_dep.py $dep $MSYSTEM_PREFIX/ $GIMP_PREFIX/ $GIMP_DISTRIB --output-dll-list done-dll.list;
done