feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

OS X: Avoid running macdeployqt twice and add more deploy debug output

Browse Source 
Change-Id: I0d1c46fcf7b05fc6673f0eddbfcc95490a46c4cd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2014-10-28 17:34:36 +01:00
parent 4958e981a0
commit acda46616b
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/deployqtHelper_mac.sh
View File

@@ -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