Changeset 0e6d3c0

Timestamp:

07/05/2007 10:35:05 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

05d60ce

Parents:

b3a7074

Message:

Refactored the Makefile.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8202 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• Makefile (modified) (2 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• general.ent (modified) (1 diff)

Makefile

@@ -1 +1 @@
 BASEDIR=~/lfs-book
 DUMPDIR=~/lfs-commands
-CHUNK_QUIET=0
+CHUNK_QUIET=1
+ROOT_ID=""
 PDF_OUTPUT=LFS-BOOK.pdf
 NOCHUNKS_OUTPUT=LFS-BOOK.html
 
-lfs:
-        xsltproc --xinclude --nonet -stringparam profile.condition html \
-        -stringparam chunk.quietly $(CHUNK_QUIET) -stringparam base.dir $(BASEDIR)/ \
-        stylesheets/lfs-chunked.xsl index.xml
+lfs: validxml profile-html
+        @echo "Generating chunked XHTML files..."
+        @xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
+          -stringparam rootid $(ROOT_ID) -stringparam base.dir $(BASEDIR)/ \
+          stylesheets/lfs-chunked.xsl /tmp/lfs-html.xml
 
-        if [ ! -e $(BASEDIR)/stylesheets ]; then \
+        @echo "Copying CSS code and images..."
+        @if [ ! -e $(BASEDIR)/stylesheets ]; then \
           mkdir -p $(BASEDIR)/stylesheets; \
         fi;
-        cp stylesheets/*.css $(BASEDIR)/stylesheets
-
-        if [ ! -e $(BASEDIR)/images ]; then \
+        @cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
+        @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
+        @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
 
-        for filename in `find $(BASEDIR) -name "*.html"`; do \
+        @echo "Running Tidy..."
+        @for filename in `find $(BASEDIR) -name "*.html"`; do \
           tidy -config tidy.conf $$filename; \
           true; \
@@ -31 +32 @@
         done;
 
-        $(MAKE) wget-list
+        @$(MAKE) wget-list
+
+pdf: validxml
+        @echo "Generating profiled XML for PDF..."
+        @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) \
+          --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
+
+        @echo "Generating PDF file..."
+        @fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+
+nochunks: validxml profile-html
+        @echo "Generating non chunked XHTML file..."
+        @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 "s@text/html@application/xhtml+xml@g"  \
+          $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+
+validxml:
+        @echo "Validating the book..."
+        @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 \
+          --output /tmp/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
+          /tmp/lfs-full.xml
 
 wget-list:
-        mkdir -p $(BASEDIR)
-        xsltproc --xinclude --nonet stylesheets/wget-list.xsl chapter03/chapter03.xml > $(BASEDIR)/wget-list
-
-# Uncomment this for testing and stable versions
-#pdf:
-#       xsltproc --xinclude --nonet --stringparam profile.condition pdf \
-#               --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
-
-# Remove this for testing and stable versions
-pdf:
-        xsltproc --xinclude --nonet --output $(BASEDIR)/lfs-pdf.fo \
-                stylesheets/lfs-pdf.xsl index.xml
-        sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo
-        fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
-        rm $(BASEDIR)/lfs-pdf.fo
-
-nochunks:
-        xsltproc --xinclude --nonet -stringparam profile.condition html \
-        --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
-          stylesheets/lfs-nochunks.xsl index.xml
-
-        tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
-
-        sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-
-        sed -i -e "s@text/html@application/xhtml+xml@g"  \
-          $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        @echo "Generating wget list..."
+        @mkdir -p $(BASEDIR)
+        @xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
+          stylesheets/wget-list.xsl chapter03/chapter03.xml
 
 dump-commands:
-        xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
+        @echo "Dumping book commands..."
+        @xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
            stylesheets/dump-commands.xsl index.xml
 
 validate:
-        xmllint --noout --nonet --xinclude --postvalid index.xml
+        @echo "Validating the book..."
+        @xmllint --noout --nonet --xinclude --postvalid index.xml
 
+all: lfs nochunks pdf dump-commands
+
+.PHONY : all dump-commands lfs nochunks pdf profile-html validate validxml wget-list

chapter01/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>2007-07-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Updated the stylesheets and Makefile to use the new
+          XSL code and Fop-0.93.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2007-06-30</para>

general.ent

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20070630">
-<!ENTITY releasedate "June 30, 2007">
+<!ENTITY version "SVN-20070706">
+<!ENTITY releasedate "July 6, 2007">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->