[rkward-cvs] SF.net SVN: rkward:[3488] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3488
          http://rkward.svn.sourceforge.net/rkward/?rev=3488&view=rev
Author:   tfry
Date:     2011-03-20 19:13:41 +0000 (Sun, 20 Mar 2011)

Log Message:
-----------
Do not install rkward.rbackend in /usr/bin

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/CMakeLists.txt
    trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-03-20 18:59:23 UTC (rev 3487)
+++ trunk/rkward/ChangeLog	2011-03-20 19:13:41 UTC (rev 3488)
@@ -1,6 +1,6 @@
 - Fixed: Object name completion would abort early in the script editor with KDE 4.4
 - Support function argument hinting for R primitives
-- Support S4 slots in object name completion and workspace browser		TODO: more testing
+- Support S4 slots in object name completion and workspace browser		TODO: more testing, should support namespaces and ":::", too
 - More correct handling of quotes in object name completion
 - Support plot history for ggplot2 plots
 - Be less pro-active about fetching structure information on R objects in the workspace		TODO: verify that this fixes our issues with rXML

Modified: trunk/rkward/rkward/rbackend/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-03-20 18:59:23 UTC (rev 3487)
+++ trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-03-20 19:13:41 UTC (rev 3488)
@@ -59,7 +59,7 @@
 	LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 	KDE4_ADD_EXECUTABLE(rkward.rbackend ${rbackend_BACKEND_SRCS})
 	TARGET_LINK_LIBRARIES(rkward.rbackend ${R_USED_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${KDE4_KDECORE_LIBS} ${QT_QTNETWORK_LIBRARY})
-	INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR})
+	INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/../lib/rkward/bin/)	# Specified relative to bin_install_dir rather than lib_install_dir, to match the lookup at runtime.
 ELSE(RBACKEND_SPLIT)
 	SET (
 		rbackend_ALL_SRCS

Modified: trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp	2011-03-20 18:59:23 UTC (rev 3487)
+++ trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp	2011-03-20 19:13:41 UTC (rev 3488)
@@ -63,8 +63,8 @@
 	args.append ("--data-dir " + RKSettingsModuleGeneral::filesPath ());
 	backend->setProcessChannelMode (QProcess::MergedChannels);	// at least for now. Seems difficult to get interleaving right, without this.
 	connect (backend, SIGNAL (finished (int, QProcess::ExitStatus)), this, SLOT (backendExit (int)));
-	QString backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/rkward.rbackend"));
-	if (backend_executable.isEmpty ()) backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/rbackend/rkward.rbackend"));	// for running directly from the build-dir
+	QString backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/rbackend/rkward.rbackend"));	// for running directly from the build-dir
+	if (backend_executable.isEmpty ()) backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/../lib/rkward/bin/rkward.rbackend"));
 	RK_ASSERT (!backend_executable.isEmpty ());
 	backend->start (backend_executable, args, QIODevice::ReadOnly);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.