Changes in / [441840b:2a31285]

Location:

BOOK

Files:

• Makefile (modified) (9 diffs)
• schema/clfs/0.1/rng/calstblx.rng (deleted)
• schema/clfs/0.1/rng/clfs.rnc (deleted)
• schema/clfs/0.1/rng/clfs.rng (deleted)
• schema/clfs/0.1/rng/dbhierx.rng (deleted)
• schema/clfs/0.1/rng/dbnotnx.rng (deleted)
• schema/clfs/0.1/rng/dbpoolx.rng (deleted)
• schema/clfs/0.1/rng/docbook.rng (deleted)
• schema/clfs/0.1/rng/htmltblx.rng (deleted)
• stylesheets/clfs-profile.xsl (deleted)
• testpart.xml (deleted)
• x86-index.xml (modified) (1 diff)
• x86_64-index.xml (modified) (1 diff)

BOOK/Makefile

@@ -3 +3 @@
 
 VALIDATEDIR     := $(RENDERDIR)/validate
-DBXMLDIR        := $(RENDERDIR)/docbook
 PROFILEDIR      := $(RENDERDIR)/profile
 
@@ -24 +23 @@
                    ppc ppc64 \
                    alpha
-
-x86_ML          := 32
-x86_64_ML       := 32,64
-x86_64-64_ML    := 64
-sparc_ML        := 32
-sparc64_ML      := 32,64
-sparc64-64_ML   := 64
-mips_ML         := 32
-mips64_ML       := 32,n32,64
-mips64-64_ML    := 64
-ppc_ML          := 32
-ppc64_ML        := 32,64
-alpha_ML        := 64
 
 ifdef V
@@ -76 +62 @@
 $(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
 $(ARCHS_VD_XML):
-        @echo "Validating $(arch) against the CLFS Schema..."
+        @echo "Validating $(arch) book..."
         $(Q)mkdir -p $(VALIDATEDIR)
         $(Q)xmllint --nonet --noent --xinclude \
-          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           -o $(VALIDATEDIR)/$(arch)-full.xml \
-          $(PWD)/$(arch)-index.xml \
-          2>&1 | grep -v " validates$$"; \
-          if test $${?} -ne 0; then true; else false; fi
-
-ARCHS_DB_XML := $(ARCHS:%=%-db-xml)
-.PHONY: $(ARCHS_DB_XML)
-$(ARCHS_DB_XML): override arch = $(@:%-db-xml=%)
-$(ARCHS_DB_XML):
-        @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
-        @echo "Generating DocBook XML for $(arch)..."
-        $(Q)mkdir -p $(DBXMLDIR)
-        $(Q)xsltproc --nonet \
-          --stringparam clfs.arch "$(arch)" \
-          --stringparam clfs.multilib "$($(arch)_ML)" \
-          --output $(DBXMLDIR)/$(arch)-db.xml \
-          $(PWD)/stylesheets/clfs-profile.xsl \
-          $(VALIDATEDIR)/$(arch)-full.xml
+          $(PWD)/$(arch)-index.xml
 
 ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
@@ -103 +73 @@
 $(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
 $(ARCHS_P_XML):
-        @$(MAKE) --no-print-directory $(arch)-db-xml
-        @echo "Profiling $(arch) for rendering..."
+        @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
+        @echo "Generating profiled $(arch) book..."
         $(Q)mkdir -p $(PROFILEDIR)
-        $(Q)xsltproc --nonet \
-          --stringparam profile.condition html \
+        $(Q)xsltproc --nonet --stringparam profile.condition html \
           --output $(PROFILEDIR)/$(arch)-html.xml \
           $(PWD)/stylesheets/lfs-xsl/profile.xsl \
-          $(DBXMLDIR)/$(arch)-db.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 \
-          $(PROFILEDIR)/$(arch)-html.xml \
-          2>&1 | grep -v " validates$$"; \
-          if test $${?} -ne 0; then true; else false; fi
+          $(VALIDATEDIR)/$(arch)-full.xml
 
 ARCHS_HTML := $(ARCHS:%=%-html)
@@ -129 +87 @@
 $(ARCHS_HTML):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
-        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering chunked XHTML of $(arch)..."
@@ -155 +112 @@
 $(ARCHS_NOCHUNKS):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
-        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering Single File HTML of $(arch)..."
@@ -172 +128 @@
 $(ARCHS_FO):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
-        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Generating FO file of $(arch)..."
@@ -198 +153 @@
 $(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
 $(ARCHS_VALIDATE):
-        @echo "Validating $(arch) against the CLFS Schema..."
+        @echo "Validating $(arch)..."
         $(Q)xmllint --xinclude --noout --nonet \
-          --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
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          $(PWD)/$(arch)-index.xml
 
 ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
@@ -213 +166 @@
         @mkdir -p $(TROUBLEDIR)
         $(Q)xmllint --xinclude --nonet \
-          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           -o $(TROUBLEDIR)/dump-$(arch) \
-          $(PWD)/$(arch)-index.xml \
-          2>&1 | grep -v " validates$$"; \
-          if test $${?} -ne 0; then true; else false; fi
+          $(PWD)/$(arch)-index.xml
         $(Q)xmllint --xinclude --noout --nonet \
-          --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
+          --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"
 

BOOK/x86-index.xml

@@ -9 +9 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86/bookinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
   <!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
   -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
 
   <part id="part1">

BOOK/x86_64-index.xml

@@ -6 +6 @@
 ]>
 
-<book xmlns:c="http://schema.cross-lfs.org/book">
+<book>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64/bookinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
   <!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>