Fix for bug #688 (documentation building)

Dustin Navea speeddymon at yahoo.com
Sat Nov 9 21:44:35 CST 2002


why create code bloat?  make it &> /dev/null and remove the > /dev/null and
the 2>&1 ...  &> /dev/null covers both quite nicely

-Dustin
--- Sylvain Petreolle <spetreolle at yahoo.fr> wrote:
> We should test if the db2xxxx or docbook2xxxx binaries are available so
> we could support both...
> Otherwise some modifications must be done.
> A bad redirection order in command lines is causing missing error
> messages.
> 
> Without patch attached , the 'db2xxxx : command not found' messages are
> redirected to /dev/null and people asking why tar is failing when
> adding non generated files.
> 
> Comments ?
> 
>  --- Vincent Béron <vberon at mecano.gme.usherb.ca> a écrit : > This one
> I'm not sure which one is better. So I include both patches,
> > but only one should be applied.
> > 
> > Functionnally, both produce the exact same html files, although the
> > fix1
> > creates (by the system's db2html) a directory with images (which are
> > unused).
> > 
> > So I'd tend to go with fix2.
> > 
> > Please comment, and I'll post the good one to wine-patches.
> > 
> > Vincent
> > > Index: wine/documentation/Makefile.in
> > ===================================================================
> > RCS file: /home/wine/wine/documentation/Makefile.in,v
> > retrieving revision 1.24
> > diff -u -r1.24 Makefile.in
> > --- Makefile.in	17 Sep 2002 18:44:46 -0000	1.24
> > +++ Makefile.in	9 Nov 2002 00:18:33 -0000
> > @@ -65,7 +65,7 @@
> >  .PHONY: everything doc html pdf ps
> >  
> >  $(BOOKNAME)/index.html: $(BOOK_SRCS)
> > -	$(DB2HTML) $(BOOKNAME).sgml
> > +	$(DB2HTML) -d ./default.dsl $(BOOKNAME).sgml
> >  
> >  $(BOOKNAME).pdf: $(BOOK_SRCS)
> >  	db2pdf -d ./print.dsl $(BOOKNAME).sgml > /dev/null
> > > Index: wine/documentation/Makefile.in
> > ===================================================================
> > RCS file: /home/wine/wine/documentation/Makefile.in,v
> > retrieving revision 1.24
> > diff -u -r1.24 Makefile.in
> > --- Makefile.in	17 Sep 2002 18:44:46 -0000	1.24
> > +++ Makefile.in	9 Nov 2002 00:19:34 -0000
> > @@ -4,7 +4,7 @@
> >  VPATH     = @srcdir@
> >  MODULE    = none
> >  BOOKNAME  = wine-doc
> > -DB2HTML   = db2html
> > +DB2HTML   = ./db2html-winehq
> >  
> >  EXTRASUBDIRS = samples status
> >  
> >  
> 
> 
> ___________________________________________________________
> Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
> Yahoo! Mail : http://fr.mail.yahoo.com> --- make_winehq	2002-11-09
03:55:16.000000000 +0100
> +++ make_winehq.new	2002-11-09 04:05:01.000000000 +0100
> @@ -46,25 +46,25 @@
>  
>  ## Create PostScript tarball
>  echo "db2ps -d ./print.dsl wine-user.sgml"
> -db2ps -d ./print.dsl wine-user.sgml > /dev/null 2>&1
> +db2ps -d ./print.dsl wine-user.sgml 2>&1 > /dev/null
>  echo "db2ps -d ./print.dsl wine-devel.sgml"
> -db2ps -d ./print.dsl wine-devel.sgml > /dev/null 2>&1
> +db2ps -d ./print.dsl wine-devel.sgml 2>&1 > /dev/null
>  echo "db2ps -d ./print.dsl winelib-user.sgml"
> -db2ps -d ./print.dsl winelib-user.sgml > /dev/null 2>&1
> +db2ps -d ./print.dsl winelib-user.sgml 2>&1 > /dev/null
>  echo "db2ps -d ./print.dsl wine-pkg.sgml"
> -db2ps -d ./print.dsl wine-pkg.sgml > /dev/null 2>&1
> +db2ps -d ./print.dsl wine-pkg.sgml 2>&1 > /dev/null
>  tar czf winedoc-ps.tgz wine-user.ps wine-devel.ps winelib-user.ps
> wine-pkg.ps
>  cp winedoc-ps.tgz "$WWWDIR"
>  
>  ## Create PDF tarball
>  echo "db2pdf -d ./print.dsl wine-user.sgml"
> -db2pdf -d ./print.dsl wine-user.sgml > /dev/null 2>&1
> +db2pdf -d ./print.dsl wine-user.sgml 2>&1 > /dev/null
>  echo "db2pdf -d ./print.dsl wine-devel.sgml"
> -db2pdf -d ./print.dsl wine-devel.sgml > /dev/null 2>&1
> +db2pdf -d ./print.dsl wine-devel.sgml 2>&1 > /dev/null
>  echo "db2pdf -d ./print.dsl winelib-user.sgml"
> -db2pdf -d ./print.dsl winelib-user.sgml > /dev/null 2>&1
> +db2pdf -d ./print.dsl winelib-user.sgml 2>&1 > /dev/null
>  echo "db2pdf -d ./print.dsl wine-pkg.sgml"
> -db2pdf -d ./print.dsl wine-pkg.sgml > /dev/null 2>&1
> +db2pdf -d ./print.dsl wine-pkg.sgml 2>&1 > /dev/null
>  tar czf winedoc-pdf.tgz wine-user.pdf wine-devel.pdf winelib-user.pdf
> wine-pkg.pdf
>  cp winedoc-pdf.tgz "$WWWDIR"
>  
> 


__________________________________________________
Do you Yahoo!?
U2 on LAUNCH - Exclusive greatest hits videos
http://launch.yahoo.com/u2



More information about the wine-devel mailing list