Re: LFS is now using the new stylesheets

2007-07-06 Thread M.Canales.es 
El Viernes, 6 de Julio de 2007 01:21, Dan Nicholson escribió:

 +ifdef V
 +Q =
 +else
 +Q = @
 +endif
 +

Yea, I saw something like that on the BusyBox makefiles the other day. Looks 
good to me.

-- 
Manuel Canales Esparcia
Usuario de LFS nº2886:   http://www.linuxfromscratch.org
LFS en castellano: http://www.escomposlinux.org/lfs-es http://www.lfs-es.info
TLDP-ES:   http://es.tldp.org
-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

LFS is now using the new stylesheets

2007-07-05 Thread M.Canales.es 
Hi,

I just finished to update the LFS book sources to use the new stylesheets. 

NOTE: I'm not sure if the script that generates the on-line book need be 
adjusted to use the new code properly.

The Makefile has been also re-factored. There is a new all target and a new 
ROOT_ID variable.

The ROOT_ID variable is very cool. It allow to render only a part of the book 
based on the given Id value. For example:

make ROOT_ID=ch-system-glibc lfs

will render only the chapter06/glibc.html file. That work also for PDF output, 
but FOP will emit several warnings.

Maybe there is some bugs. I hope we can find and fix them quickly.

-- 
Manuel Canales Esparcia
Usuario de LFS nº2886:   http://www.linuxfromscratch.org
LFS en castellano: http://www.escomposlinux.org/lfs-es http://www.lfs-es.info
TLDP-ES:   http://es.tldp.org
-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Re: LFS is now using the new stylesheets

2007-07-05 Thread Dan Nicholson 
On Fri, Jul 06, 2007 at 12:47:34AM +0200, M.Canales.es wrote:
 
 The Makefile has been also re-factored. There is a new all target and a new 
 ROOT_ID variable.

Looks nice. I sort of like seeing the commands being run, though. This 
makes it configurable by setting the variable V.

$ make lfs V=1

What do you think?

--
Dan

---
 BOOK/Makefile |   52 +---
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/BOOK/Makefile b/BOOK/Makefile
index 8710618..ed672ea 100644
--- a/BOOK/Makefile
+++ b/BOOK/Makefile
@@ -5,85 +5,91 @@ ROOT_ID=
 PDF_OUTPUT=LFS-BOOK.pdf
 NOCHUNKS_OUTPUT=LFS-BOOK.html
 
+ifdef V
+Q =
+else
+Q = @
+endif
+
 lfs: validxml profile-html
@echo Generating chunked XHTML files...
-   @xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
+   $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
  -stringparam rootid $(ROOT_ID) -stringparam base.dir $(BASEDIR)/ \
  stylesheets/lfs-chunked.xsl /tmp/lfs-html.xml
 
@echo Copying CSS code and images...
-   @if [ ! -e $(BASEDIR)/stylesheets ]; then \
+   $(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \
  mkdir -p $(BASEDIR)/stylesheets; \
fi;
-   @cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-   @if [ ! -e $(BASEDIR)/images ]; then \
+   $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
+   $(Q)if [ ! -e $(BASEDIR)/images ]; then \
  mkdir -p $(BASEDIR)/images; \
fi;
-   @cp images/*.png $(BASEDIR)/images
-   @cd $(BASEDIR)/; sed -i -e [EMAIL PROTECTED]/[EMAIL PROTECTED]@g 
*.html
-   @cd $(BASEDIR)/; sed -i -e [EMAIL PROTECTED]/[EMAIL PROTECTED]@g 
*.html
+   $(Q)cp images/*.png $(BASEDIR)/images
+   $(Q)cd $(BASEDIR)/; sed -i -e [EMAIL PROTECTED]/[EMAIL PROTECTED]@g 
*.html
+   $(Q)cd $(BASEDIR)/; sed -i -e [EMAIL PROTECTED]/[EMAIL PROTECTED]@g 
*.html
 
@echo Running Tidy...
-   @for filename in `find $(BASEDIR) -name *.html`; do \
+   $(Q)for filename in `find $(BASEDIR) -name *.html`; do \
  tidy -config tidy.conf $$filename; \
  true; \
  sh obfuscate.sh $$filename; \
  sed -i -e [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED] 
$$filename; \
done;
 
-   @$(MAKE) wget-list
+   $(Q)$(MAKE) wget-list
 
 pdf: validxml
@echo Generating profiled XML for PDF...
-   @xsltproc --nonet --stringparam profile.condition pdf \
+   $(Q)xsltproc --nonet --stringparam profile.condition pdf \
  --output /tmp/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
  /tmp/lfs-full.xml
 
@echo Generating FO file...
-   @xsltproc --nonet -stringparam rootid $(ROOT_ID) \
+   $(Q)xsltproc --nonet -stringparam rootid $(ROOT_ID) \
  --output /tmp//lfs-pdf.fo stylesheets/lfs-pdf.xsl /tmp/lfs-pdf.xml
-   @sed -i -e 's/span=inherit/span=all/' /tmp/lfs-pdf.fo
+   $(Q)sed -i -e 's/span=inherit/span=all/' /tmp/lfs-pdf.fo
 
@echo Generating PDF file...
-   @fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+   $(Q)fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
 
 nochunks: validxml profile-html
@echo Generating non chunked XHTML file...
-   @xsltproc --nonet -stringparam profile.condition html \
+   $(Q)xsltproc --nonet -stringparam profile.condition html \
  -stringparam rootid $(ROOT_ID) --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) 
\
  stylesheets/lfs-nochunks.xsl /tmp/lfs-html.xml
 
@echo Running Tidy...
-   @tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
-   @sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-   @sed -i -e [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]  \
+   $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+   $(Q)sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+   $(Q)sed -i -e [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]  \
  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
 validxml:
@echo Validating the book...
-   @xmllint --nonet --noent --xinclude --postvalid \
+   $(Q)xmllint --nonet --noent --xinclude --postvalid \
  -o /tmp/lfs-full.xml index.xml
 
 profile-html: validxml
@echo Generating profiled XML for XHTML...
-   @xsltproc --nonet --stringparam profile.condition html \
+   $(Q)xsltproc --nonet --stringparam profile.condition html \
  --output /tmp/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
  /tmp/lfs-full.xml
 
 wget-list:
@echo Generating wget list...
-   @mkdir -p $(BASEDIR)
-   @xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
+   $(Q)mkdir -p $(BASEDIR)
+   $(Q)xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
  stylesheets/wget-list.xsl chapter03/chapter03.xml
 
 dump-commands:
@echo Dumping book commands...
-   @xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
+   $(Q)xsltproc