The R Project SVN R

Rev

Rev 26283 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26283 Rev 26303
Line 35... Line 35...
35 
use Text::Wrap;
 35 
use Text::Wrap;
36 
 
 36 
 
37 
## don't buffer output
 37 
## don't buffer output
38 
$| = 1;
 38 
$| = 1;
39 
 
 39 
 
40 
my $revision = ' $Revision: 1.151 $ ';
 40 
my $revision = ' $Revision: 1.152 $ ';
41 
my $version;
 41 
my $version;
42 
my $name;
 42 
my $name;
43 
$revision =~ / ([\d\.]*) /;
 43 
$revision =~ / ([\d\.]*) /;
44 
$version = $1;
 44 
$version = $1;
45 
($name = $0) =~ s|.*/||;
 45 
($name = $0) =~ s|.*/||;
Line 1534... Line 1534...
1534 
	    $log->print("  " . join("\n  ", @bad_vignettes) . "\n");
 1534 
	    $log->print("  " . join("\n  ", @bad_vignettes) . "\n");
1535 
	}
 1535 
	}
1536 
 
 1536 
 
1537 
	## Can we run the code in the vignettes?
 1537 
	## Can we run the code in the vignettes?
1538 
	if($opt_vignettes) {
 1538 
	if($opt_vignettes) {
1539 
	    my $Rcmd;
 1539 
	    ## <FIXME>
- 
 
 1540 
	    ## Should checking the vignettes assume the system default
- 
 
 1541 
	    ## packages, or just base?
- 
 
 1542 
	    my $Rcmd = "library(tools)\n";
1540 
	    if($opt_install) {
 1543 
	    if($opt_install) {
1541 
		$Rcmd .= "checkVignettes(package=\"${pkgname}\", " .
 1544 
		$Rcmd .= "checkVignettes(package=\"${pkgname}\", " .
1542 
		         "lib.loc = \"$pkgoutdir\", " .
 1545 
		         "lib.loc = \"$pkgoutdir\", " .
1543 
		         "workdir=\"src\")\n";
 1546 
		         "workdir=\"src\")\n";
1544 
	    }
 1547 
	    }
1545 
	    else {
 1548 
	    else {
1546 
		$Rcmd .= "checkVignettes(dir = \"${pkgdir}\")\n";
 1549 
		$Rcmd .= "checkVignettes(dir = \"${pkgdir}\")\n";
1547 
	    }
 1550 
	    }
1548 
 
 - 
 
1549 
	    my @out = R_runR($Rcmd, "${R_opts} --quiet",
 1551 
	    my @out = R_runR($Rcmd, "${R_opts} --quiet");
1550 
			     "R_DEFAULT_PACKAGES=tools");
 1552 
	    ## </FIXME>
1551 
	    ## Vignette could redefine the prompt, e.g. to 'R>' ...
 1553 
	    ## Vignette could redefine the prompt, e.g. to 'R>' ...
1552 
	    @out = grep(!/^[[:alnum:]]*\>/, @out);
 1554 
	    @out = grep(!/^[[:alnum:]]*\>/, @out);
1553 
	    if($#out >= 0) {
 1555 
	    if($#out >= 0) {
1554 
		$log->warning() unless($any);
 1556 
		$log->warning() unless($any);
1555 
		$any++;
 1557 
		$any++;