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

[tfry at users.sourceforge.net]

Revision: 3155
          http://rkward.svn.sourceforge.net/rkward/?rev=3155&view=rev
Author:   tfry
Date:     2010-10-26 19:02:49 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
Check whether installation of R support packages appears to have worked.

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2010-10-26 18:46:37 UTC (rev 3154)
+++ trunk/rkward/ChangeLog	2010-10-26 19:02:49 UTC (rev 3155)
@@ -1,3 +1,4 @@
+- Fixed: Installation would continue, seemingly successfully, even if R support libraries could not be installed
 - Fixed: Function argument hints would sometimes persist after closing a script window
 - Fixed: "Vector" mode in "Paste special" action did not work correctly
 - Attempt to save workspace on crashes		TODO: detect recovery-file at startup, and offer to load it.

Modified: trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in	2010-10-26 18:46:37 UTC (rev 3154)
+++ trunk/rkward/rkward/rbackend/rpackages/rpackage_install.cmake.in	2010-10-26 19:02:49 UTC (rev 3155)
@@ -13,6 +13,7 @@
 	EXECUTE_PROCESS(
 		COMMAND @R_EXECUTABLE@ CMD INSTALL -c -l ${R_LIBDIR} "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests"
 		WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
+		RESULT_VARIABLE R_LIB_INSTALL_EXIT_CODE
 	)
 ELSE(WIN32)
 	EXECUTE_PROCESS(
@@ -21,5 +22,10 @@
 	EXECUTE_PROCESS(
 		COMMAND env TMPDIR=@CMAKE_CURRENT_BINARY_DIR@/tmp @R_EXECUTABLE@ CMD INSTALL -c -l ${DESTDIR}/@R_LIBDIR@ "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests"
 		WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
+		RESULT_VARIABLE R_LIB_INSTALL_EXIT_CODE
 	)
 ENDIF(WIN32)
+
+IF(R_LIB_INSTALL_EXIT_CODE)
+	MESSAGE (SEND_ERROR "Failed to install R support libraries. Please make sure you have the required permissions.")
+ENDIF(R_LIB_INSTALL_EXIT_CODE)


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