diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-12-10 11:40:12 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-12-10 13:53:02 +0100 |
| commit | 89dc3eebd0d1b7e57be96d5455a536f3d8ed2585 (patch) | |
| tree | 25b3d26adada93e94c7c1b1598cbf6a33c8d87af /scripts/deployqtHelper_mac.sh | |
| parent | 8c4d86d174c70de0ffa696ef42234ca6b945f3f9 (diff) | |
Fix deployment of designer plugins.
Task-number: QTCREATORBUG-8256
Change-Id: I9b03debf9c4c918968fcdfd49078218b54a3b09f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'scripts/deployqtHelper_mac.sh')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 5bfb106afc..d9891050df 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -1,15 +1,24 @@ #!/bin/bash -[ $# -lt 2 ] && echo "Usage: $(basename $0) <app folder> <qt translations folder>" && exit 2 +[ $# -lt 3 ] && echo "Usage: $(basename $0) <app folder> <qt translations folder> <qt plugin folder>" && exit 2 [ $(uname -s) != "Darwin" ] && echo "Run this script on Mac OS X" && exit 2; +# collect designer plugins +designerDestDir="$1/Contents/PlugIns/designer" +test -d "$designerDestDir" || mkdir -p "$designerDestDir" +for plugin in "$3"/designer/*.dylib; do + cp "$plugin" "$designerDestDir"/ || exit 1 + pluginbase=`basename "$plugin"` + designerPluginArguments+="\"-executable=$designerDestDir/$pluginbase\" " +done + macdeployqt "$1" \ "-executable=$1/Contents/MacOS/qmlpuppet.app/Contents/MacOS/qmlpuppet" \ "-executable=$1/Contents/Resources/qtpromaker" \ - "-executable=$1/Contents/Resources/sdktool" || exit 1 + "-executable=$1/Contents/Resources/sdktool" $designerPluginArguments || exit 1 qmlpuppetResources="$1/Contents/MacOS/qmlpuppet.app/Contents/Resources" test -d "$qmlpuppetResources" || mkdir -p "$qmlpuppetResources" -cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf" +cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf" || exit 1 # copy Qt translations -cp "$2"/qt_*.qm "$1/Contents/Resources/translations/" +cp "$2"/qt_*.qm "$1/Contents/Resources/translations/" || exit 1 |