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

[tfry at users.sourceforge.net]

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

Log Message:
-----------
Also move rkward.bin into ../lib/rkward/bin/. Partially reverts r3488, since both binaries are now in the same directory, again.

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

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-03-20 19:15:17 UTC (rev 3489)
+++ trunk/rkward/ChangeLog	2011-03-20 19:34:49 UTC (rev 3490)
@@ -1,3 +1,4 @@
+- Auxiliary binaries rkward.bin and rkward.rbackend are no longer installed into /usr[/local]/bin/ on Unix
 - 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, should support namespaces and ":::", too

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2011-03-20 19:15:17 UTC (rev 3489)
+++ trunk/rkward/rkward/CMakeLists.txt	2011-03-20 19:34:49 UTC (rev 3490)
@@ -60,7 +60,7 @@
 	PATTERN .svn EXCLUDE)
 
 INSTALL(FILES   resource.ver rkwardui.rc rkconsolepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
-INSTALL(TARGETS rkward.bin DESTINATION ${BIN_INSTALL_DIR})
+INSTALL(TARGETS rkward.bin DESTINATION ${BIN_INSTALL_DIR}/../lib/rkward/bin/)
 INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BIN_INSTALL_DIR})
 
 INSTALL(FILES rkward.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

Modified: trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp	2011-03-20 19:15:17 UTC (rev 3489)
+++ trunk/rkward/rkward/rbackend/rkfrontendtransmitter.cpp	2011-03-20 19:34:49 UTC (rev 3490)
@@ -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 () + "/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"));
+	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
 	RK_ASSERT (!backend_executable.isEmpty ());
 	backend->start (backend_executable, args, QIODevice::ReadOnly);
 

Modified: trunk/rkward/rkward/rkward.bat.template
===================================================================
--- trunk/rkward/rkward/rkward.bat.template	2011-03-20 19:15:17 UTC (rev 3489)
+++ trunk/rkward/rkward/rkward.bat.template	2011-03-20 19:34:49 UTC (rev 3490)
@@ -15,7 +15,7 @@
 %~dsp0\kdeinit4.exe
 
 ECHO Starting RKWard
-SET RKWARD.BIN=%~dsp0\rkward.bin.exe
+SET RKWARD.BIN=%~dsp0\..\lib\rkward\bin\rkward.bin.exe
 SET DEBUGGER=
 
 IF NOT "%1" == "--debugger" GOTO run

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2011-03-20 19:15:17 UTC (rev 3489)
+++ trunk/rkward/rkward/rkward.sh.template	2011-03-20 19:34:49 UTC (rev 3490)
@@ -44,4 +44,11 @@
 export LC_NUMERIC="C"
 
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables
-exec $R_binary CMD $debugger $0.bin "$@"
+if test -x "`dirname $0`/rkward.bin" && test -d "`dirname $0`/CMakeFiles" ; then
+  # for running directly from a build directory. Don't use this, unless you are a developer!
+  rkward_binary="`dirname $0`/rkward.bin"
+else
+  # for regular installations
+  rkward_binary="`dirname $0`/../lib/rkward/bin/rkward.bin"
+fi
+exec $R_binary CMD $debugger ${rkward_binary} "$@"


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