Changeset eef46e9 for BOOK

Timestamp:

Feb 26, 2011, 2:33:56 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

4fe47e3

Parents:

da28cc3

Message:

Add a custom schema for CLFS as well as an intermediate target in
the Makefile that validate against this schema and then docbooks
standard schema.

Location:

BOOK

Files:

• Makefile (modified) (8 diffs)
• schema/clfs/0.1/rng/clfs.rnc (added)
• schema/clfs/0.1/rng/clfs.rng (added)

BOOK/Makefile

@@ -62 +62 @@
 $(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
 $(ARCHS_VD_XML):
-        @echo "Validating $(arch) book..."
+        @echo "Validating $(arch) against the CLFS Schema..."
         $(Q)mkdir -p $(VALIDATEDIR)
         $(Q)xmllint --nonet --noent --xinclude \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
           -o $(VALIDATEDIR)/$(arch)-full.xml \
-          $(PWD)/$(arch)-index.xml
+          $(PWD)/$(arch)-index.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
 
 ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
@@ -74 +76 @@
 $(ARCHS_P_XML):
         @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
-        @echo "Generating profiled $(arch) book..."
+        @echo "Profiling $(arch) for rendering..."
         $(Q)mkdir -p $(PROFILEDIR)
         $(Q)xsltproc --nonet --stringparam profile.condition html \
@@ -80 +82 @@
           $(PWD)/stylesheets/lfs-xsl/profile.xsl \
           $(VALIDATEDIR)/$(arch)-full.xml
+
+ARCHS_VDB_XML := $(ARCHS:%=%-validate_db-xml)
+.PHONY: $(ARCHS_VDB_XML)
+$(ARCHS_VDB_XML): override arch = $(@:%-validate_db-xml=%)
+$(ARCHS_VDB_XML):
+        @echo "Validating $(arch) against the DocBook Schema..."
+        $(Q)xmllint --noout --nonet \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          $(VALIDATEDIR)/$(arch)-full.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
 
 ARCHS_HTML := $(ARCHS:%=%-html)
@@ -87 +100 @@
 $(ARCHS_HTML):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
+        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering chunked XHTML of $(arch)..."
@@ -112 +126 @@
 $(ARCHS_NOCHUNKS):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
+        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering Single File HTML of $(arch)..."
@@ -128 +143 @@
 $(ARCHS_FO):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
+        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Generating FO file of $(arch)..."
@@ -153 +169 @@
 $(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
 $(ARCHS_VALIDATE):
-        @echo "Validating $(arch)..."
+        @echo "Validating $(arch) against the CLFS Schema..."
         $(Q)xmllint --xinclude --noout --nonet \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-          $(PWD)/$(arch)-index.xml
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          $(PWD)/$(arch)-index.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
 
 ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
@@ -166 +184 @@
         @mkdir -p $(TROUBLEDIR)
         $(Q)xmllint --xinclude --nonet \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
           -o $(TROUBLEDIR)/dump-$(arch) \
-          $(PWD)/$(arch)-index.xml
+          $(PWD)/$(arch)-index.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
         $(Q)xmllint --xinclude --noout --nonet \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-          $(TROUBLEDIR)/dump-$(arch)
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          $(TROUBLEDIR)/dump-$(arch) \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
         @echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"