[rkward] rkward/rbackend: Add some debug code, clean up some debug code

Thomas Friedrichsmeier null at kde.org
Wed Jan 1 09:24:16 GMT 2020


Git commit f857a52320a31c0eba13ec8d1f8dfa2fa7a87320 by Thomas Friedrichsmeier.
Committed on 01/01/2020 at 09:24.
Pushed by tfry into branch 'master'.

Add some debug code, clean up some debug code

M  +3    -2    rkward/rbackend/rkfrontendtransmitter.cpp
M  +0    -1    rkward/rbackend/rpackages/CMakeLists.txt

https://commits.kde.org/rkward/f857a52320a31c0eba13ec8d1f8dfa2fa7a87320

diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp
index a78d6e9f..f64fa0b3 100644
--- a/rkward/rbackend/rkfrontendtransmitter.cpp
+++ b/rkward/rbackend/rkfrontendtransmitter.cpp
@@ -2,7 +2,7 @@
                           rkfrontendtransmitter  -  description
                              -------------------
     begin                : Thu Nov 04 2010
-    copyright            : (C) 2010-2018 by Thomas Friedrichsmeier
+    copyright            : (C) 2010-2019 by Thomas Friedrichsmeier
     email                : thomas.friedrichsmeier at kdemail.net
  ***************************************************************************/
 
@@ -120,12 +120,13 @@ void RKFrontendTransmitter::run () {
 	}
 #ifdef Q_OS_MACOS
 	// Resolving libR.dylib and friends is a pain on MacOS, and running through R CMD does not always seem to be enough.
-	// (Apparently DYLIB_FALLBACK_LIBRARY_PATH is ignored on newer versions of MacOS). Safest best seems to be to startin the lib directory, itself.
+	// (Apparently DYLIB_FALLBACK_LIBRARY_PATH is ignored on newer versions of MacOS). Safest best seems to be to start in the lib directory, itself.
 	// TODO fix working directory, afterwards
 	QProcess dummy;
 	dummy.start (qgetenv ("R_BINARY"), QStringList() << "--slave" << "--no-save" << "--no-init-file" << "-e" << "cat(R.home('lib'))");
 	dummy.waitForFinished ();
 	QString r_home = QString::fromLocal8Bit (dummy.readAllStandardOutput ());
+	RK_DEBUG(RBACKEND, DL_INFO, "Setting working directory to %s", qPrintable (r_home));
 	backend->setWorkingDirectory (r_home);
 #endif
 	args.prepend ("CMD");
diff --git a/rkward/rbackend/rpackages/CMakeLists.txt b/rkward/rbackend/rpackages/CMakeLists.txt
index 0a6bd309..a50d742b 100644
--- a/rkward/rbackend/rpackages/CMakeLists.txt
+++ b/rkward/rbackend/rpackages/CMakeLists.txt
@@ -1,6 +1,5 @@
 MACRO(createRpackage name)
 	FILE(GLOB_RECURSE rkwardfiles${name} LIST_DIRECTORIES true CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}/*")
-	MESSAGE(STATUS ${rkwardfiles${name}})
 	ADD_CUSTOM_COMMAND(OUTPUT ${name}.tgz
 		COMMAND ${CMAKE_COMMAND} -E tar "cfz" "${CMAKE_CURRENT_BINARY_DIR}/${name}.tgz" "${name}"
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}



More information about the rkward-tracker mailing list