ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-21 22:23:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Bundle r2dec into macOS Builds (#2033)

Browse Source
This commit is contained in:
Florian Märkl 2020-01-24 21:15:34 +01:00 committed by GitHub
parent 14f830dd81
commit 7b83bbf07b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -206,6 +206,7 @@ after_success:
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/ &&
"$TRAVIS_BUILD_DIR/scripts/r2ghidra.sh" -DCMAKE_INSTALL_PREFIX="`pwd`/Cutter.app/Contents/Resources/r2" -DBUILD_CUTTER_PLUGIN=ON -DCUTTER_INSTALL_PLUGDIR="`pwd`/Cutter.app/Contents/Resources/plugins/native" -DCUTTER_SOURCE_DIR="$TRAVIS_BUILD_DIR" && "$TRAVIS_BUILD_DIR/scripts/r2ghidra.sh" -DCMAKE_INSTALL_PREFIX="`pwd`/Cutter.app/Contents/Resources/r2" -DBUILD_CUTTER_PLUGIN=ON -DCUTTER_INSTALL_PLUGDIR="`pwd`/Cutter.app/Contents/Resources/plugins/native" -DCUTTER_SOURCE_DIR="$TRAVIS_BUILD_DIR" &&
"$TRAVIS_BUILD_DIR/scripts/r2dec.sh" --prefix="`pwd`/Cutter.app/Contents/Resources/r2" &&
mkdir image && cp -a Cutter.app image/ && mkdir image && cp -a Cutter.app image/ &&
export VOL_NAME="Cutter v${CUTTER_VERSION}" && export VOL_NAME="Cutter v${CUTTER_VERSION}" &&
export DMG_TMP_FILE="Cutter-v$CUTTER_VERSION-x64.macOS-tmp.dmg" && export DMG_TMP_FILE="Cutter-v$CUTTER_VERSION-x64.macOS-tmp.dmg" &&

17
src/CutterApplication.cpp
View File

@ -216,17 +216,24 @@ CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc
Core()->setConfig("r2ghidra.sleighhome", sleighHome.absolutePath()); Core()->setConfig("r2ghidra.sleighhome", sleighHome.absolutePath());
auto r2decHome = appdir; auto r2decHome = appdir;
appdir.cd("share/radare2/plugins/r2dec-js"); // appdir/share/radare2/plugins/r2dec-js r2decHome.cd("share/radare2/plugins/r2dec-js"); // appdir/share/radare2/plugins/r2dec-js
qputenv("R2DEC_HOME", appdir.absolutePath().toLocal8Bit()); qputenv("R2DEC_HOME", r2decHome.absolutePath().toLocal8Bit());
} }
#endif #endif
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
{ {
auto sleighHome = QDir(QCoreApplication::applicationDirPath()); // Contents/MacOS auto r2prefix = QDir(QCoreApplication::applicationDirPath()); // Contents/MacOS
sleighHome.cdUp(); // Contents r2prefix.cdUp(); // Contents
sleighHome.cd("Resources/r2/share/radare2/plugins/r2ghidra_sleigh"); // Contents/Resources/r2/share/radare2/plugins/r2ghidra_sleigh r2prefix.cd("Resources/r2"); // Contents/Resources/r2
auto sleighHome = r2prefix;
sleighHome.cd("share/radare2/plugins/r2ghidra_sleigh"); // Contents/Resources/r2/share/radare2/plugins/r2ghidra_sleigh
Core()->setConfig("r2ghidra.sleighhome", sleighHome.absolutePath()); Core()->setConfig("r2ghidra.sleighhome", sleighHome.absolutePath());
auto r2decHome = r2prefix;
r2decHome.cd("share/radare2/plugins/r2dec-js"); // Contents/Resources/r2/share/radare2/plugins/r2dec-js
qputenv("R2DEC_HOME", r2decHome.absolutePath().toLocal8Bit());
} }
#endif #endif