diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-30 11:11:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-05 12:34:35 +0000 |
| commit | e41f71caac659e7a516cda5702a0f0d11a78fc38 (patch) | |
| tree | 8c118c66305d9a983bf7c47c3de04cf7cd0a1fbd /scripts | |
| parent | 48432161926332a15efa3479c6cad73d825aaddb (diff) | |
macOS deploy: Remove debug folders from deployed Qt and deploy qbs on demand
Change-Id: I2cd60da041c580e6599d867f1a95c2f868f4a800
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 689bd407d7..8844f8502d 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -77,6 +77,7 @@ if [ -d "$quick1_src" ]; then echo "- Copying Qt Quick 1 imports" mkdir -p "$importsDir" cp -R "$quick1_src"/ "$importsDir"/ + find "$importsDir" -path "*.dylib.dSYM*" -delete fi fi @@ -87,6 +88,7 @@ if [ -d "$quick2_src" ]; then echo "- Copying Qt Quick 2 imports" mkdir -p "$imports2Dir" cp -R "$quick2_src"/ "$imports2Dir"/ + find "$imports2Dir" -path "*.dylib.dSYM*" -delete fi fi @@ -159,6 +161,17 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then fi qbsapp="$app_path/Contents/MacOS/qbs" + if [ -f "$qbsapp" ]; then + qbsArguments=("-executable=$qbsapp" \ + "-executable=$qbsapp-config" \ + "-executable=$qbsapp-config-ui" \ + "-executable=$qbsapp-qmltypes" \ + "-executable=$qbsapp-setup-android" \ + "-executable=$qbsapp-setup-qt" \ + "-executable=$qbsapp-setup-toolchains" \ + "-executable=$qbsapp-create-project" \ + "-executable=$libexec_path/qbs_processlauncher") + fi echo "- Running macdeployqt ($bin_src/macdeployqt)" @@ -169,15 +182,7 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then "-executable=$libexec_path/ios/iostool" \ "-executable=$libexec_path/buildoutputparser" \ "-executable=$libexec_path/cpaster" \ - "-executable=$libexec_path/qbs_processlauncher" \ - "-executable=$qbsapp" \ - "-executable=$qbsapp-config" \ - "-executable=$qbsapp-config-ui" \ - "-executable=$qbsapp-qmltypes" \ - "-executable=$qbsapp-setup-android" \ - "-executable=$qbsapp-setup-qt" \ - "-executable=$qbsapp-setup-toolchains" \ - "-executable=$qbsapp-create-project" \ + "${qbsArguments[@]}" \ "$qml2puppetArgument" \ "$clangbackendArgument" "$clangpchmanagerArgument" "$clangrefactoringArgument" || exit 1 |