The R Project SVN – R – Diff – /trunk/src/scripts/check.in

 use Text::Wrap;
 ## Don't buffer output.
 $| = 1;
-my $revision = ' $Revision: 1.184 $ ';
+my $revision = ' $Revision: 1.185 $ ';
 my $version;
 my $name;
 $revision =~ / ([\d\.]*) /;
 $version = $1;
 ($name = $0) =~ s|.*/||;
 		break;
+	    }
+	}
 	if($found != 0) {
 	    $log->error();
+	    $log->print("Invalid package name.\n");
-	    $log->print("Invalid package name: this is the name of a base package.\n");
+	    $log->print("This is the name of a base package.\n");
 	    exit(1);
+	}
         $found = 0;
         foreach my $p (@R_pkgs_stubs) {
 	    if($description->{"Package"} eq $p) {
+	}
 	if($found != 0) {
 	    $log->error();
 	    $log->print("Invalid package name.\n");
 	    $log->print(wrap("", "",
-			     ("This name was been used for a base package",
+			     ("This name was used for a base package",
 			      "and is remapped by library().\n")));
 	    exit(1);
+	}
+    }
 	$log->print(wrap("", "", @msg_DESCRIPTION));
 	exit(1);
+    }
     ## Optional entries in DESCRIPTION:
-    ##   Depends, Namespace, Priority.
+    ##   Depends/Suggests, Namespace, Priority.
     ## These must be correct if present.
