From acda46616b85883fa0c1fe3f60f2fd680fd179c8 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Tue, 28 Oct 2014 17:34:36 +0100
Subject: [PATCH] OS X: Avoid running macdeployqt twice and add more deploy
debug output
Change-Id: I0d1c46fcf7b05fc6673f0eddbfcc95490a46c4cd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
scripts/deployqtHelper_mac.sh | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh
index ccd1711c4d3..85f7a080c53 100755
--- a/scripts/deployqtHelper_mac.sh
+++ b/scripts/deployqtHelper_mac.sh
@@ -56,6 +56,7 @@ fi
# copy libclang if needed
if [ $LLVM_INSTALL_DIR ]; then
if [ "$LLVM_INSTALL_DIR"/lib/libclang.dylib -nt "$1/Contents/PlugIns"/libclang.dylib ]; then
+ echo "- Copying libclang"
cp -f "$LLVM_INSTALL_DIR"/lib/libclang.dylib "$1/Contents/PlugIns/" || exit 1
cp -Rf "$LLVM_INSTALL_DIR"/lib/clang "$1/Contents/Resources/cplusplus/" || exit 1
fi
@@ -68,19 +69,22 @@ if [ $LLVM_INSTALL_DIR ]; then
fi
#### macdeployqt
-qmlpuppetapp="$1/Contents/MacOS/qmlpuppet"
-if [ -f "$qmlpuppetapp" ]; then
- qmlpuppetArgument="-executable=$qmlpuppetapp"
-fi
-qml2puppetapp="$1/Contents/MacOS/qml2puppet"
-if [ -f "$qml2puppetapp" ]; then
- qml2puppetArgument="-executable=$qml2puppetapp"
-fi
+if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then
-echo "- Running macdeployqt"
+ qmlpuppetapp="$1/Contents/MacOS/qmlpuppet"
+ if [ -f "$qmlpuppetapp" ]; then
+ qmlpuppetArgument="-executable=$qmlpuppetapp"
+ fi
-macdeployqt "$1" \
+ qml2puppetapp="$1/Contents/MacOS/qml2puppet"
+ if [ -f "$qml2puppetapp" ]; then
+ qml2puppetArgument="-executable=$qml2puppetapp"
+ fi
+
+ echo "- Running macdeployqt ($(which macdeployqt))"
+
+ macdeployqt "$1" \
"-executable=$1/Contents/Resources/qtpromaker" \
"-executable=$1/Contents/Resources/sdktool" \
"-executable=$1/Contents/Resources/ios/iostool" \
@@ -88,3 +92,4 @@ macdeployqt "$1" \
"-executable=$1/Contents/Resources/ios/iossim_1_8_2" \
"$qmlpuppetArgument" "$qml2puppetArgument" || exit 1
+fi
--
GitLab