Changes in / [af891d2:af43a09]


Ignore:
Location:
BOOK
Files:
10 added
3 edited

Legend:

Unmodified
Added
Removed
  • BOOK/Makefile

    raf891d2 raf43a09  
    33
    44VALIDATEDIR     := $(RENDERDIR)/validate
     5DBXMLDIR        := $(RENDERDIR)/docbook
    56PROFILEDIR      := $(RENDERDIR)/profile
    67
     
    2324                   ppc ppc64 \
    2425                   alpha
     26
     27x86_ML          := 32
     28x86_64_ML       := 32,64
     29x86_64-64_ML    := 64
     30sparc_ML        := 32
     31sparc64_ML      := 32,64
     32sparc64-64_ML   := 64
     33mips_ML         := 32
     34mips64_ML       := 32,n32,64
     35mips64-64_ML    := 64
     36ppc_ML          := 32
     37ppc64_ML        := 32,64
     38alpha_ML        := 64
    2539
    2640ifdef V
     
    6276$(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
    6377$(ARCHS_VD_XML):
    64         @echo "Validating $(arch) book..."
     78        @echo "Validating $(arch) against the CLFS Schema..."
    6579        $(Q)mkdir -p $(VALIDATEDIR)
    6680        $(Q)xmllint --nonet --noent --xinclude \
    67           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
     81          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
    6882          -o $(VALIDATEDIR)/$(arch)-full.xml \
    69           $(PWD)/$(arch)-index.xml
     83          $(PWD)/$(arch)-index.xml \
     84          2>&1 | grep -v " validates$$"; \
     85          if test $${?} -ne 0; then true; else false; fi
     86
     87ARCHS_DB_XML := $(ARCHS:%=%-db-xml)
     88.PHONY: $(ARCHS_DB_XML)
     89$(ARCHS_DB_XML): override arch = $(@:%-db-xml=%)
     90$(ARCHS_DB_XML):
     91        @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
     92        @echo "Generating DocBook XML for $(arch)..."
     93        $(Q)mkdir -p $(DBXMLDIR)
     94        $(Q)xsltproc --nonet \
     95          --stringparam clfs.arch "$(arch)" \
     96          --stringparam clfs.multilib "$($(arch)_ML)" \
     97          --output $(DBXMLDIR)/$(arch)-db.xml \
     98          $(PWD)/stylesheets/clfs-profile.xsl \
     99          $(VALIDATEDIR)/$(arch)-full.xml
    70100
    71101ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
     
    73103$(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
    74104$(ARCHS_P_XML):
    75         @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
    76         @echo "Generating profiled $(arch) book..."
     105        @$(MAKE) --no-print-directory $(arch)-db-xml
     106        @echo "Profiling $(arch) for rendering..."
    77107        $(Q)mkdir -p $(PROFILEDIR)
    78         $(Q)xsltproc --nonet --stringparam profile.condition html \
     108        $(Q)xsltproc --nonet \
     109          --stringparam profile.condition html \
    79110          --output $(PROFILEDIR)/$(arch)-html.xml \
    80111          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
    81           $(VALIDATEDIR)/$(arch)-full.xml
     112          $(DBXMLDIR)/$(arch)-db.xml
     113
     114ARCHS_VDB_XML := $(ARCHS:%=%-validate_db-xml)
     115.PHONY: $(ARCHS_VDB_XML)
     116$(ARCHS_VDB_XML): override arch = $(@:%-validate_db-xml=%)
     117$(ARCHS_VDB_XML):
     118        @echo "Validating $(arch) against the DocBook Schema..."
     119        $(Q)xmllint --noout --nonet \
     120          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
     121          $(PROFILEDIR)/$(arch)-html.xml \
     122          2>&1 | grep -v " validates$$"; \
     123          if test $${?} -ne 0; then true; else false; fi
    82124
    83125ARCHS_HTML := $(ARCHS:%=%-html)
     
    87129$(ARCHS_HTML):
    88130        @$(MAKE) --no-print-directory $(arch)-profiled-xml
     131        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
    89132
    90133        @echo "Rendering chunked XHTML of $(arch)..."
     
    112155$(ARCHS_NOCHUNKS):
    113156        @$(MAKE) --no-print-directory $(arch)-profiled-xml
     157        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
    114158
    115159        @echo "Rendering Single File HTML of $(arch)..."
     
    128172$(ARCHS_FO):
    129173        @$(MAKE) --no-print-directory $(arch)-profiled-xml
     174        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
    130175
    131176        @echo "Generating FO file of $(arch)..."
     
    153198$(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
    154199$(ARCHS_VALIDATE):
    155         @echo "Validating $(arch)..."
     200        @echo "Validating $(arch) against the CLFS Schema..."
    156201        $(Q)xmllint --xinclude --noout --nonet \
    157           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
    158           $(PWD)/$(arch)-index.xml
     202          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
     203          $(PWD)/$(arch)-index.xml \
     204          2>&1 | grep -v " validates$$"; \
     205          if test $${?} -ne 0; then true; else false; fi
    159206
    160207ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
     
    166213        @mkdir -p $(TROUBLEDIR)
    167214        $(Q)xmllint --xinclude --nonet \
    168           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
     215          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
    169216          -o $(TROUBLEDIR)/dump-$(arch) \
    170           $(PWD)/$(arch)-index.xml
     217          $(PWD)/$(arch)-index.xml \
     218          2>&1 | grep -v " validates$$"; \
     219          if test $${?} -ne 0; then true; else false; fi
    171220        $(Q)xmllint --xinclude --noout --nonet \
    172           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
    173           $(TROUBLEDIR)/dump-$(arch)
     221          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
     222          $(TROUBLEDIR)/dump-$(arch) \
     223          2>&1 | grep -v " validates$$"; \
     224          if test $${?} -ne 0; then true; else false; fi
    174225        @echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"
    175226
  • BOOK/x86-index.xml

    raf891d2 raf43a09  
    99
    1010  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86/bookinfo.xml"/>
     11  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
    1112  <!--
    1213  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
    1314  -->
    1415  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
     16
    1517
    1618  <part id="part1">
  • BOOK/x86_64-index.xml

    raf891d2 raf43a09  
    66]>
    77
    8 <book>
     8<book xmlns:c="http://schema.cross-lfs.org/book">
    99
    1010  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64/bookinfo.xml"/>
     11  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
    1112  <!--
    1213  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
Note: See TracChangeset for help on using the changeset viewer.