Changeset da28cc3

Timestamp:

02/26/11 21:23:17 (2 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

('master', '5ea4e55860c61746fb61f12cd3c83d270ee17451')('clfs-1.2', '0d1a577466382847256b44170acecbd2e8cdc0c5')('simp', '271d1f963630b9cb390baf1ee2d8bdfe7d14e340')('systemd', 'ec008670fee2dc8086a6ce805d4831378d59895d')

Children:

ec008670fee2dc8086a6ce805d4831378d59895dfe990042841c98c26355c5432f2cc6831631fd36eef46e9fe86bfd88455fdbc22d0d5b1116dc6729

Parents:

879785b301d55636dce86b7a66bc8b96cd74ede3

git-author:

Joe Ciccone <jciccone@gmail.com>2011-02-26 16:23:17-05:00

git-committer:

Joe Ciccone <jciccone@gmail.com>2011-02-26 16:23:17-05:00

Message:

Validate the book against relax-ng instead of the
standard DTD.

Location:

BOOK

Files:

• Makefile (modified) (3 diffs)
• schema/docbook/4.5/rng/calstblx.rnc (added)
• schema/docbook/4.5/rng/calstblx.rng (added)
• schema/docbook/4.5/rng/dbhierx.rnc (added)
• schema/docbook/4.5/rng/dbhierx.rng (added)
• schema/docbook/4.5/rng/dbnotnx.rnc (added)
• schema/docbook/4.5/rng/dbnotnx.rng (added)
• schema/docbook/4.5/rng/dbpoolx.rnc (added)
• schema/docbook/4.5/rng/dbpoolx.rng (added)
• schema/docbook/4.5/rng/docbook.rnc (added)
• schema/docbook/4.5/rng/docbook.rng (added)
• schema/docbook/4.5/rng/htmltblx.rnc (added)
• schema/docbook/4.5/rng/htmltblx.rng (added)

BOOK/Makefile

@@ -64 +64 @@
         @echo "Validating $(arch) book..."
         $(Q)mkdir -p $(VALIDATEDIR)
-        $(Q)xmllint --nonet --noent --xinclude --postvalid \
+        $(Q)xmllint --nonet --noent --xinclude \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           -o $(VALIDATEDIR)/$(arch)-full.xml \
           $(PWD)/$(arch)-index.xml
@@ -153 +154 @@
 $(ARCHS_VALIDATE):
         @echo "Validating $(arch)..."
-        $(Q)xmllint --xinclude --noout \
-          --nonet --postvalid \
+        $(Q)xmllint --xinclude --noout --nonet \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           $(PWD)/$(arch)-index.xml
 
@@ -164 +165 @@
         @echo "Troubleshooting $(arch)..."
         @mkdir -p $(TROUBLEDIR)
-        $(Q)xmllint --xinclude --nonet --postvalid \
+        $(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 --valid \
+        $(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"