Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tools / tinyos / ncc / nesdoc.in

diff --git a/tools/tinyos/ncc/nesdoc.in b/tools/tinyos/ncc/nesdoc.in
index 47a731de3daa21977550d753db5dbd4ad116d4e4..8c76fbc4a4f3d25621fba0cfc227be4f523203b1 100644 (file)
--- a/tools/tinyos/ncc/nesdoc.in
+++ b/tools/tinyos/ncc/nesdoc.in
@@ -68,7 +68,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     $_ = $ARGV[$i];
     if (/^-/) {
        if (/^-topdir=(.*)/) {
-            push @archive_args, $1;
+            push @archive_args, "--topdir=$1";
            $strip = 1;
        }
        elsif (/^--version$/) {
@@ -97,6 +97,10 @@ for ($i = 0; $i <= $#ARGV; $i++) {
            $app = 1;
            $strip = 1;
        }
+       elsif (/^-quiet$/) {
+           $quiet = 1;
+           $strip = 1;
+       }
     }
     push @ncc_args, $_ if !$strip;
 }
@@ -117,7 +121,11 @@ else {
 }
 
 if ($genhtml) {
-    execorfail($python, "$libprogs/nesdoc/genhtml.py", $docdir)
+    push @html_args, $python;
+    push @html_args, "$libprogs/nesdoc/genhtml.py";
+    push @html_args, "--quiet" if $quiet;
+    push @html_args, $docdir;
+    execorfail(@html_args);
 }
 
 # Collecting nesdoc data. Run ncc, then process the results with
@@ -129,7 +137,7 @@ unshift @ncc_args, "-fnesc-dump=interfacedefs";
 unshift @ncc_args, "-fnesc-dump=components(wiring)";
 unshift @ncc_args, "-fnesc-dump=interfaces";
 unshift @ncc_args, "-fnesc-dump=functions(!global())";
-unshift @ncc_args, "-fnesc-dump=referenced(interfaces,components)";
+unshift @ncc_args, "-fnesc-dump=referenced(interfaces,components,functions)";
 unshift @ncc_args, "$exec_prefix/bin/ncc";
 
 print STDERR join(' ', @ncc_args), "\n" if $verbose;
@@ -150,6 +158,7 @@ chomp $toscontainer;
 push @archive_args, "--topdir=$toscontainer";
 push @archive_args, "--preserve" if $preserve;
 push @archive_args, "--app" if $app;
+push @archive_args, "--quiet" if $quiet;
 push @archive_args, "$docdir";
 unshift @archive_args, "$libprogs/nesdoc/archive.py";
 unshift @archive_args, $python;