Permalink
Browse files

update comments, more use of sQuote

git-svn-id: https://svn.r-project.org/R/trunk@56482 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 1601bc2 commit a95822b798060e3223fe1830afc60192e55489ea ripley committed Jul 24, 2011
Showing with 17 additions and 13 deletions.
  1. +3 −1 doc/NEWS.Rd
  2. +2 −2 share/make/vars.mk
  3. +3 −2 src/library/Makefile.in
  4. +2 −2 src/library/Makefile.win
  5. +7 −6 src/library/tools/R/QC.R
View
@@ -242,7 +242,9 @@
used the named font for mononspaced output. They are intended to
be used in combination with \samp{times}, and
\samp{times,inconsolata,hyper} is now the default for the
- reference manual and package manuals.
+ reference manual and package manuals. If you do not have that
+ font installed, you can set \env{R_RD4PF} to one of the other
+ options: see the \sQuote{R Installation and Administration Manual}.
\item Automatic printing for reference classes is now done by
the \code{$show()} method. A method is defined for class % $
View
@@ -2,9 +2,9 @@
## shared *and* grepped from m4/R.m4 and tools/*-recommended.
R_PKGS_BASE = base tools utils grDevices graphics stats datasets methods grid splines stats4 tcltk compiler
-## Those which can be installed initially compiled
+## Those which can be installed initially compiled (not base tools)
R_PKGS_BASE1 = utils grDevices graphics stats datasets methods grid splines stats4 tcltk
-## Those with standard make procedures (not datasets, methods)
+## Those with standard R directories (not datasets, methods)
R_PKGS_BASE2 = base tools utils grDevices graphics stats grid splines stats4 tcltk compiler
R_PKGS_RECOMMENDED = MASS lattice Matrix nlme survival boot cluster codetools foreign KernSmooth rpart class nnet spatial mgcv
View
@@ -30,7 +30,7 @@ R_PKGS_CMP = @BYTE_COMPILE_PACKAGES_TRUE@ base tools
## Beware there is a bootstrapping problem here: tools uses tools to
## dump its namespace. So it works initially, but not to update.
## When base is made we need to use 'date' to set the timestamp in
-## its DESCRIPTION , so we remake it before dumping the DESCRIPTION files.
+## its DESCRIPTION, so we remake it before dumping the DESCRIPTION files.
R:
@$(MKINSTALLDIRS) $(top_builddir)/library
@@ -184,7 +184,8 @@ distdir: $(DISTFILES)
### These are intended to be run on an already-built R, possibly after
### editing the code in a standard package.
### Targets of the same name can be run in individual package directories.
-### These do not change datasets (never lazy-loaded)
+### These do not change datasets (no R code)
+### R_PKGS_BASE2 is all except datasets and methods.
### They are not currently safe for a parallel make.
View
@@ -120,12 +120,12 @@ clean:
### These are intended to be run on an already-built R, possibly after
### editing the code in a standard package.
### Targets of the same name can be run in individual package directories.
-### These do not change datasets (never lazy-loaded)
+### These do not change datasets (no R code)
+### R_PKGS_BASE2 is all except datasets and methods.
### They are not currently safe for a parallel make.
## methods needs to be dumped, so is omitted here.
-## This installs all.R as the R directory in a package
Rsimple:
@for pkg in $(R_PKGS_BASE2); do \
$(MAKE) -C $${pkg} -f Makefile.win Rsimple || exit 1; \
View
@@ -2629,39 +2629,40 @@ function(x, ...)
.pretty_format(bad),
"")
} else if(length(bad)) {
- c(gettextf("Package required and available but unsuitable version: %s", bad),
+ c(gettextf("Package required and available but unsuitable version: %s", sQuote(bad)),
"")
},
if(length(bad <- x$required_but_stub) > 1L) {
c(gettext("Former standard packages required but now defunct:"),
.pretty_format(bad),
"")
} else if(length(bad)) {
- c(gettextf("Package required but not available: %s", bad),
+ c(gettextf("Package required but not available: %s", sQuote(bad)),
"")
},
if(length(bad <- x$suggests_but_not_installed) > 1L) {
c(gettext("Packages suggested but not available for checking:"),
.pretty_format(bad),
"")
} else if(length(bad)) {
- c(gettextf("Package suggested but not available for checking: %s", bad),
+ c(gettextf("Package suggested but not available for checking: %s",
+ sQuote(bad)),
"")
},
if(length(bad <- x$enhances_but_not_installed) > 1L) {
c(gettext("Packages which this enhances but not available for checking:"),
.pretty_format(bad),
"")
} else if(length(bad)) {
- c(gettextf("Package which this enhances but not available for checking: %s", bad),
+ c(gettextf("Package which this enhances but not available for checking: %s", sQuote(bad)),
"")
},
if(length(bad <- x$missing_vignette_depends)) {
c(if(length(bad) > 1L) {
c(gettext("Vignette dependencies not required:"),
.pretty_format(bad))
} else {
- gettextf("Vignette dependencies not required: %s", bad)
+ gettextf("Vignette dependencies not required: %s", sQuote(bad))
},
strwrap(gettext("Vignette dependencies (\\VignetteDepends{} entries) must be contained in the DESCRIPTION Depends/Suggests/Imports entries.")),
"")
@@ -2671,7 +2672,7 @@ function(x, ...)
.pretty_format(bad),
"")
} else if(length(bad)) {
- c(gettextf("Namespace dependency not required: %s", bad),
+ c(gettextf("Namespace dependency not required: %s", sQuote(bad)),
"")
}
)

0 comments on commit a95822b

Please sign in to comment.