moved bibtext file to be always accessible

eddelbuettel · eddelbuettel · commit 316682937cc7 · 2017-01-12T10:52:21.000-06:00
location in vignettes meant installation from source made it unavailable
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2017-01-12  Dirk Eddelbuettel  <edd@debian.org>
+
+        * inst/bib/Rcpp.bib: Moved from vignettes/ directory
+        * R/bib.R (bib): Idem
+
+        * vignettes/Rcpp-FAQ.Rnw: Evaluate \Sexpr{Rcpp:::bib()}
+        * vignettes/Rcpp-attributes.Rnw: Idem
+        * vignettes/Rcpp-extending.Rnw: Idem
+        * vignettes/Rcpp-introduction.Rnw: Idem
+        * vignettes/Rcpp-modules.Rnw: Idem
+        * vignettes/Rcpp-packages.Rnw: Idem
+        * vignettes/Rcpp-sugar.Rnw: Idem
+
 2017-01-11  Dirk Eddelbuettel  <edd@debian.org>
 
         * vignettes/Rcpp.bib: Updated references
diff --git a/R/bib.R b/R/bib.R
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2010 - 2017  Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -16,5 +16,5 @@
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
 bib <- function() {
-    sub("\\.bib$", "", system.file( "doc", "Rcpp.bib", package = "Rcpp" ) )
+    sub("\\.bib$", "", system.file("bib", "Rcpp.bib", package = "Rcpp"))
 }
diff --git a/inst/bib/Rcpp.bib b/inst/bib/Rcpp.bib
diff --git a/vignettes/Rcpp-FAQ.Rnw b/vignettes/Rcpp-FAQ.Rnw
@@ -1329,7 +1329,6 @@ We have since switched to a \href{http://github.com/RcppCore/Rcpp}{Git
 \pkg{RcppEigen}).
 
 \bibliographystyle{plainnat}
-\bibliography{Rcpp}
-
+\bibliography{\Sexpr{Rcpp:::bib()}}
 \end{document}
 
diff --git a/vignettes/Rcpp-attributes.Rnw b/vignettes/Rcpp-attributes.Rnw
@@ -823,7 +823,7 @@ when headers in \texttt{inst/include} change, so you should be sure to perform a
 full rebuild of the package after making changes to these headers.
 
 \bibliographystyle{plainnat}
-\bibliography{Rcpp}
+\bibliography{\Sexpr{Rcpp:::bib()}}
 
 \end{document}
 
diff --git a/vignettes/Rcpp-extending.Rnw b/vignettes/Rcpp-extending.Rnw
@@ -367,7 +367,7 @@ to either user-defined or third-party classes via the \texttt{Rcpp::as} and
 approaches were discussed.
 
 \bibliographystyle{plainnat}
-\bibliography{Rcpp}
+\bibliography{\Sexpr{Rcpp:::bib()}}
 
 \end{document}
 
diff --git a/vignettes/Rcpp-introduction.Rnw b/vignettes/Rcpp-introduction.Rnw
@@ -1064,7 +1064,7 @@ Ligges, Brian Ripley and Simon Urbanek concerning the build systems for differen
 platforms.   Last but not least, several users provided very fruitful
 ideas for new or extended features via the \code{rcpp-devel} mailing list.
 
-\bibliography{Rcpp}
+\bibliography{\Sexpr{Rcpp:::bib()}}
 
 \vspace*{-0.35cm}
 
diff --git a/vignettes/Rcpp-modules.Rnw b/vignettes/Rcpp-modules.Rnw
@@ -1047,7 +1047,7 @@ We hope that \proglang{R} and \proglang{C++} programmers
 find \textsl{Rcpp modules} useful.
 
 \bibliographystyle{plainnat}
-\bibliography{Rcpp}
+\bibliography{\Sexpr{Rcpp:::bib()}}
 
 \end{document}
 
diff --git a/vignettes/Rcpp-package.Rnw b/vignettes/Rcpp-package.Rnw
@@ -470,7 +470,7 @@ package. The use of the \rdoc{Rcpp}{Rcpp.package.skeleton} was shown in
 detail, and references to further examples were provided.
 
 \bibliographystyle{plainnat}
-\bibliography{Rcpp}
+\bibliography{\Sexpr{Rcpp:::bib()}}
 
 \end{document}
 
diff --git a/vignettes/Rcpp-sugar.Rnw b/vignettes/Rcpp-sugar.Rnw
@@ -773,7 +773,7 @@ inline int size() const { return vec.size() ; }
 TBD
 
 \bibliographystyle{plainnat}
-\bibliography{Rcpp}
+\bibliography{\Sexpr{Rcpp:::bib()}}
 
 \end{document}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois`
	`1`	`+# Copyright (C) 2010 - 2017 Dirk Eddelbuettel and Romain Francois`
`2`	`2`	`#`
`3`	`3`	`# This file is part of Rcpp.`
`4`	`4`	`#`
`@@ -16,5 +16,5 @@`
`16`	`16`	`# along with Rcpp. If not, see <http://www.gnu.org/licenses/>.`
`17`	`17`
`18`	`18`	`bib <- function() {`
`19`		`- sub("\\.bib$", "", system.file( "doc", "Rcpp.bib", package = "Rcpp" ) )`
	`19`	`+ sub("\\.bib$", "", system.file("bib", "Rcpp.bib", package = "Rcpp"))`
`20`	`20`	`}`