r4136 - in branches/testing/BOOK: . chapter01

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Sep 5 10:08:13 PDT 2004


Author: manuel
Date: 2004-09-05 11:08:12 -0600 (Sun, 05 Sep 2004)
New Revision: 4136

Modified:
   branches/testing/BOOK/Makefile
   branches/testing/BOOK/chapter01/changelog.xml
   branches/testing/BOOK/general.ent
Log:
Updated book's version and changelog.

Modified: branches/testing/BOOK/Makefile
===================================================================
--- branches/testing/BOOK/Makefile	2004-09-05 16:59:56 UTC (rev 4135)
+++ branches/testing/BOOK/Makefile	2004-09-05 17:08:12 UTC (rev 4136)
@@ -1,58 +1,37 @@
-BASEDIR=~/lfs-book
-CHUNK_QUIET=0
-PDF_OUTPUT=LFS-BOOK.pdf
-NOCHUNKS_OUTPUT=LFS-BOOK.html
-XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
+BASEDIR=/home/macana/tmp/test-book-LFS/
 
 lfs:
-	xsltproc --xinclude --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-	  -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl \
-	  index.xml
+	xsltproc --xinclude --nonet --stringparam base.dir $(BASEDIR) \
+	  stylesheets/lfs-chunked.xsl index.xml
 
-	if [ ! -e $(BASEDIR)/stylesheets ]; then \
-	  mkdir -p $(BASEDIR)/stylesheets; \
-	fi;
-	cp stylesheets/*.css $(BASEDIR)/stylesheets
+	mkdir -p $(BASEDIR)stylesheets && \
+	cp stylesheets/*.css $(BASEDIR)stylesheets
 
-	if [ ! -e $(BASEDIR)/images ]; then \
-	  mkdir -p $(BASEDIR)/images; \
-	fi;
-	cp $(XSLROOTDIR)/images/*.png \
-	  $(BASEDIR)/images
-	cd $(BASEDIR)/; sed -i -e "s at ../stylesheets at stylesheets@g" \
+	mkdir -p $(BASEDIR)images && \
+	cp /usr/share/xml/docbook/xsl-stylesheets-1.65.1/images/*.png \
+	  $(BASEDIR)images
+
+	cd $(BASEDIR); sed -i -e "s at ../stylesheets at stylesheets@g" \
 	  *.html
-	cd $(BASEDIR)/; sed -i -e "s at ../images at images@g" \
+	cd $(BASEDIR); sed -i -e "s at ../images at images@g" \
 	  *.html
 
-	sh goTidy $(BASEDIR)/
+	cd $(BASEDIR); goTidy
 
-#
-# This is the old "pdf" target. The old "print" target below has been 
-# renamed to "pdf" and will be used. This commented out previous_pdf
-# target can be removed eventually. It'll remain here for a bit for
-# historical reasons
-#
-#previous_pdf:
-#	xsltproc --xinclude --nonet --output $(BASEDIR)/lfs.fo stylesheets/lfs-pdf.xsl \
-#	  index.xml
-#	sed -i -e "s/inherit/all/" $(BASEDIR)/lfs.fo
-#	fop.sh $(BASEDIR)/lfs.fo $(BASEDIR)/$(PDF_OUTPUT)
-#	rm lfs.fo
-
 pdf:
-	xsltproc --xinclude --nonet --stringparam profile.condition print \
-		--output $(BASEDIR)/lfs-pdf.xml stylesheets/lfs-profile.xsl index.xml
-	xsltproc --nonet --output $(BASEDIR)/lfs-pdf.fo stylesheets/lfs-pdf.xsl \
-		$(BASEDIR)/lfs-pdf.xml
-	sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo
-	fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
-	rm $(BASEDIR)/lfs-pdf.xml $(BASEDIR)/lfs-pdf.fo
+	xsltproc --xinclude --nonet --stringparam profile.condition print --output $(BASEDIR)lfs-pdf.xml \
+    stylesheets/lfs-profile.xsl index.xml
+	xsltproc --nonet --output $(BASEDIR)lfs-pdf.fo stylesheets/lfs-pdf.xsl $(BASEDIR)lfs-pdf.xml
+	cd $(BASEDIR); sed -i -e "s at inherit@all@" lfs-pdf.fo
+	cd $(BASEDIR); JAVA_HOME=/opt/java/jre1.3.1_02 FOP_HOME=/home/macana/tmp/fop \
+  /home/macana/tmp/fop/fop.sh lfs-pdf.fo lfs-pdf.pdf
 
 nochunks:
-	xsltproc --xinclude --nonet --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
+	xsltproc --xinclude --nonet --output $(BASEDIR)lfs-nochunk.html \
 	  stylesheets/lfs-nochunks.xsl index.xml
-	tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+	tidy -config tidy.conf $(BASEDIR)lfs-nochunk.html || true
 
 validate:
 	xmllint --noout --nonet --xinclude --postvalid index.xml
+ 
 

Modified: branches/testing/BOOK/chapter01/changelog.xml
===================================================================
--- branches/testing/BOOK/chapter01/changelog.xml	2004-09-05 16:59:56 UTC (rev 4135)
+++ branches/testing/BOOK/chapter01/changelog.xml	2004-09-05 17:08:12 UTC (rev 4136)
@@ -84,6 +84,8 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 4th, 2004 [manuel]: Tags corrections.</para></listitem>
+
 <listitem><para>August 31th, 2004 [manuel]: stylesheets. Several changes
 to improve HTML and PDF output. Some XML tags changes related with
 the stylesheets changes.</para></listitem>

Modified: branches/testing/BOOK/general.ent
===================================================================
--- branches/testing/BOOK/general.ent	2004-09-05 16:59:56 UTC (rev 4135)
+++ branches/testing/BOOK/general.ent	2004-09-05 17:08:12 UTC (rev 4136)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "6.0-testing-20040903">
-<!ENTITY releasedate "September 03, 2004">
+<!ENTITY version "6.0-testing-20040905">
+<!ENTITY releasedate "September 05, 2004">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">




More information about the lfs-book mailing list