-    ## <FIXME>
-    ## We should also check Suggests here, but what precisely is allowed
-    ## for this?
-    ## </FIXME>
-    if($description->{"Depends"}) {
+    if($description->{"Depends"} || $description->{"Suggests"}) {
-	my @dependencies = split(/\,\s*/, $description->{"Depends"});
+	my @dependencies = split(/\,\s*/, ($description->{"Depends"},
+					   $description->{"Suggests"}));
 	my @matches;
 	my ($is_bad_dep_op, $is_bad_dep_version);
 	my ($bad_dep_value, @bad_dep_error);
 	foreach my $dep (@dependencies) {
 	    @matches =
 		break;
+	    }
+	}
 	if($bad_dep_entry) {
 	    $log->error();
-	    $log->print("Malformed Depends field.\n");
+	    $log->print("Malformed Depends or Suggests field.\n");
 	    $log->print("Offending entry is: '$bad_dep_entry'.\n");
 	    $log->print(wrap("", "", @bad_dep_error));
 	    $log->print(wrap("", "", @msg_DESCRIPTION));
 	    exit(1);
+	}
     ## named 'value'.
     if(-d "R") {
 	$log->checking("for replacement functions with final arg not " .
 		       "named 'value'");
+	## <FIXME>
+	##   @msg_replace_funs
+	## </FIXME>
 	my $Rcmd;
 	if($opt_install) {
 	    $Rcmd .= "checkReplaceFuns(package = \"${pkgname}\")\n";
+	}
 	else {
     ## Check for code/documentation mismatches.
     if($opt_codoc && (-d "man")) {
 	$log->checking("for code/documentation mismatches");
+	## <FIXME>
+	##   @msg_codoc
+	## </FIXME>
 	my $any = 0;
 	## Check for code/documentation mismatches in functions.
 	if(-d "R") {
 	    my $Rcmd;
     ## aliases (do all functions shown in \usage have an alias?)
     if(-d "man") {
 	$log->checking("Rd \\usage sections");
+	## <FIXME>
+	##   @msg_doc_files
+	## </FIXME>
 	my $Rcmd;
 	if($opt_install) {
 	    $Rcmd .= "checkDocFiles(package = \"${pkgname}\")\n";
+	}
 	else {
     if($opt_examples && (-d &file_path($library, $pkgname, "R-ex"))) {
 	$log->creating("${pkgname}-Ex.R");
 	my $Rexdir = &file_path($library, $pkgname, "R-ex");
         ## $Rexdir might contain spaces (not on Windows)
-        my $iszipped = 0;
+        my $is_zipped = 0;
 	my $cmd;
         if(-e &file_path($Rexdir, "Rex.zip")) {
-            $iszipped = 1;
+            $is_zipped = 1;
 	    my $UNZIP = &R_getenv("R_UNZIPCMD", "unzip -q");
             my $Rexfile = &file_path($Rexdir, "Rex.zip");
 	    $cmd = join(" ",
 			("$UNZIP",
 			 &shell_quote_file_path($Rexfile),
   	    $log->error();
 	    $log->print("Running massage-Examples to create " .
 			"${pkgname}-Ex.R failed.\n");
   	    exit(1);
+        }
-        if($iszipped) {
+        if($is_zipped) {
             unlink(&list_files_with_exts($Rexdir, "R"));
+        }
 	$log->result("OK");
 	$log->checking("examples");
     ## Check package vignettes.
     chdir($pkgoutdir);
-    if((-d &file_path($pkgdir, "inst", "doc"))
+    my $vignette_dir = &file_path($pkgdir, "inst", "doc");
+    if((-d $vignette_dir)
-       && &list_files_with_type(&file_path($pkgdir, "inst", "doc"),
+       && &list_files_with_type($vignette_dir, "vignette")) {
-				"vignette")) {
-	$log->checking(join("",
+	$log->checking(join(" ",
-			    ("package vignettes in '",
+			    ("package vignettes in",
-			     &file_path("inst", "doc"),
+			     &sQuote(&file_path("inst", "doc")))));
-			     "'")));
 	my $any = 0;
 	## Do PDFs exist for all package vignettes?
 	my @vignette_files =
-	  &list_files_with_type(&file_path($pkgdir, "inst", "doc"),
+	  &list_files_with_type($vignette_dir, "vignette");
-				"vignette");
 	my @bad_vignettes = ();
 	foreach my $file (@vignette_files) {
 	    my $pdf_file = $file;
 	    $pdf_file =~ s/\.[[:alpha:]]+$/.pdf/;
 	    push(@bad_vignettes, $file) unless(-f $pdf_file);
         my $latex_dir = &file_path($library, $pkgname, "latex");
 	if(-d $latex_dir) {
 	    $ENV{'TEXINPUTS'} =
 	      env_path(&file_path($R::Vars::R_HOME, "share", "texmf"),
 		       $ENV{'TEXINPUTS'});
-            my $was_zipped = 0;
+            my $is_zipped = 0;
             # latex files might have been zipped
-            if(-f &file_path($library, $pkgname, "latex", "Rhelp.zip")) {
+            if(-f &file_path($latex_dir, "Rhelp.zip")) {
-                $was_zipped = 1;
+                $is_zipped = 1;
+		my $UNZIP = &R_getenv("R_UNZIPCMD", "unzip -q");
-                my $cmd = "cd $latex_dir; unzip -qo Rhelp.zip";
+		my $latex_file = &file_path($latex_dir, "Rhelp.zip");
+		$cmd = join(" ",
+			    ("$UNZIP",
+			     &shell_quote_file_path($latex_file),
+			     "-d",
+			     &shell_quote_file_path($latex_dir)));
                 if(R_system($cmd)) {
 		    $log->error();
 		    $log->print("Unzipping latex files failed.\n");
 		    exit(1);
+                }
+		}
 		close(FILE);
+	    }
 	    print MANUAL "\\end\{document\}\n";
 	    close(MANUAL);
-            if($was_zipped) {
+            if($is_zipped) {
-                if(R_system("rm -f $latex_dir/*.tex")) {
+		unlink(&list_files_with_exts($latex_dir, "tex"));
-		    $log->error();
-		    $log->print("Removing unzipped latex files failed.\n");
-		    exit(1);
-                }
+            }
 	    $log->result("OK");
 	    if($HAVE_LATEX) {
 		$log->checking("${pkgname}-manual.tex");
 		## <NOTE>

The R Project SVN R

(root)/trunk/src/scripts/check.in @ 29654 – Rev 29528 → 29564