diff --git a/.travis.yml b/.travis.yml index 9e0f650c..ab87ea68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,13 +55,13 @@ script: - cd build - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "$BUILD_SYSTEM" == "qmake" ]]; then - PKG_CONFIG_PATH="$CUSTOM_PYTHON_PREFIX/lib/pkgconfig" qmake CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=true PREFIX=/usr APPIMAGE=1 ../src && make -j4; + PKG_CONFIG_PATH="$CUSTOM_PYTHON_PREFIX/lib/pkgconfig" qmake CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=false PREFIX=/usr APPIMAGE=1 ../src && make -j4; elif [[ "$BUILD_SYSTEM" == "qmake" ]]; then cmake ../src && make -j4; fi elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$BUILD_SYSTEM" == "qmake" ]]; then - qmake CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=true CUTTER_BUNDLE_R2_APPBUNDLE=true PYTHON_FRAMEWORK_DIR=$PYTHON_FRAMEWORK_DIR ../src && + qmake CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=false CUTTER_BUNDLE_R2_APPBUNDLE=true PYTHON_FRAMEWORK_DIR=$PYTHON_FRAMEWORK_DIR ../src && make -j4; elif [[ "$BUILD_SYSTEM" == "qmake" ]]; then cmake ../src && make -j4; @@ -69,9 +69,9 @@ script: fi after_success: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - macdeployqt Cutter.app && - "$TRAVIS_BUILD_DIR/scripts/appbundle_patch_qtwebengine.sh" Cutter.app && + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + cp ../src/macos/Cutter.sh Cutter.app/Contents/MacOS/Cutter.sh && chmod +x Cutter.app/Contents/MacOS/Cutter.sh && + macdeployqt Cutter.app -executable=Cutter.app/Contents/MacOS/Cutter && "$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/Cutter.pro b/src/Cutter.pro index 1387a2b6..400e8eaa 100644 --- a/src/Cutter.pro +++ b/src/Cutter.pro @@ -60,7 +60,9 @@ win32 { macx { QMAKE_CXXFLAGS = -mmacosx-version-min=10.7 -std=gnu0x -stdlib=libc++ - QMAKE_INFO_PLIST = apple/Info.plist + QMAKE_TARGET_BUNDLE_PREFIX = org.radare + QMAKE_BUNDLE = cutter + QMAKE_INFO_PLIST = macos/Info.plist } unix:exists(/usr/local/include/libr) { diff --git a/src/macos/Cutter.sh b/src/macos/Cutter.sh new file mode 100755 index 00000000..169a7934 --- /dev/null +++ b/src/macos/Cutter.sh @@ -0,0 +1,8 @@ +#!/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" "$@" diff --git a/src/apple/Info.plist b/src/macos/Info.plist similarity index 84% rename from src/apple/Info.plist rename to src/macos/Info.plist index 4e9c1c60..57c4caec 100644 --- a/src/apple/Info.plist +++ b/src/macos/Info.plist @@ -2,20 +2,22 @@ + CFBundleDisplayName + Cutter CFBundleExecutable - @EXECUTABLE@ - CFBundleGetInfoString - Created by Qt/QMake + Cutter.sh + CFBundleVersion + @FULL_VERSION@ + CFBundleShortVersionString + @FULL_VERSION@ + NSHumanReadableCopyright + Licensed under the GPLv3 by the Cutter developers. CFBundleIconFile @ICON@ CFBundleIdentifier - @BUNDLEIDENTIFIER@ + org.radare.cutter CFBundlePackageType APPL - CFBundleSignature - @TYPEINFO@ - NOTE - This file was generated by Qt/QMake. NSPrincipalClass NSApplication NSSupportsAutomaticGraphicsSwitching