[rkward/work/frameworks-Mac] rkward/rbackend: prepare for embedding the R backend application

[R.J.V. Bertin]

Git commit 6278ed879d8649cdc71cfb5ecb312cc0cd556ae8 by R.J.V. Bertin.
Committed on 17/05/2017 at 19:40.
Pushed by rjvbb into branch 'work/frameworks-Mac'.

prepare for embedding the R backend application

at a more appropriate location in the .app bundle when doing a standalone
.app bundle build.

M  +3    -3    rkward/rbackend/rkfrontendtransmitter.cpp

https://commits.kde.org/rkward/6278ed879d8649cdc71cfb5ecb312cc0cd556ae8

diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp
index a55c8f66..35814414 100644
--- a/rkward/rbackend/rkfrontendtransmitter.cpp
+++ b/rkward/rbackend/rkfrontendtransmitter.cpp
@@ -102,13 +102,13 @@ void RKFrontendTransmitter::run () {
 	args.append ("--locale-dir=" + localeDir ().toUtf8 ().toPercentEncoding ());
 	connect (backend, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &RKFrontendTransmitter::backendExit);
 	QString backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath ());
-#ifdef Q_OS_MAC
-	if (backend_executable.isNull ()) backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath () + "/rkward.frontend.app/Contents/MacOS"); 	// this is for running directly from a build tree
+#ifdef Q_OS_MACOS
+	if (backend_executable.isNull ()) backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath () + "../Resources"); // an appropriate location in a standalone app-bundle
 #endif
 	if (backend_executable.isEmpty ()) backend_executable = findBackendAtPath (RKWARD_BACKEND_PATH);
 	if (backend_executable.isNull ()) backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath () + "../lib/libexec");
 	if (backend_executable.isEmpty ()) backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath () + "/rbackend");	// for running directly from the build-dir
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
         if (backend_executable.isEmpty ()) backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath () + "/../../../rbackend");
 #endif
 	if (backend_executable.isEmpty ()) handleTransmissionError (i18n ("The backend executable could not be found. This is likely to be a problem with your installation."));