From 379567e80c50e430b0e606e2695ce2f9408ccb53 Mon Sep 17 00:00:00 2001 From: a1ext Date: Fri, 23 Nov 2018 19:36:43 +0300 Subject: [PATCH] MAC Build: fixed problem when you cannot open Cutter on MacOS due to missing Frameworks (#957) --- .travis.yml | 4 +--- src/macos/Cutter | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100755 src/macos/Cutter diff --git a/.travis.yml b/.travis.yml index ab2436f6..d5d5745a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,9 +72,7 @@ script: after_success: - export CUTTER_VERSION=$(python ../scripts/get_version.py) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - mv Cutter.app/Contents/MacOS/Cutter Cutter.app/Contents/MacOS/Cutter.bin && - cp ../src/macos/Cutter Cutter.app/Contents/MacOS/Cutter && chmod +x Cutter.app/Contents/MacOS/Cutter && - macdeployqt Cutter.app -executable=Cutter.app/Contents/MacOS/Cutter && + macdeployqt Cutter.app -executable=Cutter.app/Contents/MacOS/Cutter -libpath="../Frameworks" && "$TRAVIS_BUILD_DIR/scripts/appbundle_embed_python.sh" "$PYTHON_FRAMEWORK_DIR/Python.framework" Cutter.app Cutter.app/Contents/MacOS/Cutter && mkdir -p Cutter.app/Contents/Resources/r2/share && cp -a /usr/local/share/radare2 Cutter.app/Contents/Resources/r2/share/ && diff --git a/src/macos/Cutter b/src/macos/Cutter deleted file mode 100755 index 65a40291..00000000 --- a/src/macos/Cutter +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -echo "Cutter Launch Script for macOS" - -EXECDIR=$(dirname "$0") -export DYLD_LIBRARY_PATH="$EXECDIR/../Frameworks" -export DYLD_FRAMEWORK_PATH="$EXECDIR/../Frameworks" -"$EXECDIR/Cutter.bin" "$@"