Changeset 35d9770

Timestamp:

07/07/2007 10:30:37 AM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

c425f86

Parents:

3c6bf83

Message:

Updated book rendering framework to use the new LFS-XSL Stylesheets.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6842 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• Makefile (modified) (4 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• obfuscate.sh (modified) (2 diffs)

Makefile

@@ -4 +4 @@
 # $LastChangedBy$
 # $Date$
+
 # Adjust these to suit your installation
-OUTPUTDIR = $(HOME)/public_html/blfs-book
+BASEDIR= $(HOME)/public_html/blfs-book-xsl
 DUMPDIR= $(HOME)/blfs-commands
-INSTALL = install
-JADE = openjade
-DOCBOOK = /usr/share/sgml/docbook/dsssl-stylesheets-1.78
-BASEDIR= $(HOME)/public_html/blfs-book-xsl
-TEXBASEDIR= $(HOME)/public_html/blfs-book-tex
+CHUNK_QUIET=1
+ROOT_ID=""
+PDF_OUTPUT=BLFS-BOOK.pdf
 NOCHUNKS_OUTPUT=BLFS-BOOK.html
-SRCDIR = $(PWD)
 
-all: blfs
+ifdef V
+  Q =
+else
+  Q = @
+endif
 
-blfs:
-        @if [ -z $(BASEDIR) ]; then \
-                echo "Envar BASEDIR is not set!" ; \
-                exit 1 ; \
-        fi
-        @echo "Generating XHTML Version of BLFS Book with xsltproc..."
-        @echo "  BASEDIR = $(BASEDIR)"
-        @$(INSTALL) -d $(BASEDIR)
-        xsltproc --xinclude --nonet -stringparam base.dir $(BASEDIR)/ \
-          stylesheets/blfs-chunked.xsl index.xml
-        if [ ! -e $(BASEDIR)/stylesheets ]; then \
+blfs: validxml profile-html
+        @echo "Generating chunked XHTML files..."
+        $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
+          -stringparam rootid $(ROOT_ID) -stringparam base.dir $(BASEDIR)/ \
+          stylesheets/blfs-chunked.xsl /tmp/blfs-html.xml
+
+        @echo "Copying CSS code and images..."
+        $(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \
           mkdir -p $(BASEDIR)/stylesheets; \
         fi;
-        cp stylesheets/*.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 "s@../stylesheets@stylesheets@g" *.html
-        cd $(BASEDIR); sed -i -e "s@../images@images@g" *.html
+        $(Q)cp images/*.png $(BASEDIR)/images
+        $(Q)cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
+        $(Q)cd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html
 
-        for filename in `find $(BASEDIR) -name "*.html"`; do \
+        @echo "Running Tidy and obfuscate.sh..."
+        $(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
           tidy -config tidy.conf $$filename; \
           true; \
@@ -45 +45 @@
         done;
 
+pdf: validxml
+        @echo "Generating profiled XML for PDF..."
+        $(Q)xsltproc --nonet --stringparam profile.condition pdf \
+          --output /tmp/blfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
+          /tmp/blfs-full.xml
 
-nochunks:
-        @echo "Generating nochunks version of BLFS..."
-        xsltproc --xinclude --nonet -stringparam profile.condition html \
-        --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
-        stylesheets/blfs-nochunks.xsl index.xml
+        @echo "Generating FO file..."
+        $(Q)xsltproc --nonet -stringparam rootid $(ROOT_ID) \
+          --output /tmp//blfs-pdf.fo stylesheets/blfs-pdf.xsl /tmp/blfs-pdf.xml
+        $(Q)sed -i -e 's/span="inherit"/span="all"/' /tmp/blfs-pdf.fo
 
-        tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+        @echo "Generating PDF file..."
+        $(Q)if [ ! -e $(BASEDIR) ]; then \
+          mkdir -p $(BASEDIR); \
+        fi;
+        $(Q)fop /tmp/blfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
 
-        sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+nochunks: validxml profile-html
+        @echo "Generating non chunked XHTML file..."
+        $(Q)xsltproc --nonet -stringparam profile.condition html \
+          -stringparam rootid $(ROOT_ID) --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
+          stylesheets/blfs-nochunks.xsl /tmp/blfs-html.xml
 
-        sed -i -e "s@text/html@application/xhtml+xml@g"  \
-          $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        @echo "Running Tidy..."
+        $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+        @echo "Running obfuscate.sh..."
+        $(Q)sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        $(Q)sed -i -e "s@text/html@application/xhtml+xml@g"  \
+          $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
-pdf:
-        xsltproc --xinclude --nonet --stringparam profile.condition pdf \
-             --output blfs-pdf.xml stylesheets/blfs-profile.xsl index.xml
-        xsltproc --xinclude --nonet --output blfs.fo \
-                 stylesheets/blfs-pdf.xsl blfs-pdf.xml
-        sed -i -e "s/inherit/all/" blfs.fo
-        fop.sh blfs.fo blfs.pdf
-        $(INSTALL) -d $(BASEDIR)/pdf
-        rm blfs.fo
-        mv blfs.pdf $(BASEDIR)/pdf
+validxml:
+        @echo "Validating the book..."
+        $(Q)xmllint --nonet --noent --xinclude --postvalid \
+          -o /tmp/blfs-full.xml index.xml
 
-tex:
-        @if [ -z $(TEXBASEDIR) ]; then \
-       echo "Envar TEXBASEDIR is not set!" ; \
-       exit 1 ; \
-    fi
-        @echo "Generating TeX Version of BLFS Book with xsltproc..."
-        @echo "  TEXBASEDIR = $(TEXBASEDIR)"
-        @$(INSTALL) -d $(TEXBASEDIR)
-# Using profiles in book source to exclude parts of the book from TeX
-# i.e., Changelog
-        xsltproc --nonet --output $(TEXBASEDIR)/index.xml \
-        --stringparam "profile.role" "book" \
-        http://docbook.sourceforge.net/release/xsl/current/profiling/profile.xsl \
-            index.xml
-        @cd $(TEXBASEDIR) && xsltproc --nonet -o blfs-book.tex \
-            $(SRCDIR)/stylesheets/blfs-tex.xsl index.xml
+profile-html: validxml
+        @echo "Generating profiled XML for XHTML..."
+        $(Q)xsltproc --nonet --stringparam profile.condition html \
+          --output /tmp/blfs-html.xml stylesheets/lfs-xsl/profile.xsl \
+          /tmp/blfs-full.xml
 
-dump-commands:
-        xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
-           stylesheets/dump-commands.xsl index.xml
+blfs-patch-list: validxml
+        @echo "Generating blfs-patch-list..."
+        $(Q)xsltproc --nonet --output /tmp/blfs-patch-list \
+          stylesheets/patcheslist.xsl /tmp/blfs-full.xml
+        $(Q)sed -e "s|^.*/||" /tmp/blfs-patch-list > /tmp/blfs-patches
+        $(Q)sort /tmp/blfs-patches > blfs-patch-list
 
-validate:
-        xmllint --noout --nonet --xinclude --postvalid index.xml
+wget-list: validxml
+        @echo "Generating wget list..."
+        $(Q)mkdir -p $(BASEDIR)
+        $(Q)xsltproc --nonet --output $(BASEDIR)/wget-list \
+          stylesheets/wget-list.xsl /tmp/lfs-full.xml
 
-validate-pdf:
-        xsltproc --xinclude --nonet --stringparam profile.condition pdf \
-             --output blfs-pdf.xml stylesheets/blfs-profile.xsl index.xml
-        xmllint --noout --nonet --postvalid blfs-pdf.xml
+test-links: validxml
+        @echo "Generating test-links file..."
+        $(Q)mkdir -p $(BASEDIR)
+        $(Q)xsltproc --nonet --stringparam list_mode full \
+          --output $(BASEDIR)/test-links stylesheets/wget-list.xsl \
+          /tmp/lfs-full.xml
 
-blfs-patch-list:
-        @echo "Generating blfs-patch-list..."
-        xsltproc --xinclude --nonet \
-             --output blfs-patch-list stylesheets/patcheslist.xsl index.xml
-        sed -e "s|^.*/||" blfs-patch-list > blfs-patches
-        sort blfs-patches > blfs-patch-list
-        rm blfs-patches
-
-wget-list:
-        mkdir -p $(BASEDIR)
-        xsltproc --xinclude --nonet stylesheets/wget-list.xsl index.xml > $(BASEDIR)/wget-list
-
-test-links:
-        mkdir -p $(BASEDIR)
-        xsltproc --xinclude --nonet --stringparam list_mode full \
-            stylesheets/wget-list.xsl index.xml > $(BASEDIR)/test-links
-        rm -f $(BASEDIR)/{good,bad,true_bad}_urls
-        for URL in `cat $(BASEDIR)/test-links`; do \
+        @echo "Cheking URLs, first pass..."
+        $(Q)rm -f $(BASEDIR)/{good,bad,true_bad}_urls
+        $(Q)for URL in `cat $(BASEDIR)/test-links`; do \
             wget --spider --tries=2 --timeout=60 $$URL >>/dev/null 2>&1; \
             if test $$? -ne 0 ; then echo $$URL >> $(BASEDIR)/bad_urls ; \
@@ -122 +114 @@
             fi; \
         done
-        for URL2 in `cat $(BASEDIR)/bad_urls`; do \
+
+        @echo "Cheking URLs, second pass..."
+        $(Q)for URL2 in `cat $(BASEDIR)/bad_urls`; do \
             wget --spider --tries=2 --timeout=60 $$URL2 >>/dev/null 2>&1; \
             if test $$? -ne 0 ; then echo $$URL2 >> $(BASEDIR)/true_bad_urls ; \
@@ -129 +123 @@
         done
 
-.PHONY : blfs-patch-list wget-list test-links
+dump-commands: validxml
+        @echo "Dumping book commands..."
+        $(Q)xsltproc --output $(DUMPDIR)/ \
+           stylesheets/dump-commands.xsl /tmp/lfs-full.xml
+
+validate:
+        @echo "Validating the book..."
+        $(Q)xmllint --noout --nonet --xinclude --postvalid index.xml
+
+all: blfs nochunks pdf
+
+world: all blfs-patch-list dump-commands wget-list test-links
+
+.PHONY : all blfs blfs-patch-list dump-commands nochunks pdf profile-html \
+         test-links validate validxml wget-list world

introduction/welcome/changelog.xml

@@ -43 +43 @@
 
     <listitem>
+      <para>July 7th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Updated book rendering framework to use the new
+          LFS-XSL Stylesheets.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 6th, 2007</para>
       <itemizedlist>

obfuscate.sh

@@ -7 +7 @@
 # obfuscate email addresses in XML/HTML
 # Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org>
+# Modified from "sed -i" to old style "sed -e" by Manuel Canales <manuel AT linuxfromscratch D0T org>
+# to prevent hangs on very long files, like nonckunked books.
 # Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org>
 # Released under the GNU General Public License
@@ -29 +31 @@
 #cp "$1" "$1".bak
 
-for i in `grep -o '"mailto:.*@.*"' "$1" |cut -d\" -f2|sed -e 's|^mailto:||' -e 's|"$||'`; do
+for i in `grep -o '"mailto:.*@.*"' ${1} |cut -d\" -f2|sed -e 's|^"mailto:||' -e 's|"$||'`; do
   link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
   plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
-  sed -i "s|mailto:$i|mailto:$link|" "$1"
-  sed -i "s|$i|$plaintext|" "$1"
+  cp ${1}{,.tmp}
+  sed -e "s|mailto:$i|mailto:$link|" \
+      -e "s|$i|$plaintext|" ${1}.tmp > ${1}
+  rm ${1}.tmp
 done
-
+#rm $FILE.tmp
 #exit 0