[Rcpp-commits] r1037 - in pkg/Rcpp: R src tests

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-04-13 09:57:43 +0200 (Tue, 13 Apr 2010)
New Revision: 1037

Modified:
   pkg/Rcpp/R/RcppLdpath.R
   pkg/Rcpp/src/Makevars.win
   pkg/Rcpp/tests/doRUnit.R
Log:
and again ... making sure parallel make works

Modified: pkg/Rcpp/R/RcppLdpath.R
===================================================================
--- pkg/Rcpp/R/RcppLdpath.R	2010-04-13 07:49:56 UTC (rev 1036)
+++ pkg/Rcpp/R/RcppLdpath.R	2010-04-13 07:57:43 UTC (rev 1037)
@@ -1,4 +1,9 @@
 
+## make sure system.file returns an absolute path
+system.file <- function(...){
+	tools:::file_path_as_absolute( base:::system.file( ... ) )
+}
+
 ## Use R's internal knowledge of path settings to find the lib/ directory
 ## plus optinally an arch-specific directory on system building multi-arch
 RcppLdPath <- function() {

Modified: pkg/Rcpp/src/Makevars.win
===================================================================
--- pkg/Rcpp/src/Makevars.win	2010-04-13 07:49:56 UTC (rev 1036)
+++ pkg/Rcpp/src/Makevars.win	2010-04-13 07:57:43 UTC (rev 1037)
@@ -18,7 +18,8 @@
 
 ## we place it inside the inst/ directory so that it gets installed by the package
 USERDIR	= 	../inst/lib$(R_ARCH)
-USERLIB	= 	$(USERDIR)/libRcpp.a
+STATICLIB=	libRcpp.a
+USERLIB	= 	$(USERDIR)/$(STATICLIB)
 
 ## C++0X support enabled if 
 ## - the RCPP_CXX0X environment variable is set to "yes"
@@ -41,10 +42,9 @@
 
 $(USERLIB):	$(OBJECTS)
 
-userlib:	userdir $(USERLIB)
-
-userdir:
+userlib:	$(STATICLIB)
 		-mkdir -p $(USERDIR)
+		-mv libRcpp.a $(USERLIB) 
 
+$(STATICLIB):	$(OBJECTS)
 
-

Modified: pkg/Rcpp/tests/doRUnit.R
===================================================================
--- pkg/Rcpp/tests/doRUnit.R	2010-04-13 07:49:56 UTC (rev 1036)
+++ pkg/Rcpp/tests/doRUnit.R	2010-04-13 07:57:43 UTC (rev 1037)
@@ -21,6 +21,9 @@
 
   stopifnot(file.exists(path), file.info(path.expand(path))$isdir)
 
+  # without this, we get many bunch of unit test failures
+  Sys.setenv( R_TESTS = "" )
+  
   source(file.path(path, "runTests.R"), echo = TRUE)
 } else {
 	print( "package RUnit not available, cannot run unit tests" )