[MPlayer-DOCS] CVS: main/DOCS/xml Makefile, 1.14, 1.15 Makefile.inc, 1.12, 1.13 configure, 1.8, 1.9

[Torinthiel]

On Wed, Jan 21, 2004 at 12:27:27AM +0100, Diego Biurrun CVS wrote:
> Update of /cvsroot/mplayer/main/DOCS/xml
> In directory mail:/tmp/cvs-serv22327
> 
> Modified Files:
> 	Makefile Makefile.inc configure 
> Log Message:
> Shiny new build system by Torinthiel, polished and improved by myself.
> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -r1.14 -r1.15
> --- Makefile	16 Nov 2003 00:57:47 -0000	1.14
> +++ Makefile	20 Jan 2004 23:27:24 -0000	1.15
> @@ -26,7 +26,7 @@
>  
>  .PHONY: build-html-chunked
>  build-html-chunked: xsltproc.sh xmllint.sh
> -	test -d $(HTML_CHUNKED) || mkdir $(HTML_CHUNKED)
> +	@test -d $(HTML_CHUNKED) || mkdir $(HTML_CHUNKED)
>  	@for dir in $(SUBDIRS); do\
>  		test -f $$dir/Makefile &&\
>  		(test -d $(HTML_CHUNKED)/$$dir || mkdir $(HTML_CHUNKED)/$$dir) &&\
<cut rest similar changes>
I liked it better before. I don't like seeing complex commands, like the
for here, but simple mkdirs or rm's show me that something is happening ;)

> Index: Makefile.inc
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile.inc,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -r1.12 -r1.13
> --- Makefile.inc	25 Nov 2003 12:41:56 -0000	1.12
> +++ Makefile.inc	20 Jan 2004 23:27:24 -0000	1.13
> @@ -50,12 +50,12 @@
>  		fi ; \
>  		done ; \
>  	fi
> -	-rm -f $(HTMLDIR)/*
> -	../xmllint.sh $<
> -	cp -f $(HTML_STYLESHEET) $(HTMLDIR)/
> -	../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
> +	@-rm -f $(HTMLDIR)/*
> +	@../xmllint.sh $<
> +	@cp -f $(HTML_STYLESHEET) $(HTMLDIR)/
> +	@../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<

Same here. And on every other @ in this file.

> @@ -69,15 +69,16 @@
>  		fi ; \
>  		done ; \
>  	fi
> -	-rm -f $(HTMLFILE)
> -	../xmllint.sh $<
> -	cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
> -	../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
> +	@-rm -f $(HTMLFILE)
> +	@../xmllint.sh $<
> +	@cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
> +	@../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
>  
> -../html-chunk.xsl ../html-single.xsl:
> +../html-chunk.xsl ../html-single.xsl main.xml:
>  	cd .. && sh configure
>  
>  distclean:
> +	@rm -f main.xml

True, should be -f. I've never tested it before ./configure'ing.

> Index: configure
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/xml/configure,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- configure	16 Nov 2003 00:57:47 -0000	1.8
> +++ configure	20 Jan 2004 23:27:24 -0000	1.9
> @@ -93,7 +94,44 @@
<cut 13 lines>
> +if test -z "$_dtd"
> +then
> +  _dtd=/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd
> +  echo "Not found. Using default ($_dtd)."
> +else
> +  echo "Found docbookx.dtd at $_dtd"

You've reminded me not to forget dots at the end of a sentence ;)

> +fi
> +
> +for lang in `grep 'SUBDIRS =' Makefile|cut -d= -f2`; do
> +  cat > $lang/main.xml << EOF
> +<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
> +    "$_dtd"
> +[ 
> +EOF
> +
> +  for file in `find $lang en -name \*.xml -exec basename \{\} \; | uniq`; do

True, that's better. I didn't even knew I could pass two paths to find :(
Sort was only to make it more beautiful. But nobody looks into main.xml
anyway ;)
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)wp(dot)pl
   gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8  7346 2B6E 39F2 B069 01F1
 "No classmates may be used during this examination"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-docs/attachments/20040121/b373f3d9/attachment.pgp>