[Rcpp-commits] r465 - in pkg: . inst/doc

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

Author: romain
Date: 2010-01-26 14:20:27 +0100 (Tue, 26 Jan 2010)
New Revision: 465

Removed:
   pkg/inst/doc/Makefile
   pkg/inst/doc/Rcpp-unitTests.R
Modified:
   pkg/DESCRIPTION
   pkg/inst/doc/Rcpp-unitTests.Rnw
Log:
remove Makefile and move logic into the vignette directly, maybe this will make r-forge happier

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-01-26 11:22:26 UTC (rev 464)
+++ pkg/DESCRIPTION	2010-01-26 13:20:27 UTC (rev 465)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Rcpp R/C++ interface package
-Version: 0.7.3.2
+Version: 0.7.3.3
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek and David Reiss; based on code written during 

Deleted: pkg/inst/doc/Makefile
===================================================================
--- pkg/inst/doc/Makefile	2010-01-26 11:22:26 UTC (rev 464)
+++ pkg/inst/doc/Makefile	2010-01-26 13:20:27 UTC (rev 465)
@@ -1,9 +0,0 @@
-all: clean Rcpp-unitTests.html Rcpp-unitTests.pdf
-
-clean:
-	rm -fr Rcpp-unitTests.html
-	rm -fr Rcpp-unitTests.pdf
-
-Rcpp-unitTests.html: Rcpp-unitTests.R
-	Rscript --default-packages="Rcpp,RUnit,utils,tools" Rcpp-unitTests.R
-

Deleted: pkg/inst/doc/Rcpp-unitTests.R
===================================================================
--- pkg/inst/doc/Rcpp-unitTests.R	2010-01-26 11:22:26 UTC (rev 464)
+++ pkg/inst/doc/Rcpp-unitTests.R	2010-01-26 13:20:27 UTC (rev 465)
@@ -1,32 +0,0 @@
-#!/usr/bin/r -t
-#
-# Copyright (C) 2009 - 2010 Dirk Eddelbuettel and Romain Francois
-#
-# This file is part of Rcpp.
-#
-# Rcpp is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# Rcpp is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
-
-pkg <- "Rcpp"
-path <- system.file("unitTests", package = pkg)
-testSuite <- defineTestSuite(name=paste(pkg, "unit testing"), dirs = path)
-tests <- runTestSuite(testSuite)
-printHTMLProtocol(tests, fileName="Rcpp-unitTests.html" )
-printTextProtocol(tests, fileName="Rcpp-unitTests.txt" )
-if( file.exists( "/tmp" ) ){
-	file.copy( "Rcpp-unitTests.txt", "/tmp", overwrite = TRUE )
-	file.copy( "Rcpp-unitTests.html", "/tmp", overwrite = TRUE )
-}
-Sweave('Rcpp-unitTests.Rnw')
-texi2dvi( 'Rcpp-unitTests.tex', pdf = TRUE, clean = TRUE )
-unlink('RcppUnitTests.tex')

Modified: pkg/inst/doc/Rcpp-unitTests.Rnw
===================================================================
--- pkg/inst/doc/Rcpp-unitTests.Rnw	2010-01-26 11:22:26 UTC (rev 464)
+++ pkg/inst/doc/Rcpp-unitTests.Rnw	2010-01-26 13:20:27 UTC (rev 465)
@@ -10,7 +10,28 @@
 \maketitle
 
 <<echo=FALSE>>=
-writeLines( readLines( "Rcpp-unitTests.txt" ) )
+pkg <- "Rcpp"
+
+require( Rcpp )
+
+runit <- "RUnit"
+require( runit, character.only = TRUE )
+
+path <- system.file("unitTests", package = pkg)
+testSuite <- defineTestSuite(name=paste(pkg, "unit testing"), dirs = path)
+tests <- runTestSuite(testSuite)
+printHTMLProtocol(tests, fileName= sprintf( "%s-unitTests.html" , pkg ) )
+printTextProtocol(tests, fileName= sprintf( "%s-unitTests.txt"  , pkg ) )
+if( file.exists( "/tmp" ) ){
+	file.copy( sprintf( "%s-unitTests.txt" , pkg ) , "/tmp", overwrite = TRUE )
+	file.copy( sprintf( "%s-unitTests.html", pkg ) , "/tmp", overwrite = TRUE )
+}
 @
 
+\begin{verbatim}
+<<echo=F,results=tex>>=
+writeLines( readLines( "Rcpp-unitTests.txt" ) ) 
+@
+\end{verbatim}
+
 \end{document}