From a87a4a7ef1fd4ebbe9ea3b8125eb3b07c582acab Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Mon, 1 Aug 2016 22:36:56 +0200
Subject: [PATCH] Install crashpad binaries

refs #490
---
 install.pri                                  | 15 ++++++++++-----
 installer/installbuilder/swift-externals.xml | 14 ++++++++++++++
 mkspecs/features/common_post.prf             |  2 +-
 mkspecs/features/common_pre.prf              | 14 ++++++++++----
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/install.pri b/install.pri
index 6c3ea5226..822002ddc 100644
--- a/install.pri
+++ b/install.pri
@@ -230,10 +230,10 @@ win32-g++ {
 
 ############### Install externals ##############
 
-win32: externals_target.path = $${PREFIX}/bin
-else: externals_target.path = $${PREFIX}/lib
-!win32-g++: externals_target.files *= $${EXTERNALSDIR}/*.$${QMAKE_EXTENSION_SHLIB}
-INSTALLS += externals_target
+win32: externals_lib_target.path = $${PREFIX}/bin
+else: externals_lib_target.path = $${PREFIX}/lib
+!win32-g++: externals_lib_target.files *= $${EXTERNALS_LIB_DIR}/*.$${QMAKE_EXTENSION_SHLIB}
+INSTALLS += externals_lib_target
 
 # win32-g++ needs a workaround since copy does not accept a filepath with '+' in it
 # we also need to make it dependent on vc_runtime_target since this target has no
@@ -241,12 +241,17 @@ INSTALLS += externals_target
 win32-g++ {
     vc_runtime_target.depends += copy_externals
     copy_externals.target = copy_externals
-    source_path = $${EXTERNALSDIR}//*.dll
+    source_path = $${EXTERNALS_LIB_DIR}//*.dll
     dest_path = $${externals_target.path}
     copy_externals.commands += xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) $$escape_expand(\n\t)
     QMAKE_EXTRA_TARGETS += copy_externals
 }
 
+win32: externals_bin_target.path = $${PREFIX}/bin
+else: externals_bin_target.path = $${PREFIX}/bin
+!win32-g++: externals_bin_target.files *= $${EXTERNALS_BIN_DIR}/*
+INSTALLS += externals_bin_target
+
 ############### Installbuilder ##############
 
 bitrock_customize_bin = $$(BITROCK_CUSTOMIZE)
diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
index 3675bb569..9e140dd32 100644
--- a/installer/installbuilder/swift-externals.xml
+++ b/installer/installbuilder/swift-externals.xml
@@ -35,6 +35,20 @@
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/*opus*.dll</origin>
                 </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/bin/swift_crashpad_handler.exe</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
+        <folder>
+            <description>bin</description>
+            <destination>${installdir}/bin</destination>
+            <name>bin_osx</name>
+            <platforms>osx</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/bin/swift_crashpad_handler</origin>
+                </distributionFile>
             </distributionFileList>
         </folder>
         <folder>
diff --git a/mkspecs/features/common_post.prf b/mkspecs/features/common_post.prf
index d4ad994b0..fec69d283 100644
--- a/mkspecs/features/common_post.prf
+++ b/mkspecs/features/common_post.prf
@@ -16,7 +16,7 @@ equals (TEMPLATE, app) {
 
     # Add rpath to externals to run tests without installing.
     # DYLD_LIBRARY_PATH isn't working anymore since OS X 10.11.
-    unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'$$EXTERNALSDIR\''
+    unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'$$EXTERNALS_LIB_DIR\''
 
     macx {
         contains(CONFIG, app_bundle): QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../../../../lib/
diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf
index 471763772..cc5413103 100644
--- a/mkspecs/features/common_pre.prf
+++ b/mkspecs/features/common_pre.prf
@@ -126,11 +126,17 @@ INCLUDEPATH *= $$EXTERNALSROOT/$$basename(QMAKESPEC)/include
 INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad
 INCLUDEPATH *= $$EXTERNALSROOT/common/include/mini_chromium
 
-equals(WORD_SIZE,64): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
-equals(WORD_SIZE,32): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
+equals(WORD_SIZE,64) {
+    EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/bin64
+    EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
+}
+equals(WORD_SIZE,32) {
+    EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/bin32
+    EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
+}
 
-LIBS *= -L$$EXTERNALSDIR
-macx: LIBS *= -F$$EXTERNALSDIR
+LIBS *= -L$$EXTERNALS_LIB_DIR
+macx: LIBS *= -F$$EXTERNALS_LIB_DIR
 win32: LIBS *= -luser32
 
 INCLUDEPATH *= $$EXTERNALDIR/common/include