ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-31 08:37:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix macOS builds and disable QtWebEngine for builds (Fix #689, Fix #629) (#748)

Browse Source 
* Fix Info.plist and disable QtWebEngine for builds

* Add CFBundleShortVersionString to Info.plist
This commit is contained in:
Florian Märkl 2018-10-02 12:54:23 +02:00 committed by GitHub
parent ffb7588e90
commit 0e4930c603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -55,13 +55,13 @@ script:
- cd build - cd build
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ "$BUILD_SYSTEM" == "qmake" ]]; 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 elif [[ "$BUILD_SYSTEM" == "qmake" ]]; then
cmake ../src && make -j4; cmake ../src && make -j4;
fi fi
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if [[ "$BUILD_SYSTEM" == "qmake" ]]; 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; make -j4;
elif [[ "$BUILD_SYSTEM" == "qmake" ]]; then elif [[ "$BUILD_SYSTEM" == "qmake" ]]; then
cmake ../src && make -j4; cmake ../src && make -j4;
@ -70,8 +70,8 @@ script:
after_success: after_success:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
macdeployqt Cutter.app && cp ../src/macos/Cutter.sh Cutter.app/Contents/MacOS/Cutter.sh && chmod +x Cutter.app/Contents/MacOS/Cutter.sh &&
"$TRAVIS_BUILD_DIR/scripts/appbundle_patch_qtwebengine.sh" Cutter.app && 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 && "$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 && mkdir -p Cutter.app/Contents/Resources/r2/share &&
cp -a /usr/local/share/radare2 Cutter.app/Contents/Resources/r2/share/ && cp -a /usr/local/share/radare2 Cutter.app/Contents/Resources/r2/share/ &&

4
src/Cutter.pro
View File

@ -60,7 +60,9 @@ win32 {
macx { macx {
QMAKE_CXXFLAGS = -mmacosx-version-min=10.7 -std=gnu0x -stdlib=libc++ 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) { unix:exists(/usr/local/include/libr) {

8
src/macos/Cutter.sh Executable file
View File

@ -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" "$@"

18
src/apple/Info.plist → src/macos/Info.plist
View File

@ -2,20 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDisplayName</key>
<string>Cutter</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string> <string>Cutter.sh</string>
<key>CFBundleGetInfoString</key> <key>CFBundleVersion</key>
<string>Created by Qt/QMake</string> <string>@FULL_VERSION@</string>
<key>CFBundleShortVersionString</key>
<string>@FULL_VERSION@</string>
<key>NSHumanReadableCopyright</key>
<string>Licensed under the GPLv3 by the Cutter developers.</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>@ICON@</string> <string>@ICON@</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>@BUNDLEIDENTIFIER@</string> <string>org.radare.cutter</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<key>NOTE</key>
<string>This file was generated by Qt/QMake.</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>NSApplication</string> <string>NSApplication</string>
<key>NSSupportsAutomaticGraphicsSwitching</key> <key>NSSupportsAutomaticGraphicsSwitching</key>