ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-22 04:46:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename macro for travis (#671)

Browse Source
This commit is contained in:
xarkes 2018-09-05 07:46:40 +02:00 committed by GitHub
parent 590f9fb7b9
commit c6260b5dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cutter.cpp
View File

@ -55,17 +55,17 @@ CutterCore::CutterCore(QObject *parent) :
#if defined(APPIMAGE) || defined(MACOS_R2_BUNDLED) #if defined(APPIMAGE) || defined(MACOS_R2_BUNDLED)
auto prefix = QDir(QCoreApplication::applicationDirPath()); auto prefix = QDir(QCoreApplication::applicationDirPath());
# ifdef APPIMAGE #ifdef APPIMAGE
// Executable is in appdir/bin // Executable is in appdir/bin
prefix.cdUp(); prefix.cdUp();
qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for AppImage."; qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for AppImage.";
# else // MACOS_R2_BUNDLED #else // MACOS_R2_BUNDLED
// Executable is in Contents/MacOS, prefix is Contents/Resources/r2 // Executable is in Contents/MacOS, prefix is Contents/Resources/r2
prefix.cdUp(); prefix.cdUp();
prefix.cd("Resources"); prefix.cd("Resources");
prefix.cd("r2"); prefix.cd("r2");
qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for macOS Application Bundle."; qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for macOS Application Bundle.";
# endif #endif
setConfig("dir.prefix", prefix.absolutePath()); setConfig("dir.prefix", prefix.absolutePath());
#endif #endif

6
src/utils/JupyterConnection.cpp
View File

@ -52,16 +52,16 @@ void JupyterConnection::initPython()
#if defined(APPIMAGE) || defined(MACOS_PYTHON_FRAMEWORK_BUNDLED) #if defined(APPIMAGE) || defined(MACOS_PYTHON_FRAMEWORK_BUNDLED)
if (customPythonHome.isNull()) { if (customPythonHome.isNull()) {
auto pythonHomeDir = QDir(QCoreApplication::applicationDirPath()); auto pythonHomeDir = QDir(QCoreApplication::applicationDirPath());
# ifdef APPIMAGE #ifdef APPIMAGE
// Executable is in appdir/bin // Executable is in appdir/bin
pythonHomeDir.cdUp(); pythonHomeDir.cdUp();
qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() << " for AppImage."; qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() << " for AppImage.";
# else // MACOS_PYTHON_FRAMEWORK_BUNDLED #else // MACOS_PYTHON_FRAMEWORK_BUNDLED
// @executable_path/../Frameworks/Python.framework/Versions/Current // @executable_path/../Frameworks/Python.framework/Versions/Current
pythonHomeDir.cd("../Frameworks/Python.framework/Versions/Current"); pythonHomeDir.cd("../Frameworks/Python.framework/Versions/Current");
qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() << qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() <<
" for macOS Application Bundle."; " for macOS Application Bundle.";
# endif #endif
customPythonHome = pythonHomeDir.absolutePath(); customPythonHome = pythonHomeDir.absolutePath();
} }
#endif #endif