Changeset 64df749 in clfs-embedded

Timestamp:

Mar 7, 2011, 4:28:36 AM (14 years ago)

Author:

Andrew Bradford <bradfa@…>

Branches:

master

Children:

ead8566

Parents:

19b9fca

git-author:

Andrew Bradford <bradfa@…> (02/27/11 13:43:06)

git-committer:

Andrew Bradford <bradfa@…> (03/07/11 04:28:36)

Message:

Integrated relax-ng schema validation from main book

Got from main book commit:
da28cc39be3d27782a526cb4350b643baa136390

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

@@ -60 +60 @@
         @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
@@ -149 +150 @@
 $(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
 
@@ -160 +161 @@
         @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"