From 351d07a7f79049a92a35feb588f13a571d6d1c89 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sat, 3 Dec 2022 08:52:31 +0300 Subject: fixup: bundle Gtk+ Win32 pixbuf loader DLLs into the package root * mingw-bundledlls apparently does not output MinGW-friendly filenames, so we cannot use it to bundle files into a directory differing from the executable's directory. --- .github/workflows/nightly.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 39865ed..14635c6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -304,14 +304,12 @@ jobs: # FIXME: It's possible to change the location of loaders.cache via $GDK_PIXBUF_MODULE_FILE. # If we did that, we could avoid "reusing" the lib/ directory. # This is important when somebody changes $SCITECOPATH. + cp /mingw32/lib/gdk-pixbuf-2.0/2.10.0/loaders/{libpixbufloader-svg.dll,libpixbufloader-png.dll} . + # Collect DLLs for all pixbuf loaders into the root directory + for f in libpixbufloader-*.dll; do ../contrib/mingw-bundledlls --copy $f; done mkdir -p lib/gdk-pixbuf-2.0/2.10.0/loaders/ - cp /mingw32/lib/gdk-pixbuf-2.0/2.10.0/loaders/{libpixbufloader-svg.dll,libpixbufloader-png.dll} \ - lib/gdk-pixbuf-2.0/2.10.0/loaders/ + mv libpixbufloader-*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders/ cp ../win32/loaders.cache lib/gdk-pixbuf-2.0/2.10.0/ - # Collect DLLs for all pixbuf loaders into the root directory - for f in lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; do - cp `../contrib/mingw-bundledlls $f` . - done zip -9 -r ../sciteco-gtk3_nightly_win32.zip . - name: Archive Windows Distribution (GTK+ 3) uses: pyTooling/Actions/releaser/composite@v0.4.5 -- cgit v1.2.3