[Rcpp-commits] r3707 - in pkg/RcppGSL: . R inst vignettes vignettes/RcppGSL

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

Author: edd
Date: 2012-07-22 00:45:19 +0200 (Sun, 22 Jul 2012)
New Revision: 3707

Modified:
   pkg/RcppGSL/ChangeLog
   pkg/RcppGSL/R/inline.R
   pkg/RcppGSL/cleanup
   pkg/RcppGSL/inst/NEWS.Rd
   pkg/RcppGSL/vignettes/
   pkg/RcppGSL/vignettes/RcppGSL-unitTests.Rnw
   pkg/RcppGSL/vignettes/RcppGSL/RcppGSL-intro.Rnw
Log:
 o R/inline.R updated to use assignInMyNamespace
 o more vignettes/ cleanup


Modified: pkg/RcppGSL/ChangeLog
===================================================================
--- pkg/RcppGSL/ChangeLog	2012-07-21 22:18:37 UTC (rev 3706)
+++ pkg/RcppGSL/ChangeLog	2012-07-21 22:45:19 UTC (rev 3707)
@@ -2,10 +2,15 @@
 
 	* R/fastLm.R: expanded summary() display as in RcppArmadillo
 
+	* R/inline.R: Use assignInMyNamespace() as per current R Policy
+
 	* inst/NEWS.Rd: converted from ascii text to Rd format
 
 	* vignettes/*: moved from inst/doc/* per newer R Policy
 
+	* vignettes/: renamed main vignette to RcppGSL-intro to not clash
+	with the filename of the package reference manual RcppGSL.pdf
+
 	* DESCRIPTION: changed Maintainer: to single person per CRAN Policy
 
 2011-12-23  Dirk Eddelbuettel  <edd at debian.org>

Modified: pkg/RcppGSL/R/inline.R
===================================================================
--- pkg/RcppGSL/R/inline.R	2012-07-21 22:18:37 UTC (rev 3706)
+++ pkg/RcppGSL/R/inline.R	2012-07-21 22:45:19 UTC (rev 3707)
@@ -1,4 +1,4 @@
-## Copyright (C)       2010 Dirk Eddelbuettel and Romain Francois
+## Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RcppGSL.
 ##
@@ -15,26 +15,24 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
 
-NAMESPACE <- environment()
-
 if(.Platform$OS.type=="windows") {
     LIB_GSL <- Sys.getenv("LIB_GSL")
     gsl_cflags <- sprintf( "-I%s/include", LIB_GSL )
     gsl_libs   <- sprintf( "-L%s/lib -lgsl -lgslcblas", LIB_GSL )
     know_flags <- TRUE
-} else {             
+} else {
     gsl_cflags <- ""
     gsl_libs <- ""
-    know_flags <- FALSE    
+    know_flags <- FALSE
 }
 
 get_gsl_flags <- function(){
     gsl_cflags <- system( "gsl-config --cflags" , intern = TRUE )
     gsl_libs   <- system( "gsl-config --libs"   , intern = TRUE )
-    
-    assignInNamespace( "gsl_cflags", gsl_cflags, NAMESPACE )
-    assignInNamespace( "gsl_libs", gsl_libs, NAMESPACE )
-    assignInNamespace( "know_flags", TRUE, NAMESPACE )
+
+    assignInMyNamespace( "gsl_cflags", gsl_cflags )
+    assignInMyNamespace( "gsl_libs", gsl_libs )
+    assignInMyNamespace( "know_flags", TRUE )
 }
 
 LdFlags <- function( print = TRUE ){

Modified: pkg/RcppGSL/cleanup
===================================================================
--- pkg/RcppGSL/cleanup	2012-07-21 22:18:37 UTC (rev 3706)
+++ pkg/RcppGSL/cleanup	2012-07-21 22:45:19 UTC (rev 3707)
@@ -12,5 +12,7 @@
            */*~ *~ ; \
     rm -rf autom4te.cache)
 
+(cd vignettes && \
+    make clean && \
+    rm -rf auto unitTests-results/ )
 
-

Modified: pkg/RcppGSL/inst/NEWS.Rd
===================================================================
--- pkg/RcppGSL/inst/NEWS.Rd	2012-07-21 22:18:37 UTC (rev 3706)
+++ pkg/RcppGSL/inst/NEWS.Rd	2012-07-21 22:45:19 UTC (rev 3707)
@@ -6,9 +6,12 @@
   \itemize{
     \item{summary() for fastLm() now displays vastly more information}
     \item{fastLmPure() now uses same argument order as R's lm.fit()}
+    \item{inline support function now uses assignInMyNamespace}
     \item{Export and document S3 methods in NAMESPACE and manual page as
       such}
     \item{Vignettes have been moved to the \code{vignettes/} directory}
+    \item{Main vignette renamed to \code{RcppGSL-intro.pdf} to use a
+      filename different from the package reference manual}
     \item{NEWS file converted to .Rd format}
   }
 }


Property changes on: pkg/RcppGSL/vignettes
___________________________________________________________________
Modified: svn:ignore
   - RcppGSL.aux
RcppGSL.log
RcppGSL.tex
RcppGSL.out
RcppGSL.pdf

RcppGSL-unitTests.pdf

   + RcppGSL.aux
RcppGSL.log
RcppGSL.tex
RcppGSL.out
RcppGSL.pdf

RcppGSL-unitTests.pdf
RcppGSL-intro.pdf
RcppGSL-intro.aux
RcppGSL-intro.log
RcppGSL-intro.tex
RcppGSL-intro.out


Modified: pkg/RcppGSL/vignettes/RcppGSL/RcppGSL-intro.Rnw
===================================================================
--- pkg/RcppGSL/vignettes/RcppGSL/RcppGSL-intro.Rnw	2012-07-21 22:18:37 UTC (rev 3706)
+++ pkg/RcppGSL/vignettes/RcppGSL/RcppGSL-intro.Rnw	2012-07-21 22:45:19 UTC (rev 3707)
@@ -1,5 +1,7 @@
 \documentclass[10pt]{article}
 %\VignetteIndexEntry{RcppGSL}
+%\VignetteKeywords{R,GSL,Rcpp,data transfer}
+%\VignettePackage{RcppGSL}
 
 \usepackage{url,color}
 \usepackage[authoryear,round,longnamesfirst]{natbib}
@@ -19,6 +21,9 @@
 \newcommand{\proglang}[1]{\textsf{#1}}
 \newcommand{\pkg}[1]{{\fontseries{b}\selectfont #1}}
 
+\RequirePackage{ae,mathpple}    % ae as a default font pkg works with Sweave
+\RequirePackage[T1]{fontenc}
+
 <<echo=FALSE,print=FALSE>>=
 library( "RcppGSL" )
 options("width"=65)

Modified: pkg/RcppGSL/vignettes/RcppGSL-unitTests.Rnw
===================================================================
--- pkg/RcppGSL/vignettes/RcppGSL-unitTests.Rnw	2012-07-21 22:18:37 UTC (rev 3706)
+++ pkg/RcppGSL/vignettes/RcppGSL-unitTests.Rnw	2012-07-21 22:45:19 UTC (rev 3707)
@@ -1,5 +1,8 @@
 \documentclass[10pt]{article}
 %\VignetteIndexEntry{RcppGSL-unitTests}
+%\VignetteKeywords{R,GSL,Rcpp,unit tests}
+%\VignettePackage{RcppGSL}
+
 \usepackage{vmargin}
 \setmargrb{0.75in}{0.75in}{0.75in}{0.75in}