diff options
Diffstat (limited to 'scripts/deployqtHelper_mac.sh')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 3331e27a2e..d8e729c787 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -23,20 +23,14 @@ if [ -d "$5" ]; then cp -R "$5"/ "$imports2Dir"/ fi -qmlpuppetapp="$1/Contents/MacOS/qmlpuppet.app" +qmlpuppetapp="$1/Contents/MacOS/qmlpuppet" if [ -d "$qmlpuppetapp" ]; then - qmlpuppetArgument="-executable=$qmlpuppetapp/Contents/MacOS/qmlpuppet" - 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" || exit 1 + qmlpuppetArgument="-executable=$qmlpuppetapp" fi -qml2puppetapp="$1/Contents/MacOS/qml2puppet.app" +qml2puppetapp="$1/Contents/MacOS/qml2puppet" if [ -d "$qml2puppetapp" ]; then - qml2puppetArgument="-executable=$qml2puppetapp/Contents/MacOS/qml2puppet" - qml2puppetResources="$1/Contents/MacOS/qml2puppet.app/Contents/Resources" - test -d "$qml2puppetResources" || mkdir -p "$qml2puppetResources" - cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qml2puppetResources/qt.conf" || exit 1 + qml2puppetArgument="-executable=$qml2puppetapp" fi macdeployqt "$1" \ @@ -66,6 +60,6 @@ if [ $LLVM_INSTALL_DIR ]; then if [ ! -f "$_CLANG_CODEMODEL_LIB" ]; then _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib" fi - xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/.." "$_CLANG_CODEMODEL_LIB" || true + xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true fi |