make fullcheck

git-svn-id: https://svn.r-project.org/R/trunk@21242 00db46b3-68df-0310-9c12-caf00c1e9a41

Makeconf.in

@@ -59,6 +59,7 @@ PERL = @PERL@
 R_GUIS = @R_GUIS@
 R_PKGS_BASE = base ctest eda lqs methods modreg mva nls splines stepfun tcltk tools ts
 R_PKGS_RECOMMENDED = survival boot cluster foreign grid lattice KernSmooth mgcv nlme rpart VR
+R_PKGS_RECOMMENDED_EXPANDED = survival boot cluster foreign grid lattice KernSmooth mgcv nlme rpart MASS nnet spatial class
 R_PKGS = $(R_PKGS_BASE) @USE_RECOMMENDED_PACKAGES_TRUE@ $(R_PKGS_RECOMMENDED)
 R_XTRA_CFLAGS = @R_XTRA_CFLAGS@
 R_XTRA_CPPFLAGS = @R_XTRA_CPPFLAGS@ -I. -I$(top_builddir)/src/include -I$(top_srcdir)/src/include

Makefile.in

@@ -153,10 +153,10 @@ install-dvi install-info install-pdf:
 uninstall-dvi uninstall-info uninstall-pdf:
 	-@(cd doc/manual && $(MAKE) $@)
 
-check:
+check fullcheck:
 	@(cd tests && $(MAKE) $@)
 
 reset-recommended:
-	@(cd src/library/Recommended && rm -f Timestamp && $(MAKE) Timestamp)
+	@(cd src/library/Recommended && $(MAKE) clean)
 
 TAGS:

tests/Examples/Makefile.in

@@ -18,10 +18,13 @@ R = $(top_builddir)/bin/R --vanilla
 EX_IN = $(R_PKGS_BASE:=-Ex.R)
 EX_OUT = $(EX_IN:.R=.Rout)
 
+RECOMMENDED_EX_IN = $(R_PKGS_RECOMMENDED_EXPANDED:=-Ex.R)
+RECOMMENDED_EX_OUT = $(RECOMMENDED_EX_IN:.R=.Rout)
+
 .SUFFIXES:
 .SUFFIXES: .R .Rout
 
-all: Makefile Makedeps test-Examples
+all: Makefile Makedeps test-Examples 
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -37,11 +40,15 @@ Makedeps: Makefile
 	    echo $${dep}; \
 	  done) >> Makefile
 	@touch $@
-
-test-Examples: Makefile
+test-Examples: test-Base-Examples
+test-Base-Examples: Makefile
 	@$(MAKE) Makedeps
 	@$(MAKE) $(EX_OUT)
 
+test-Recommended-Examples: test-Base-Examples
+	@$(MAKE) $(RECOMMENDED_EX_OUT)
+
+
 R:
 	@cd $(top_builddir) && $(MAKE) R
 
@@ -71,12 +78,32 @@ $(EX_IN): FORCE
 	  $(top_srcdir)/tools/move-if-change $${f} $@; \
 	  touch $@; \
 	fi)
+$(RECOMMENDED_EX_IN): FORCE
+	@(pkg=`basename $@ -Ex.R`; \
+	if [ $(top_builddir)/library/$${pkg} -nt "$@" ]; then \
+	  if test -f $@ ; then \
+	    if test -n "`tail -6 $@ | grep '^Time elapsed'`" ; then \
+	      if test -f $@.bak ; then mv $@.bak $@.bakk ; fi; \
+	      cp -p $@ $@.bak; \
+	    fi; \
+	  fi; \
+	  echo "collecting examples for package '$${pkg}' ..."; \
+	  f=$${TMPDIR-/tmp}/R$$$$; \
+	  $(PERL) $(top_srcdir)/share/perl/massage-Examples.pl $${pkg} \
+	    $(top_builddir)/library/$${pkg}/R-ex > $${f}; \
+	  $(top_srcdir)/tools/move-if-change $${f} $@; \
+	  touch $@; \
+	fi)
 FORCE:
 
 $(EX_OUT): Makefile \
   $(top_builddir)/bin/R.bin \
   $(top_builddir)/library/base/R/base \
   $(top_builddir)/modules/lapack$(SHLIB_EXT)
+$(RECOMMENDED_EX_OUT): Makefile \
+  $(top_builddir)/bin/R.bin \
+  $(top_builddir)/library/base/R/base \
+  $(top_builddir)/modules/lapack$(SHLIB_EXT)
 
 base-Ex.Rout: $(top_builddir)/modules/vfonts$(SHLIB_EXT)
 

tests/Makefile.in

@@ -95,6 +95,7 @@ test-out = $(test-src:.R=.Rout) $(test-out-gct) \
 .SUFFIXES: .R .Rin .Rout .Rout-gct
 
 all check: Makefile test-all-basics
+fullcheck: check test-Recommended-Examples
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -148,6 +149,8 @@ test-all-basics: Makefile
 	done
 test-Examples:
 	@(cd Examples && $(MAKE) $@)
+test-Recommended-Examples:
+	@(cd Examples && $(MAKE) $@)
 test-Specific-strict: $(test-out-strict)
 test-Specific-sloppy: $(test-out-sloppy)
 test-Specific: