Changeset 8c3f58f

Timestamp:

Feb 26, 2011, 1:23:54 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

6cefbfb

Parents:

1f9faab (diff), da28cc3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Files:

• .gitignore (modified) (1 diff)
• BOOK/Makefile (modified) (4 diffs)
• BOOK/schema/docbook/4.5/rng/calstblx.rnc (added)
• BOOK/schema/docbook/4.5/rng/calstblx.rng (added)
• BOOK/schema/docbook/4.5/rng/dbhierx.rnc (added)
• BOOK/schema/docbook/4.5/rng/dbhierx.rng (added)
• BOOK/schema/docbook/4.5/rng/dbnotnx.rnc (added)
• BOOK/schema/docbook/4.5/rng/dbnotnx.rng (added)
• BOOK/schema/docbook/4.5/rng/dbpoolx.rnc (added)
• BOOK/schema/docbook/4.5/rng/dbpoolx.rng (added)
• BOOK/schema/docbook/4.5/rng/docbook.rnc (added)
• BOOK/schema/docbook/4.5/rng/docbook.rng (added)
• BOOK/schema/docbook/4.5/rng/htmltblx.rnc (added)
• BOOK/schema/docbook/4.5/rng/htmltblx.rng (added)

.gitignore

@@ -1 @@
-BOOK/render-output
+/BOOK/render-output
+/render/

BOOK/Makefile

@@ -1 +1 @@
 TOP             := $(PWD)
-
-WORKDIR         := $(TOP)/render-output
-
-BASEDIR         := $(WORKDIR)/cross-lfs-book
-DUMPDIR         := $(WORKDIR)/cross-lfs-commands
-DLLISTDIR       := $(WORKDIR)/cross-lfs-dllist
-RENDERTMP       := $(WORKDIR)/tmp
+RENDERDIR       := $(TOP)/../render
+
+VALIDATEDIR     := $(RENDERDIR)/validate
+PROFILEDIR      := $(RENDERDIR)/profile
+
+HTMLDIR         := $(RENDERDIR)/html
+NOCHUNKDIR      := $(RENDERDIR)/nochunk
+
+FODIR           := $(RENDERDIR)/fo
+PDFDIR          := $(RENDERDIR)/pdf
+
+TROUBLEDIR      := $(RENDERDIR)/trouble
+DUMPDIR         := $(RENDERDIR)/commands
+DLLISTDIR       := $(RENDERDIR)/download-list
+
 CHUNK_QUIET     := 1
-ROOT_ID  :=
-
-FG_GREEN        := $(shell echo -e '\e[0;32m')
-FG_BLUE         := $(shell echo -e '\e[0;34m')
-FG_DEFAULT      := $(shell echo -e '\e[0;0m')
+ROOT_ID         :=
 
 ARCHS           := x86 x86_64 x86_64-64 \
@@ -20 +24 @@
                    alpha
 
-ARCHS_VD_XML    := $(ARCHS:%=%-validate_dump-xml)
-ARCHS_P_XML     := $(ARCHS:%=%-profiled-xml)
-
-ARCHS_HTML      := $(ARCHS:%=%-html)
-ARCHS_NOCHUNKS  := $(ARCHS:%=%-nochunks)
-ARCHS_PDF       := $(ARCHS:%=%-pdf)
-ARCHS_VALIDATE  := $(ARCHS:%=%-validate)
-ARCHS_TROUBLE   := $(ARCHS:%=%-trouble)
-ARCHS_DUMP      := $(ARCHS:%=%-dump)
-ARCHS_DLLIST    := $(ARCHS:%=%-dllist)
-
 ifdef V
   Q =
@@ -37 +30 @@
 endif
 
-.PHONY: clfs lfs render nochunks pdf validate trouble dump-commands download-list
-clfs lfs: tmpdir render
-render: $(ARCHS_HTML) titlepage
-nochunks: tmpdir $(ARCHS_NOCHUNKS)
-pdf: tmpdir $(ARCHS_PDF)
-validate: $(ARCHS_VALIDATE)
-trouble: tmpdir $(ARCHS_TROUBLE)
-dump-commands: $(ARCHS_DUMP)
-download-list: $(ARCHS_DLLIST)
-
-.PHONY: tmpdir
-tmpdir:
-        $(Q)mkdir -p $(RENDERTMP)
+.PHONY: clfs lfs
+clfs lfs: html
 
 .PHONY: tidy tidy-f tidy-d
 ifeq ($(shell which tidy >/dev/null 2>&1 && echo yes),yes)
 tidy:
-        @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(BASEDIR)
+        @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(HTMLDIR)
 
 tidy-f:
@@ -71 +53 @@
 titlepage:
         @echo "Rendering the top-level index..."
-        $(Q)xsltproc --nonet --output $(BASEDIR)/index.html \
-          $(PWD)/stylesheets/top-index.xsl $(PWD)/index.xml
-        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(BASEDIR)/index.html
-
-
+        $(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
+          $(PWD)/stylesheets/top-index.xsl \
+          $(PWD)/index.xml
+        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
+
+ARCHS_VD_XML := $(ARCHS:%=%-validate_dump-xml)
 .PHONY: $(ARCHS_VD_XML)
 $(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
-$(ARCHS_VD_XML): tmpdir
+$(ARCHS_VD_XML):
         @echo "Validating $(arch) book..."
-        $(Q)xmllint --nonet --noent --xinclude --postvalid \
-          -o $(RENDERTMP)/$(arch)-full.xml $(PWD)/$(arch)-index.xml
-
+        $(Q)mkdir -p $(VALIDATEDIR)
+        $(Q)xmllint --nonet --noent --xinclude \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          -o $(VALIDATEDIR)/$(arch)-full.xml \
+          $(PWD)/$(arch)-index.xml
+
+ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
 .PHONY: $(ARCHS_P_XML)
 $(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
-$(ARCHS_P_XML): tmpdir
+$(ARCHS_P_XML):
         @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
-
-        @echo "Generating profiled $(arch) book for XHTML..."
+        @echo "Generating profiled $(arch) book..."
+        $(Q)mkdir -p $(PROFILEDIR)
         $(Q)xsltproc --nonet --stringparam profile.condition html \
-          --output $(RENDERTMP)/$(arch)-html.xml \
-          $(PWD)/stylesheets/lfs-xsl/profile.xsl $(RENDERTMP)/$(arch)-full.xml
-
-.PHONY: $(ARCHS_HTML)
+          --output $(PROFILEDIR)/$(arch)-html.xml \
+          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
+          $(VALIDATEDIR)/$(arch)-full.xml
+
+ARCHS_HTML := $(ARCHS:%=%-html)
+.PHONY: html render $(ARCHS_HTML)
+html render: $(ARCHS_HTML) titlepage
 $(ARCHS_HTML): override arch = $(@:%-html=%)
-$(ARCHS_HTML): tmpdir
+$(ARCHS_HTML):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
 
         @echo "Rendering chunked XHTML of $(arch)..."
-        $(Q)mkdir -p $(BASEDIR)/$(arch)
+        $(Q)mkdir -p $(HTMLDIR)/$(arch)
         $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
           -stringparam rootid "$(ROOT_ID)" \
-          -stringparam base.dir $(BASEDIR)/$(arch)/ \
-          $(PWD)/stylesheets/clfs-chunked.xsl $(RENDERTMP)/$(arch)-html.xml
+          -stringparam base.dir $(HTMLDIR)/$(arch)/ \
+          $(PWD)/stylesheets/clfs-chunked.xsl \
+          $(PROFILEDIR)/$(arch)-html.xml
 
         @echo "Copying CSS code and images for $(arch)..."
-        $(Q)mkdir -p $(BASEDIR)/$(arch)/stylesheets
-        $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(BASEDIR)/$(arch)/stylesheets
-        $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(BASEDIR)/$(arch)/*.html
-        $(Q)mkdir -p $(BASEDIR)/$(arch)/images
-        $(Q)cp $(PWD)/images/*.png $(BASEDIR)/$(arch)/images
-        $(Q)sed -i -e "s@../images@images@g" $(BASEDIR)/$(arch)/*.html
-
-        @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(BASEDIR)/$(arch)
-
-.PHONY: $(ARCHS_NOCHUNKS)
+        $(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
+        $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
+        $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(HTMLDIR)/$(arch)/*.html
+        $(Q)mkdir -p $(HTMLDIR)/$(arch)/images
+        $(Q)cp $(PWD)/images/*.png $(HTMLDIR)/$(arch)/images
+        $(Q)sed -i -e "s@../images@images@g" $(HTMLDIR)/$(arch)/*.html
+
+        @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(HTMLDIR)/$(arch)
+
+ARCHS_NOCHUNKS := $(ARCHS:%=%-nochunks)
+.PHONY: nochunks $(ARCHS_NOCHUNKS)
+nochunks: $(ARCHS_NOCHUNKS)
 $(ARCHS_NOCHUNKS): override arch = $(@:%-nochunks=%)
-$(ARCHS_NOCHUNKS): tmpdir
+$(ARCHS_NOCHUNKS):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
 
         @echo "Rendering Single File HTML of $(arch)..."
-        $(Q)mkdir -p $(BASEDIR)
+        $(Q)mkdir -p $(NOCHUNKDIR)
         $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
-          --output $(BASEDIR)/CLFS-$(arch).html \
-          $(PWD)/stylesheets/clfs-nochunks.xsl $(RENDERTMP)/$(arch)-html.xml
-
-        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(BASEDIR)/CLFS-$(arch).html
-
-.PHONY: $(ARCHS_PDF)
-$(ARCHS_PDF): override arch =  $(@:%-pdf=%)
-$(ARCHS_PDF): tmpdir
+          --output $(NOCHUNKDIR)/CLFS-$(arch).html \
+          $(PWD)/stylesheets/clfs-nochunks.xsl \
+          $(PROFILEDIR)/$(arch)-html.xml
+
+        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(NOCHUNKDIR)/CLFS-$(arch).html
+
+ARCHS_FO := $(ARCHS:%=%-fo)
+.PHONY: fo $(ARCHS_FO)
+fo: $(ARCHS_FO)
+$(ARCHS_FO): override arch = $(@:%-fo=%)
+$(ARCHS_FO):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
 
         @echo "Generating FO file of $(arch)..."
+        @mkdir -p $(FODIR)
         $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
-          --output $(RENDERTMP)/$(arch).fo $(PWD)/stylesheets/clfs-pdf.xsl \
-          $(RENDERTMP)/$(arch)-html.xml
-        $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/$(arch).fo
+          --output $(FODIR)/$(arch).fo \
+          $(PWD)/stylesheets/clfs-pdf.xsl \
+          $(PROFILEDIR)/$(arch)-html.xml
+        $(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
+
+ARCHS_PDF := $(ARCHS:%=%-pdf)
+.PHONY: pdf $(ARCHS_PDF)
+pdf: $(ARCHS_PDF)
+$(ARCHS_PDF): override arch = $(@:%-pdf=%)
+$(ARCHS_PDF):
+        @$(MAKE) --no-print-directory $(arch)-fo
 
         @echo "Rendering PDF of $(arch)..."
-        $(Q)mkdir -p $(BASEDIR)
-        $(Q)fop $(RENDERTMP)/$(arch).fo $(BASEDIR)/CLFS-$(arch).pdf
-
-.PHONY: $(ARCHS_VALIDATE)
+        $(Q)mkdir -p $(PDFDIR)
+        $(Q)fop $(FODIR)/$(arch).fo $(PDFDIR)/CLFS-$(arch).pdf
+
+ARCHS_VALIDATE := $(ARCHS:%=%-validate)
+.PHONY: validate $(ARCHS_VALIDATE)
+validate: $(ARCHS_VALIDATE)
 $(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
 $(ARCHS_VALIDATE):
         @echo "Validating $(arch)..."
-        $(Q)xmllint --xinclude --noout --nonet --postvalid $(PWD)/$(arch)-index.xml
-
-.PHONY: $(ARCHS_TROUBLE)
-$(ARCHS_TROUBLE): override trouble_arch =  $(@:%-trouble=%)
-$(ARCHS_TROUBLE): tmpdir
-        @echo "Troubleshooting $(trouble_arch)..."
-        $(Q)xmllint --xinclude --nonet --postvalid \
-          -o $(RENDERTMP)/dump-$(arch) $(PWD)/$(arch)-index.xml
-        $(Q)xmllint --xinclude --noout --nonet --valid $(RENDERTMP)/dump-$(arch)
-        @echo "You can now look at $(RENDERTMP)/dump-$(arch) to see the errors"
-
-.PHONY: $(ARCHS_DUMP)
-$(ARCHS_DUMP): override arch =  $(@:%-dump=%)
+        $(Q)xmllint --xinclude --noout --nonet \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          $(PWD)/$(arch)-index.xml
+
+ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
+.PHONY: trouble $(ARCHS_TROUBLE)
+trouble: $(ARCHS_TROUBLE)
+$(ARCHS_TROUBLE): override arch = $(@:%-trouble=%)
+$(ARCHS_TROUBLE):
+        @echo "Troubleshooting $(arch)..."
+        @mkdir -p $(TROUBLEDIR)
+        $(Q)xmllint --xinclude --nonet \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          -o $(TROUBLEDIR)/dump-$(arch) \
+          $(PWD)/$(arch)-index.xml
+        $(Q)xmllint --xinclude --noout --nonet \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          $(TROUBLEDIR)/dump-$(arch)
+        @echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"
+
+ARCHS_DUMP := $(ARCHS:%=%-dump)
+.PHONY: dump-commands $(ARCHS_DUMP)
+dump-commands: $(ARCHS_DUMP)
+$(ARCHS_DUMP): override arch = $(@:%-dump=%)
 $(ARCHS_DUMP):
         @echo "Extracting commands from $(arch)..."
         $(Q)mkdir -p $(DUMPDIR)/$(arch)
-        $(Q)xsltproc --xinclude --nonet --output $(DUMPDIR)/$(arch)/ \
-          $(PWD)/stylesheets/dump-commands.xsl $(PWD)/$(arch)-index.xml
-
-.PHONY: $(ARCHS_DLLIST)
+        $(Q)xsltproc --xinclude --nonet \
+          --output $(DUMPDIR)/$(arch)/ \
+          $(PWD)/stylesheets/dump-commands.xsl \
+          $(PWD)/$(arch)-index.xml
+
+ARCHS_DLLIST := $(ARCHS:%=%-dllist)
+.PHONY: download-list $(ARCHS_DLLIST)
+download-list: $(ARCHS_DLLIST)
 $(ARCHS_DLLIST): override arch = $(@:%-dllist=%)
 $(ARCHS_DLLIST):
         @echo "Creating download list for $(arch)..."
         $(Q)mkdir -p $(DLLISTDIR)
-        $(Q)xsltproc --xinclude --nonet --output $(DLLISTDIR)/$(arch)/dl.list \
-          $(PWD)/stylesheets/wget.xsl $(PWD)/$(arch)-index.xml
-
+        $(Q)xsltproc --xinclude --nonet \
+          --output $(DLLISTDIR)/$(arch).list \
+          $(PWD)/stylesheets/wget.xsl \
+          $(PWD)/$(arch)-index.xml
+
+FG_GREEN := $(shell echo -e '\e[0;32m')
+FG_BLUE := $(shell echo -e '\e[0;34m')
+FG_DEFAULT := $(shell echo -e '\e[0;0m')
 help:
-        @echo "Output: $(WORKDIR)"
+        @echo "Output: $(RENDERDIR)"
         @echo
         @echo "HTML Targets"
-        @echo "  $(FG_GREEN)clfs lfs tidy render titlepage $(FG_BLUE)$(ARCHS_HTML)$(FG_DEFAULT)"
+        @echo "  $(FG_GREEN)clfs lfs tidy html render titlepage $(FG_BLUE)$(ARCHS_HTML)$(FG_DEFAULT)"
         @echo
         @echo "NoChunks Targets"
         @echo "  $(FG_GREEN)nochunks tidy $(FG_BLUE)$(ARCHS_NOCHUNKS)$(FG_DEFAULT)"
         @echo
+        @echo "FO Targets"
+        @echo "  $(FG_GREEN)fo $(FG_BLUE)$(ARCHS_FO)$(FG_DEFAULT)"
+        @echo
         @echo "PDF Targets"
         @echo "  $(FG_GREEN)pdf $(FG_BLUE)$(ARCHS_PDF)$(FG_DEFAULT)"