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

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

Author: edd
Date: 2011-04-03 19:39:57 +0200 (Sun, 03 Apr 2011)
New Revision: 2940

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/NEWS
   pkg/Rcpp/inst/doc/Makefile
Log:
The 'trying our hardest to make BDR happy' commit


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2011-04-03 17:17:09 UTC (rev 2939)
+++ pkg/Rcpp/ChangeLog	2011-04-03 17:39:57 UTC (rev 2940)
@@ -11,6 +11,9 @@
 
 	* inst/CITATION: Added citation() support using forthcoming paper
 
+	* inst/doc/Makefile: Trying make parallel builds possible by not calling
+	'clean' in the 'all' target; thanks to Brian Ripley for the heads-up
+
 2011-04-02  Dirk Eddelbuettel  <edd at debian.org>
 
 	* cleanup: Also clean in inst/unitTest/testRcppModule/src/

Modified: pkg/Rcpp/inst/NEWS
===================================================================
--- pkg/Rcpp/inst/NEWS	2011-04-03 17:17:09 UTC (rev 2939)
+++ pkg/Rcpp/inst/NEWS	2011-04-03 17:39:57 UTC (rev 2940)
@@ -3,8 +3,10 @@
     o   Exceptions code include exception_defines.h only when g++ is 4.5 or
         younger as the file no longer exists with g++-4.6
     
-    o   The inst/doc/Makefile now respects the $R_HOME environment variable
+    o   The documentation Makefile now uses the $R_HOME environment variable
 
+    o   The documentation Makefile no longer calls clean in the all target
+
     o   C++ conformance issue found by clang/llvm addressed by re-ordering
         declarations in grow.h as unqualified names must be declared before
         they are used, even when used within templates
@@ -12,6 +14,8 @@
     o   The 'long long' typedef now depends on C++0x being enabled as this
         was not a feature in C++98; this suppresses a new g++-4.5 warning
 
+    o   The Rcpp-introduction vignette is now the forthcoming JSS paper 
+
 0.9.2   2011-02-23
 
     o   The unitTest runit.Module.client.package.R is now skipped on older OS

Modified: pkg/Rcpp/inst/doc/Makefile
===================================================================
--- pkg/Rcpp/inst/doc/Makefile	2011-04-03 17:17:09 UTC (rev 2939)
+++ pkg/Rcpp/inst/doc/Makefile	2011-04-03 17:39:57 UTC (rev 2940)
@@ -1,20 +1,19 @@
 
 ## There is an old bug in texidvi that makes it not swallow the ~
 ## marker used to denote whitespace. This is actually due to fixing
-## another bug they whereby you could not run texidvi on directory
-## names containing a tilde (as we happen to do for Debian builds of R
+## another bug whereby you could not run texidvi on directory names
+## containing a tilde (as we happen to do for Debian builds of R
 ## alpha/beta/rc releases). The 'tilde' bug will go away as it
 ## reportedly has been squashed upstream but I am still bitten by it
-## on Ubuntu so for Dirk will insist on pdflatex and this variable helps
+## on Ubuntu so for now Dirk will insist on pdflatex and this helps.
 whoami=$(shell whoami)
 
-all: clean index.html Rcpp-unitTests.pdf Rcpp-introduction.pdf Rcpp-modules.pdf Rcpp-package.pdf Rcpp-FAQ.pdf Rcpp-extending.pdf Rcpp-sugar.pdf Rcpp-quickref.pdf
+all: rotateFiles index.html Rcpp-unitTests.pdf Rcpp-introduction.pdf Rcpp-modules.pdf Rcpp-package.pdf Rcpp-FAQ.pdf Rcpp-extending.pdf Rcpp-sugar.pdf Rcpp-quickref.pdf
 
 pdfclean:
 	rm -f Rcpp-extending.pdf  Rcpp-FAQ.pdf  Rcpp-introduction.pdf  Rcpp-modules.pdf  Rcpp-package.pdf  Rcpp-quickref.pdf  Rcpp-sugar.pdf  Rcpp-unitTests.pdf
-clean:
-	rm -f index.html
-	rm -f *.tex *.bbl *.blg *.aux *.out *.log
+
+rotateFiles:
 	cp -f Rcpp-extending/Rcpp-extending-fake.Rnw Rcpp-extending.Rnw
 	cp -f Rcpp-FAQ/Rcpp-FAQ-fake.Rnw Rcpp-FAQ.Rnw
 	cp -f Rcpp-modules/Rcpp-modules-fake.Rnw Rcpp-modules.Rnw
@@ -22,6 +21,10 @@
 	cp -f Rcpp-quickref/Rcpp-quickref-fake.Rnw Rcpp-quickref.Rnw
 	cp -f Rcpp-sugar/Rcpp-sugar-fake.Rnw Rcpp-sugar.Rnw
 
+clean:
+	rm -f index.html
+	rm -f *.tex *.bbl *.blg *.aux *.out *.log
+
 setvars:
 ifeq (${R_HOME},)
 R_HOME=	$(shell R RHOME)