Skip to content

Commit 438e142

Browse files
committed
remove local copy of pkgKitten::playWithPackageHelpPage()
- updated pkgKitten is now on CRAN - also update DESCRIPTION with versioned Suggests
1 parent 86c5a18 commit 438e142

File tree

2 files changed

+3
-25
lines changed

2 files changed

+3
-25
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
33
Version: 0.11.2.4
4-
Date: 2014-09-08
4+
Date: 2014-09-10
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey,
66
Douglas Bates, and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>
@@ -51,7 +51,7 @@ Description: The Rcpp package provides R functions as well as a C++ library
5151
see 'citation("Rcpp")' for details.
5252
Depends: R (>= 3.0.0)
5353
Imports: methods
54-
Suggests: RUnit, inline, rbenchmark, highlight, pkgKitten
54+
Suggests: RUnit, inline, rbenchmark, highlight, pkgKitten (>= 0.1.1)
5555
VignetteBuilder: highlight
5656
URL: http://www.rcpp.org, http://dirk.eddelbuettel.com/code/rcpp.html, https://github.com/RcppCore/Rcpp
5757
License: GPL (>= 2)

R/Rcpp.package.skeleton.R

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,6 @@
1717
# You should have received a copy of the GNU General Public License
1818
# along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
1919

20-
## local copy til pkgKitten is updated on CRAN
21-
.pkgKittenPlayWithPerPackageHelpPage <- function(name = "anRpackage",
22-
path = ".",
23-
maintainer = "Your Name",
24-
email = "[email protected]") {
25-
root <- file.path(path, name)
26-
helptgt <- file.path(root, "man", sprintf( "%s-package.Rd", name))
27-
helpsrc <- system.file("replacements", "manual-page-stub.Rd", package="pkgKitten")
28-
## update the package description help page
29-
if (file.exists(helpsrc)) {
30-
lines <- readLines(helpsrc)
31-
lines <- gsub("__placeholder__", name, lines, fixed = TRUE)
32-
lines <- gsub("Who to complain to <[email protected]>",
33-
sprintf( "%s <%s>", maintainer, email),
34-
lines, fixed = TRUE)
35-
writeLines(lines, helptgt)
36-
}
37-
invisible(NULL)
38-
}
39-
40-
4120
Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
4221
environment = .GlobalEnv,
4322
path = ".", force = FALSE,
@@ -141,8 +120,7 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
141120

142121
## update the package description help page
143122
if (havePkgKitten) { # if pkgKitten is available, use it
144-
#pkgKitten::playWithPerPackageHelpPage(name, path, maintainer, email)
145-
.pkgKittenPlayWithPerPackageHelpPage(name, path, maintainer, email)
123+
pkgKitten::playWithPerPackageHelpPage(name, path, maintainer, email)
146124
} else {
147125
package_help_page <- file.path(root, "man", sprintf( "%s-package.Rd", name))
148126
if (file.exists(package_help_page)) {

0 commit comments

Comments
 (0)