[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/ncc nesdoc.1, 1.2, 1.3 nesdoc.in, 1.3, 1.4

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/ncc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32217/tools/tinyos/ncc

Modified Files:
	nesdoc.1 nesdoc.in 
Log Message:
-quiet option for nesdoc


Index: nesdoc.1
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/ncc/nesdoc.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nesdoc.1	12 Jul 2006 17:00:55 -0000	1.2
--- nesdoc.1	2 May 2008 20:49:44 -0000	1.3
***************
*** 13,22 ****
  .br
  \fBnesdoc\fR -o \fIdocumentation-directory\fR [\fB-preserve\fR]
!         [\fB-new\fR] [\fB-target=\fIplatform\fR] [\fB-topdir=\fIdirectory\fR]
!         [\fIncc-options\fR] \fIfiles...\fR
  
  TinyOS 2.x: generate nesdoc HTML pages:
  .br
! \fBnesdoc\fR -o \fIdocumentation-directory\fR  [\fB-new\fR] [\fB-target=\fIplatform\fR] \fB-html\fR
  
  .SH DESCRIPTION
--- 13,23 ----
  .br
  \fBnesdoc\fR -o \fIdocumentation-directory\fR [\fB-preserve\fR]
!        [\fB-new\fR] [\fB-quiet\fR] [\fB-target=\fIplatform\fR] [\fB-topdir=\fIdirectory\fR]
!        [\fIncc-options\fR] \fIfiles...\fR
  
  TinyOS 2.x: generate nesdoc HTML pages:
  .br
! \fBnesdoc\fR -o \fIdocumentation-directory\fR \fB-html\fR
!        [\fB-new\fR] [\fB-quiet\fR] [\fB-target=\fIplatform\fR]
  
  .SH DESCRIPTION
***************
*** 69,72 ****
--- 70,76 ----
  Force the use of the new nesdoc even when using a TinyOS 1.x source tree.
  .TP
+ \fB-quiet\fR
+ Don't print informational messages.
+ .TP
  \fB-topdir=\fIdir\fR 
  Specify directory paths that should be stripped from the source file names

Index: nesdoc.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/ncc/nesdoc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nesdoc.in	1 Jun 2007 23:07:20 -0000	1.3
--- nesdoc.in	2 May 2008 20:49:44 -0000	1.4
***************
*** 98,101 ****
--- 98,105 ----
  	    $strip = 1;
  	}
+ 	elsif (/^-quiet$/) {
+ 	    $quiet = 1;
+ 	    $strip = 1;
+ 	}
      }
      push @ncc_args, $_ if !$strip;
***************
*** 118,122 ****
  
  if ($genhtml) {
!     execorfail($python, "$libprogs/nesdoc/genhtml.py", $docdir)
  }
  
--- 122,130 ----
  
  if ($genhtml) {
!     push @html_args, $python;
!     push @html_args, "$libprogs/nesdoc/genhtml.py";
!     push @html_args, "--quiet" if $quiet;
!     push @html_args, $docdir;
!     execorfail(@html_args);
  }
  
***************
*** 151,154 ****
--- 159,163 ----
  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";