Changeset 8c3f58f


Ignore:
Timestamp:
Feb 26, 2011, 1:23:54 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
6cefbfb
Parents:
1f9faab (diff), da28cc3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into systemd

Files:
12 added
2 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r1f9faab r8c3f58f  
    1 BOOK/render-output
     1/BOOK/render-output
     2/render/

  • BOOK/Makefile

    r1f9faab r8c3f58f  
    11TOP             := $(PWD)
    2 
    3 WORKDIR         := $(TOP)/render-output
    4 
    5 BASEDIR         := $(WORKDIR)/cross-lfs-book
    6 DUMPDIR         := $(WORKDIR)/cross-lfs-commands
    7 DLLISTDIR       := $(WORKDIR)/cross-lfs-dllist
    8 RENDERTMP       := $(WORKDIR)/tmp
     2RENDERDIR       := $(TOP)/../render
     3
     4VALIDATEDIR     := $(RENDERDIR)/validate
     5PROFILEDIR      := $(RENDERDIR)/profile
     6
     7HTMLDIR         := $(RENDERDIR)/html
     8NOCHUNKDIR      := $(RENDERDIR)/nochunk
     9
     10FODIR           := $(RENDERDIR)/fo
     11PDFDIR          := $(RENDERDIR)/pdf
     12
     13TROUBLEDIR      := $(RENDERDIR)/trouble
     14DUMPDIR         := $(RENDERDIR)/commands
     15DLLISTDIR       := $(RENDERDIR)/download-list
     16
    917CHUNK_QUIET     := 1
    10 ROOT_ID  :=
    11 
    12 FG_GREEN        := $(shell echo -e '\e[0;32m')
    13 FG_BLUE         := $(shell echo -e '\e[0;34m')
    14 FG_DEFAULT      := $(shell echo -e '\e[0;0m')
     18ROOT_ID         :=
    1519
    1620ARCHS           := x86 x86_64 x86_64-64 \
    … …  
    2024                   alpha
    2125
    22 ARCHS_VD_XML    := $(ARCHS:%=%-validate_dump-xml)
    23 ARCHS_P_XML     := $(ARCHS:%=%-profiled-xml)
    24 
    25 ARCHS_HTML      := $(ARCHS:%=%-html)
    26 ARCHS_NOCHUNKS  := $(ARCHS:%=%-nochunks)
    27 ARCHS_PDF       := $(ARCHS:%=%-pdf)
    28 ARCHS_VALIDATE  := $(ARCHS:%=%-validate)
    29 ARCHS_TROUBLE   := $(ARCHS:%=%-trouble)
    30 ARCHS_DUMP      := $(ARCHS:%=%-dump)
    31 ARCHS_DLLIST    := $(ARCHS:%=%-dllist)
    32 
    3326ifdef V
    3427  Q =
    … …  
    3730endif
    3831
    39 .PHONY: clfs lfs render nochunks pdf validate trouble dump-commands download-list
    40 clfs lfs: tmpdir render
    41 render: $(ARCHS_HTML) titlepage
    42 nochunks: tmpdir $(ARCHS_NOCHUNKS)
    43 pdf: tmpdir $(ARCHS_PDF)
    44 validate: $(ARCHS_VALIDATE)
    45 trouble: tmpdir $(ARCHS_TROUBLE)
    46 dump-commands: $(ARCHS_DUMP)
    47 download-list: $(ARCHS_DLLIST)
    48 
    49 .PHONY: tmpdir
    50 tmpdir:
    51         $(Q)mkdir -p $(RENDERTMP)
     32.PHONY: clfs lfs
     33clfs lfs: html
    5234
    5335.PHONY: tidy tidy-f tidy-d
    5436ifeq ($(shell which tidy >/dev/null 2>&1 && echo yes),yes)
    5537tidy:
    56         @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(BASEDIR)
     38        @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(HTMLDIR)
    5739
    5840tidy-f:
    … …  
    7153titlepage:
    7254        @echo "Rendering the top-level index..."
    73         $(Q)xsltproc --nonet --output $(BASEDIR)/index.html \
    74           $(PWD)/stylesheets/top-index.xsl $(PWD)/index.xml
    75         @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(BASEDIR)/index.html
    76 
    77 
     55        $(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
     56          $(PWD)/stylesheets/top-index.xsl \
     57          $(PWD)/index.xml
     58        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
     59
     60ARCHS_VD_XML := $(ARCHS:%=%-validate_dump-xml)
    7861.PHONY: $(ARCHS_VD_XML)
    7962$(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
    80 $(ARCHS_VD_XML): tmpdir
     63$(ARCHS_VD_XML):
    8164        @echo "Validating $(arch) book..."
    82         $(Q)xmllint --nonet --noent --xinclude --postvalid \
    83           -o $(RENDERTMP)/$(arch)-full.xml $(PWD)/$(arch)-index.xml
    84 
     65        $(Q)mkdir -p $(VALIDATEDIR)
     66        $(Q)xmllint --nonet --noent --xinclude \
     67          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
     68          -o $(VALIDATEDIR)/$(arch)-full.xml \
     69          $(PWD)/$(arch)-index.xml
     70
     71ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
    8572.PHONY: $(ARCHS_P_XML)
    8673$(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
    87 $(ARCHS_P_XML): tmpdir
     74$(ARCHS_P_XML):
    8875        @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
    89 
    90         @echo "Generating profiled $(arch) book for XHTML..."
     76        @echo "Generating profiled $(arch) book..."
     77        $(Q)mkdir -p $(PROFILEDIR)
    9178        $(Q)xsltproc --nonet --stringparam profile.condition html \
    92           --output $(RENDERTMP)/$(arch)-html.xml \
    93           $(PWD)/stylesheets/lfs-xsl/profile.xsl $(RENDERTMP)/$(arch)-full.xml
    94 
    95 .PHONY: $(ARCHS_HTML)
     79          --output $(PROFILEDIR)/$(arch)-html.xml \
     80          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
     81          $(VALIDATEDIR)/$(arch)-full.xml
     82
     83ARCHS_HTML := $(ARCHS:%=%-html)
     84.PHONY: html render $(ARCHS_HTML)
     85html render: $(ARCHS_HTML) titlepage
    9686$(ARCHS_HTML): override arch = $(@:%-html=%)
    97 $(ARCHS_HTML): tmpdir
     87$(ARCHS_HTML):
    9888        @$(MAKE) --no-print-directory $(arch)-profiled-xml
    9989
    10090        @echo "Rendering chunked XHTML of $(arch)..."
    101         $(Q)mkdir -p $(BASEDIR)/$(arch)
     91        $(Q)mkdir -p $(HTMLDIR)/$(arch)
    10292        $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
    10393          -stringparam rootid "$(ROOT_ID)" \
    104           -stringparam base.dir $(BASEDIR)/$(arch)/ \
    105           $(PWD)/stylesheets/clfs-chunked.xsl $(RENDERTMP)/$(arch)-html.xml
     94          -stringparam base.dir $(HTMLDIR)/$(arch)/ \
     95          $(PWD)/stylesheets/clfs-chunked.xsl \
     96          $(PROFILEDIR)/$(arch)-html.xml
    10697
    10798        @echo "Copying CSS code and images for $(arch)..."
    108         $(Q)mkdir -p $(BASEDIR)/$(arch)/stylesheets
    109         $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(BASEDIR)/$(arch)/stylesheets
    110         $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(BASEDIR)/$(arch)/*.html
    111         $(Q)mkdir -p $(BASEDIR)/$(arch)/images
    112         $(Q)cp $(PWD)/images/*.png $(BASEDIR)/$(arch)/images
    113         $(Q)sed -i -e "s@../images@images@g" $(BASEDIR)/$(arch)/*.html
    114 
    115         @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(BASEDIR)/$(arch)
    116 
    117 .PHONY: $(ARCHS_NOCHUNKS)
     99        $(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
     100        $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
     101        $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(HTMLDIR)/$(arch)/*.html
     102        $(Q)mkdir -p $(HTMLDIR)/$(arch)/images
     103        $(Q)cp $(PWD)/images/*.png $(HTMLDIR)/$(arch)/images
     104        $(Q)sed -i -e "s@../images@images@g" $(HTMLDIR)/$(arch)/*.html
     105
     106        @$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(HTMLDIR)/$(arch)
     107
     108ARCHS_NOCHUNKS := $(ARCHS:%=%-nochunks)
     109.PHONY: nochunks $(ARCHS_NOCHUNKS)
     110nochunks: $(ARCHS_NOCHUNKS)
    118111$(ARCHS_NOCHUNKS): override arch = $(@:%-nochunks=%)
    119 $(ARCHS_NOCHUNKS): tmpdir
     112$(ARCHS_NOCHUNKS):
    120113        @$(MAKE) --no-print-directory $(arch)-profiled-xml
    121114
    122115        @echo "Rendering Single File HTML of $(arch)..."
    123         $(Q)mkdir -p $(BASEDIR)
     116        $(Q)mkdir -p $(NOCHUNKDIR)
    124117        $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
    125           --output $(BASEDIR)/CLFS-$(arch).html \
    126           $(PWD)/stylesheets/clfs-nochunks.xsl $(RENDERTMP)/$(arch)-html.xml
    127 
    128         @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(BASEDIR)/CLFS-$(arch).html
    129 
    130 .PHONY: $(ARCHS_PDF)
    131 $(ARCHS_PDF): override arch =  $(@:%-pdf=%)
    132 $(ARCHS_PDF): tmpdir
     118          --output $(NOCHUNKDIR)/CLFS-$(arch).html \
     119          $(PWD)/stylesheets/clfs-nochunks.xsl \
     120          $(PROFILEDIR)/$(arch)-html.xml
     121
     122        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(NOCHUNKDIR)/CLFS-$(arch).html
     123
     124ARCHS_FO := $(ARCHS:%=%-fo)
     125.PHONY: fo $(ARCHS_FO)
     126fo: $(ARCHS_FO)
     127$(ARCHS_FO): override arch = $(@:%-fo=%)
     128$(ARCHS_FO):
    133129        @$(MAKE) --no-print-directory $(arch)-profiled-xml
    134130
    135131        @echo "Generating FO file of $(arch)..."
     132        @mkdir -p $(FODIR)
    136133        $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
    137           --output $(RENDERTMP)/$(arch).fo $(PWD)/stylesheets/clfs-pdf.xsl \
    138           $(RENDERTMP)/$(arch)-html.xml
    139         $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/$(arch).fo
     134          --output $(FODIR)/$(arch).fo \
     135          $(PWD)/stylesheets/clfs-pdf.xsl \
     136          $(PROFILEDIR)/$(arch)-html.xml
     137        $(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
     138
     139ARCHS_PDF := $(ARCHS:%=%-pdf)
     140.PHONY: pdf $(ARCHS_PDF)
     141pdf: $(ARCHS_PDF)
     142$(ARCHS_PDF): override arch = $(@:%-pdf=%)
     143$(ARCHS_PDF):
     144        @$(MAKE) --no-print-directory $(arch)-fo
    140145
    141146        @echo "Rendering PDF of $(arch)..."
    142         $(Q)mkdir -p $(BASEDIR)
    143         $(Q)fop $(RENDERTMP)/$(arch).fo $(BASEDIR)/CLFS-$(arch).pdf
    144 
    145 .PHONY: $(ARCHS_VALIDATE)
     147        $(Q)mkdir -p $(PDFDIR)
     148        $(Q)fop $(FODIR)/$(arch).fo $(PDFDIR)/CLFS-$(arch).pdf
     149
     150ARCHS_VALIDATE := $(ARCHS:%=%-validate)
     151.PHONY: validate $(ARCHS_VALIDATE)
     152validate: $(ARCHS_VALIDATE)
    146153$(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
    147154$(ARCHS_VALIDATE):
    148155        @echo "Validating $(arch)..."
    149         $(Q)xmllint --xinclude --noout --nonet --postvalid $(PWD)/$(arch)-index.xml
    150 
    151 .PHONY: $(ARCHS_TROUBLE)
    152 $(ARCHS_TROUBLE): override trouble_arch =  $(@:%-trouble=%)
    153 $(ARCHS_TROUBLE): tmpdir
    154         @echo "Troubleshooting $(trouble_arch)..."
    155         $(Q)xmllint --xinclude --nonet --postvalid \
    156           -o $(RENDERTMP)/dump-$(arch) $(PWD)/$(arch)-index.xml
    157         $(Q)xmllint --xinclude --noout --nonet --valid $(RENDERTMP)/dump-$(arch)
    158         @echo "You can now look at $(RENDERTMP)/dump-$(arch) to see the errors"
    159 
    160 .PHONY: $(ARCHS_DUMP)
    161 $(ARCHS_DUMP): override arch =  $(@:%-dump=%)
     156        $(Q)xmllint --xinclude --noout --nonet \
     157          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
     158          $(PWD)/$(arch)-index.xml
     159
     160ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
     161.PHONY: trouble $(ARCHS_TROUBLE)
     162trouble: $(ARCHS_TROUBLE)
     163$(ARCHS_TROUBLE): override arch = $(@:%-trouble=%)
     164$(ARCHS_TROUBLE):
     165        @echo "Troubleshooting $(arch)..."
     166        @mkdir -p $(TROUBLEDIR)
     167        $(Q)xmllint --xinclude --nonet \
     168          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
     169          -o $(TROUBLEDIR)/dump-$(arch) \
     170          $(PWD)/$(arch)-index.xml
     171        $(Q)xmllint --xinclude --noout --nonet \
     172          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
     173          $(TROUBLEDIR)/dump-$(arch)
     174        @echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"
     175
     176ARCHS_DUMP := $(ARCHS:%=%-dump)
     177.PHONY: dump-commands $(ARCHS_DUMP)
     178dump-commands: $(ARCHS_DUMP)
     179$(ARCHS_DUMP): override arch = $(@:%-dump=%)
    162180$(ARCHS_DUMP):
    163181        @echo "Extracting commands from $(arch)..."
    164182        $(Q)mkdir -p $(DUMPDIR)/$(arch)
    165         $(Q)xsltproc --xinclude --nonet --output $(DUMPDIR)/$(arch)/ \
    166           $(PWD)/stylesheets/dump-commands.xsl $(PWD)/$(arch)-index.xml
    167 
    168 .PHONY: $(ARCHS_DLLIST)
     183        $(Q)xsltproc --xinclude --nonet \
     184          --output $(DUMPDIR)/$(arch)/ \
     185          $(PWD)/stylesheets/dump-commands.xsl \
     186          $(PWD)/$(arch)-index.xml
     187
     188ARCHS_DLLIST := $(ARCHS:%=%-dllist)
     189.PHONY: download-list $(ARCHS_DLLIST)
     190download-list: $(ARCHS_DLLIST)
    169191$(ARCHS_DLLIST): override arch = $(@:%-dllist=%)
    170192$(ARCHS_DLLIST):
    171193        @echo "Creating download list for $(arch)..."
    172194        $(Q)mkdir -p $(DLLISTDIR)
    173         $(Q)xsltproc --xinclude --nonet --output $(DLLISTDIR)/$(arch)/dl.list \
    174           $(PWD)/stylesheets/wget.xsl $(PWD)/$(arch)-index.xml
    175 
     195        $(Q)xsltproc --xinclude --nonet \
     196          --output $(DLLISTDIR)/$(arch).list \
     197          $(PWD)/stylesheets/wget.xsl \
     198          $(PWD)/$(arch)-index.xml
     199
     200FG_GREEN := $(shell echo -e '\e[0;32m')
     201FG_BLUE := $(shell echo -e '\e[0;34m')
     202FG_DEFAULT := $(shell echo -e '\e[0;0m')
    176203help:
    177         @echo "Output: $(WORKDIR)"
     204        @echo "Output: $(RENDERDIR)"
    178205        @echo
    179206        @echo "HTML Targets"
    180         @echo "  $(FG_GREEN)clfs lfs tidy render titlepage $(FG_BLUE)$(ARCHS_HTML)$(FG_DEFAULT)"
     207        @echo "  $(FG_GREEN)clfs lfs tidy html render titlepage $(FG_BLUE)$(ARCHS_HTML)$(FG_DEFAULT)"
    181208        @echo
    182209        @echo "NoChunks Targets"
    183210        @echo "  $(FG_GREEN)nochunks tidy $(FG_BLUE)$(ARCHS_NOCHUNKS)$(FG_DEFAULT)"
    184211        @echo
     212        @echo "FO Targets"
     213        @echo "  $(FG_GREEN)fo $(FG_BLUE)$(ARCHS_FO)$(FG_DEFAULT)"
     214        @echo
    185215        @echo "PDF Targets"
    186216        @echo "  $(FG_GREEN)pdf $(FG_BLUE)$(ARCHS_PDF)$(FG_DEFAULT)"
Note: See TracChangeset for help on using the changeset viewer.