Skip to content

Commit 7ab7e76

Browse files
author
smeyer
committed
bail out if base Rd doesn't parse cleanly
git-svn-id: https://svn.r-project.org/R/trunk@88228 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 3761aeb commit 7ab7e76

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ R: Makefile svnonly
7070

7171
docs: R FORCE
7272
@(cd doc && $(MAKE) $@)
73-
-@(cd src/library && $(MAKE) $@)
73+
@(cd src/library && $(MAKE) $@)
7474
FORCE:
7575

7676
stamp-recommended: R docs

doc/NEWS.Rd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
}
4141
}
4242
43+
\subsection{INSTALLATION on a UNIX-ALIKE}{
44+
\itemize{
45+
\item Failures in building the documentation for the base packages,
46+
including from parsing their Rd files, are no longer ignored by
47+
\command{make docs}.
48+
}
49+
}
50+
4351
\subsection{PACKAGE INSTALLATION}{
4452
\itemize{
4553
\item .

src/library/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RD-TS = base.Rdts stats.Rdts utils.Rdts methods.Rdts graphics.Rdts grDevices.Rdt
7070
# RD-TS = $(R_PKGS_BASE:=.Rdts)
7171

7272
.inn.Rdts:
73-
@$(ECHO) "options(warn=1);tools:::.install_package_Rd_objects('$(srcdir)/$*',\
73+
@$(ECHO) "options(warn=2);tools:::.install_package_Rd_objects('$(srcdir)/$*',\
7474
'$(top_builddir)/library/$*')" | \
7575
R_DEFAULT_PACKAGES=NULL $(R_EXE) || exit 1
7676
@$(ECHO) " $*"

src/library/Makefile.win

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RD-TS = base.Rdts stats.Rdts utils.Rdts methods.Rdts graphics.Rdts grDevices.Rdt
7272
Rd-ts: $(RD-TS)
7373

7474
%.Rdts:
75-
@$(ECHO) "options(warn=1);tools:::.install_package_Rd_objects(\"$(srcdir)/$*\", \"$(top_builddir)/library/$*\")" | R_DEFAULT_PACKAGES=NULL $(R_EXE) || exit 1
75+
@$(ECHO) "options(warn=2);tools:::.install_package_Rd_objects(\"$(srcdir)/$*\", \"$(top_builddir)/library/$*\")" | R_DEFAULT_PACKAGES=NULL $(R_EXE) || exit 1
7676
@$(ECHO) -n " $*$(ECHO_C)"
7777

7878
Rdobjects:

0 commit comments

Comments
 (0)