[Rcpp-commits] r1071 - in pkg/Rcpp/inst/unitTests/RcppTestB: . man src

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

Author: romain
Date: 2010-04-18 23:23:36 +0200 (Sun, 18 Apr 2010)
New Revision: 1071

Added:
   pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestB-package.Rd
Removed:
   pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestA-package.Rd
Modified:
   pkg/Rcpp/inst/unitTests/RcppTestB/DESCRIPTION
   pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars
   pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win
Log:
new test package

Modified: pkg/Rcpp/inst/unitTests/RcppTestB/DESCRIPTION
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/DESCRIPTION	2010-04-18 21:20:54 UTC (rev 1070)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/DESCRIPTION	2010-04-18 21:23:36 UTC (rev 1071)
@@ -1,4 +1,4 @@
-Package: RcppTestA
+Package: RcppTestB
 Type: Package
 Title: Dummy package part of Rcpp unit tests
 Version: 1.0
@@ -8,5 +8,5 @@
 Description: Dummy package part of Rcpp uni tests
 License: GPL (>= 2)
 LazyLoad: yes
-Depends: Rcpp (>= 0.7.11.4)
+Depends: Rcpp (>= 0.7.12.6)
 LinkingTo: Rcpp

Deleted: pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestA-package.Rd
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestA-package.Rd	2010-04-18 21:20:54 UTC (rev 1070)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestA-package.Rd	2010-04-18 21:23:36 UTC (rev 1071)
@@ -1,20 +0,0 @@
-\name{RcppTestA-package}
-\alias{RcppTestA-package}
-\alias{RcppTestA}
-\docType{package}
-\title{
-Dummy package part of Rcpp unit tests
-}
-\description{
-Dummy package part of Rcpp unit tests
-}
-\details{
-\tabular{ll}{
-Package: \tab RcppTestA\cr
-Type: \tab Package\cr
-Version: \tab 1.0\cr
-Date: \tab 2010-04-10\cr
-License: \tab GPL (>= 2)\cr
-LazyLoad: \tab yes\cr
-}
-}

Copied: pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestB-package.Rd (from rev 1070, pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestA-package.Rd)
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestB-package.Rd	                        (rev 0)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/man/RcppTestB-package.Rd	2010-04-18 21:23:36 UTC (rev 1071)
@@ -0,0 +1,20 @@
+\name{RcppTestA-package}
+\alias{RcppTestA-package}
+\alias{RcppTestA}
+\docType{package}
+\title{
+Dummy package part of Rcpp unit tests
+}
+\description{
+Dummy package part of Rcpp unit tests
+}
+\details{
+\tabular{ll}{
+Package: \tab RcppTestA\cr
+Type: \tab Package\cr
+Version: \tab 1.0\cr
+Date: \tab 2010-04-10\cr
+License: \tab GPL (>= 2)\cr
+LazyLoad: \tab yes\cr
+}
+}

Modified: pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars	2010-04-18 21:20:54 UTC (rev 1070)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars	2010-04-18 21:23:36 UTC (rev 1071)
@@ -1,2 +1,2 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
+PKG_LIBS = `$(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()"`

Modified: pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win	2010-04-18 21:20:54 UTC (rev 1070)
+++ pkg/Rcpp/inst/unitTests/RcppTestB/src/Makevars.win	2010-04-18 21:23:36 UTC (rev 1071)
@@ -1,5 +1,5 @@
 
 ## This assume that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell Rscript.exe --vanilla -e "Rcpp:::LdFlags()")
+PKG_LIBS = `Rscript.exe --vanilla -e "Rcpp:::LdFlags()"`