From 7cbd24dd2f99c160b0e4c9765783b2294caca6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Thu, 11 Aug 2022 14:49:23 +0200 Subject: Bundle a fuller installation of Perl/ExifTool wperl is necessary to get rid of the console window, which is merely one of several issues with the PAR Packer-based ExifTool bundle used in the last commit. The Perl installation could be heavily trimmed down, but it seems to require a very manual process. --- msys2-cross-install.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'msys2-cross-install.sh') diff --git a/msys2-cross-install.sh b/msys2-cross-install.sh index b98a227..7cbc2cc 100755 --- a/msys2-cross-install.sh +++ b/msys2-cross-install.sh @@ -3,15 +3,17 @@ export LC_ALL=C cd "$MESON_INSTALL_DESTDIR_PREFIX" msys2_root=$1 -# Copy libraries we depend on, and a few files required by GLib/GTK+. -cp -p "$msys2_root"/bin/exiftool.exe . +# Copy binaries we directly or indirectly depend on. cp -p "$msys2_root"/bin/*.dll . +cp -p "$msys2_root"/bin/wperl.exe . +cp -p "$msys2_root"/bin/exiftool . # The console helper is only useful for debug builds. cp -p "$msys2_root"/bin/gspawn-*-helper*.exe . cp -pR "$msys2_root"/etc/ . mkdir -p lib cp -pR "$msys2_root"/lib/gdk-pixbuf-2.0/ lib +cp -pR "$msys2_root"/lib/perl5/ lib mkdir -p share/glib-2.0/schemas cp -pR "$msys2_root"/share/glib-2.0/schemas/*.Settings.* share/glib-2.0/schemas mkdir -p share @@ -36,8 +38,7 @@ awk 'function whitelist(binary) { orphans[$0]++ while (("find . -type f -path \"./*.[Ee][Xx][Ee]\"" | getline) > 0) whitelist($0) - while (("find ./lib/gdk-pixbuf-2.0 -type f " \ - "-path \"./*.[Dd][Ll][Ll]\"" | getline) > 0) + while (("find ./lib -type f -path \"./*.[Dd][Ll][Ll]\"" | getline) > 0) whitelist($0) for (library in orphans) print library -- cgit v1.2.3