# HG changeset patch # User Chris Cannam # Date 1408010142 -3600 # Node ID f8264ad5737ad23e5709552776f2e8894e60fc09 # Parent dc8270ceb8fc61eef0defc15ffb8456f28619f7c Fix plugin copying (correct target directories) - transplanted from beta branch diff -r dc8270ceb8fc -r f8264ad5737a deploy/osx/copy-qt.sh --- a/deploy/osx/copy-qt.sh Wed Aug 13 22:03:19 2014 +0100 +++ b/deploy/osx/copy-qt.sh Thu Aug 14 10:55:42 2014 +0100 @@ -9,7 +9,7 @@ frameworks="QtCore QtNetwork QtGui QtXml QtWidgets QtPrintSupport" -plugins="qtaccessiblewidgets qdds qgif qicns qico qjp2 qjpeg qmng qtga qtiff qwbmp qwebp qcocoa qminimal" +plugins="taccessiblewidgets dds gif icns ico jp2 jpeg mng tga tiff wbmp webp cocoa minimal offscreen" qtdir=$(grep "Command:" Makefile | head -1 | awk '{ print $3; }' | sed s,/bin/.*,,) @@ -35,13 +35,17 @@ echo echo "Copying plugins..." for plug in $plugins; do - pfile=$(ls "$qtdir"/plugins/*/lib"$plug".dylib) + pfile=$(ls "$qtdir"/plugins/*/libq"$plug".dylib) if [ ! -f "$pfile" ]; then echo "Failed to find plugin $plug, exiting" exit 2 fi - cp -v "$pfile" "$pdir" || exit 2 + target="$pdir"/${pfile##?*plugins/} + tdir=`dirname "$target"` + mkdir -p "$tdir" + cp -v "$pfile" "$target" || exit 2 done echo "Done" +