Merge pull request #927 from debris/mixonosx

mix on osx

cmake/EthExecutableHelper.cmake

@@ -71,8 +71,9 @@ macro(eth_install_executable EXECUTABLE)
 	if (APPLE)
 		# First have qt5 install plugins and frameworks
 		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND ${MACDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app ${eth_qml_dir}
+			COMMAND ${MACDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app -executable=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents/MacOS/${EXECUTABLE} ${eth_qml_dir}
 			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+			COMMAND sh ${CMAKE_SOURCE_DIR}/macdeployfix.sh ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents
 		)
 			
 		# This tool and next will inspect linked libraries in order to determine which dependencies are required
@@ -82,19 +83,11 @@ macro(eth_install_executable EXECUTABLE)
 			set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/\$ENV{CONFIGURATION}/${EXECUTABLE}.app")
 		endif ()
 
-		# TODO check, how fixup_bundle works and if it is required
 		install(CODE "
 			include(BundleUtilities)
 			set(BU_CHMOD_BUNDLE_ITEMS 1)
-			fixup_bundle(\"${APP_BUNDLE_PATH}\" \"${BUNDLELIBS}\" \"../libqethereum ../libethereum ../secp256k1\")
+			verify_app(\"${APP_BUNDLE_PATH}\")
 			" COMPONENT RUNTIME )
-		# Cleanup duplicate libs from macdeployqt
-		install(CODE "
-			file(GLOB LINGER_RM \"${APP_BUNDLE_PATH}/Contents/Frameworks/*.dylib\")
-			if (LINGER_RM)
-				file(REMOVE \${LINGER_RM})
-			endif ()
-		")
 	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 
 		# copy all dlls to executable directory

macdeployfix.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# solves problem with macdeployqt on Qt 5.4 RC
+# http://qt-project.org/forums/viewthread/50118
+
+BUILD_FOLDER_PATH=$1
+BUILD_QML_FOLDER_PATH="$BUILD_FOLDER_PATH/Resources/qml"
+BUILD_PLUGINS_FOLDER_PATH="$BUILD_FOLDER_PATH/PlugIns"
+
+if [ ! -d ${BUILD_QML_FOLDER_PATH} ]; then
+    # we are not using any qml files
+    # gracefully exit
+    exit 0
+fi
+
+declare -a BROKEN_FILES;
+k=0;
+for j in $(find ${BUILD_QML_FOLDER_PATH} -name *.dylib); do
+	BROKEN_FILES[${k}]=$j
+	
+	((k=k+1))
+done
+
+
+for i in "${BROKEN_FILES[@]}"; do
+	REPLACE_STRING="$BUILD_FOLDER_PATH/"
+	APP_CONTENT_FILE=${i//$REPLACE_STRING/""}
+	IFS='/' read -a array <<< "$APP_CONTENT_FILE"
+	LENGTH=${#array[@]}
+	LAST_ITEM_INDEX=$((LENGTH-1))
+	FILE=${array[${LENGTH} - 1]}
+	
+	ORIGINE_PATH=$(find ${BUILD_PLUGINS_FOLDER_PATH} -name ${FILE})
+	ORIGINE_PATH=${ORIGINE_PATH//$REPLACE_STRING/""}
+	s=""
+	for((l=0;l<${LAST_ITEM_INDEX};l++)) do
+		s=$s"../"
+	done
+	s=$s$ORIGINE_PATH
+	echo "s: $s"
+	
+	REMOVE_BROKEN_ALIAS=$(rm -rf $i)
+	RESULT=$(ln -s $s $i)
+done
+

mix/qml/main.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.1
+import QtQuick.PrivateWidgets 1.1
 import Qt.labs.settings 1.0
 import org.ethereum.qml.QEther 1.0