[rkward-cvs] SF.net SVN: rkward:[3491] trunk/rkward/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Mar 21 08:15:40 UTC 2011
Revision: 3491
http://rkward.svn.sourceforge.net/rkward/?rev=3491&view=rev
Author: tfry
Date: 2011-03-21 08:15:40 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
Move binaries to KDE's libexec directory, instead.
Modified Paths:
--------------
trunk/rkward/rkward/CMakeLists.txt
trunk/rkward/rkward/main.cpp
trunk/rkward/rkward/rbackend/CMakeLists.txt
trunk/rkward/rkward/rkward.bat.template
trunk/rkward/rkward/rkward.sh.template
Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt 2011-03-20 19:34:49 UTC (rev 3490)
+++ trunk/rkward/rkward/CMakeLists.txt 2011-03-21 08:15:40 UTC (rev 3491)
@@ -35,7 +35,7 @@
GET_DIRECTORY_PROPERTY(R_SHAREDLIBDIR DIRECTORY rbackend LINK_DIRECTORIES)
LINK_DIRECTORIES(${R_SHAREDLIBDIR})
-KDE4_ADD_EXECUTABLE(rkward.bin ${RKWard_Sources})
+KDE4_ADD_EXECUTABLE(rkward.frontend ${RKWard_Sources})
# wrapper script
GET_DIRECTORY_PROPERTY(R_EXECUTABLE DIRECTORY rbackend DEFINITION R_EXECUTABLE)
@@ -50,9 +50,9 @@
${RKWARD_WRAPPER_TEMPLATE}
${RKWARD_WRAPPER_SCRIPT}
@ONLY)
-ADD_DEPENDENCIES(rkward.bin ${RKWARD_WRAPPER_SCRIPT})
+ADD_DEPENDENCIES(rkward.frontend ${RKWARD_WRAPPER_SCRIPT})
-TARGET_LINK_LIBRARIES(rkward.bin ${KDE4_KDECORE_LIBS} windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ktexteditor ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+TARGET_LINK_LIBRARIES(rkward.frontend ${KDE4_KDECORE_LIBS} windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ktexteditor ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
########### install files ###############
@@ -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}/../lib/rkward/bin/)
+INSTALL(TARGETS rkward.frontend DESTINATION ${LIBEXEC_INSTALL_DIR})
INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BIN_INSTALL_DIR})
INSTALL(FILES rkward.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
Modified: trunk/rkward/rkward/main.cpp
===================================================================
--- trunk/rkward/rkward/main.cpp 2011-03-20 19:34:49 UTC (rev 3490)
+++ trunk/rkward/rkward/main.cpp 2011-03-21 08:15:40 UTC (rev 3491)
@@ -132,7 +132,7 @@
// This is so it prints "Usage rkward..." instead of "Usage rkward.bin...", etc.
// it seems safest to keep a copy, since the shell still owns argv
char *argv_copy[argc];
- argv_copy[0] = qstrdup (QString (argv[0]).remove (".bin").replace (".exe", ".bat").toLocal8Bit ());
+ argv_copy[0] = qstrdup (QString (argv[0]).remove (".frontend").replace (".exe", ".bat").toLocal8Bit ());
for (int i = 1; i < argc; ++i) {
argv_copy[i] = argv[i];
}
Modified: trunk/rkward/rkward/rbackend/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/rbackend/CMakeLists.txt 2011-03-20 19:34:49 UTC (rev 3490)
+++ trunk/rkward/rkward/rbackend/CMakeLists.txt 2011-03-21 08:15:40 UTC (rev 3491)
@@ -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}/../lib/rkward/bin/) # Specified relative to bin_install_dir rather than lib_install_dir, to match the lookup at runtime.
+ INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
ELSE(RBACKEND_SPLIT)
SET (
rbackend_ALL_SRCS
Modified: trunk/rkward/rkward/rkward.bat.template
===================================================================
--- trunk/rkward/rkward/rkward.bat.template 2011-03-20 19:34:49 UTC (rev 3490)
+++ trunk/rkward/rkward/rkward.bat.template 2011-03-21 08:15:40 UTC (rev 3491)
@@ -15,7 +15,7 @@
%~dsp0\kdeinit4.exe
ECHO Starting RKWard
-SET RKWARD.BIN=%~dsp0\..\lib\rkward\bin\rkward.bin.exe
+SET RKWARD.BIN=%~dsp0\..\lib\kde4\libexec\rkward.frontend.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:34:49 UTC (rev 3490)
+++ trunk/rkward/rkward/rkward.sh.template 2011-03-21 08:15:40 UTC (rev 3491)
@@ -44,11 +44,12 @@
export LC_NUMERIC="C"
## Start rkward. Running through R CMD to set all the relevant R enviroment variables
-if test -x "`dirname $0`/rkward.bin" && test -d "`dirname $0`/CMakeFiles" ; then
+if test -x "`dirname $0`/rkward.frontend" ; then
# for running directly from a build directory. Don't use this, unless you are a developer!
- rkward_binary="`dirname $0`/rkward.bin"
+ rkward_binary="`dirname $0`/rkward.frontend"
else
# for regular installations
- rkward_binary="`dirname $0`/../lib/rkward/bin/rkward.bin"
+ kde4config="`dirname $0`/kde4-config"
+ rkward_binary="`${kde4config} --path libexec`/rkward.frontend"
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.
More information about the rkward-tracker
mailing list