Changeset 8ccf082a
- Timestamp:
- 01/31/2024 07:22:48 PM (8 months ago)
- Branches:
- multilib, xry111/multilib
- Children:
- ac1639c
- Parents:
- f6a43f6 (diff), a4eaba6 (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. - Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
rf6a43f6 r8ccf082a 1 1 # vim:ts=3 2 #BASEDIR = ~/lfs-book3 #SYSDDIR = ~/lfs-systemd4 #DUMPDIR = ~/lfs-commands5 2 RENDERTMP = $(HOME)/tmp 6 3 CHUNK_QUIET = 1 … … 25 22 26 23 ifeq ($(REV), sysv) 27 BASEDIR ?= ~/public_html/lfs-book24 BASEDIR ?= $(HOME)/public_html/lfs-book 28 25 PDF_OUTPUT ?= LFS-BOOK.pdf 29 26 NOCHUNKS_OUTPUT ?= LFS-BOOK.html 30 DUMPDIR ?= ~/lfs-commands27 DUMPDIR ?= $(HOME)/lfs-commands 31 28 else 32 BASEDIR ?= ~/public_html/lfs-systemd29 BASEDIR ?= $(HOME)/public_html/lfs-systemd 33 30 PDF_OUTPUT ?= LFS-SYSD-BOOK.pdf 34 31 NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html 35 DUMPDIR ?= ~/lfs-sysd-commands32 DUMPDIR ?= $(HOME)/lfs-sysd-commands 36 33 endif 37 34 … … 61 58 $(Q)mkdir -p $(BASEDIR)/stylesheets 62 59 $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets 63 $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html 60 $(Q)sed -e 's|../stylesheet|stylesheet|' \ 61 -i $(BASEDIR)/index.html 64 62 65 63 $(Q)mkdir -p $(BASEDIR)/images … … 69 67 $(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \ 70 68 tidy -config tidy.conf $$filename; \ 71 true; \72 69 /bin/bash obfuscate.sh $$filename; \ 73 sed -e "s @text/html@application/xhtml+xml@g" \70 sed -e "s|text/html|application/xhtml+xml|g" \ 74 71 -i $$filename; \ 75 done;72 done 76 73 77 74 $(Q)$(MAKE) --no-print-directory wget-list md5sums … … 112 109 stylesheets/lfs-nochunks.xsl \ 113 110 $(RENDERTMP)/lfs-html.xml 114 # $(RENDERTMP)/lfs-html2.xml115 111 116 112 @echo "Running Tidy..." 117 $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || t rue113 $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || test $$? -le 1 118 114 119 115 @echo "Running obfuscate.sh..." 120 $(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT) 121 $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT) 122 $(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) 123 $(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) 116 $(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT) 117 $(Q)sed -e "s|text/html|application/xhtml+xml|g" \ 118 -e "s|../wget-list|wget-list|" \ 119 -e "s|../md5sums|md5sums|" \ 120 -i $(BASEDIR)/$(NOCHUNKS_OUTPUT) 124 121 125 122 @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)" … … 140 137 $(Q)xsltproc --nonet \ 141 138 --xinclude \ 142 --output $(RENDERTMP)/lfs-html2.xml \143 139 --stringparam profile.revision $(REV) \ 144 140 --stringparam profile.arch $(ARCH) \ 141 --output $(RENDERTMP)/lfs-html2.xml \ 145 142 stylesheets/lfs-xsl/profile.xsl \ 146 143 index.xml 147 144 148 145 @echo "Validating the book..." 149 $(Q)xmllint --nonet \150 -- noent\151 --postvalid \152 - o$(RENDERTMP)/lfs-full.xml \146 $(Q)xmllint --nonet \ 147 --encode UTF-8 \ 148 --postvalid \ 149 --output $(RENDERTMP)/lfs-full.xml \ 153 150 $(RENDERTMP)/lfs-html2.xml 154 151 … … 172 169 @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..." 173 170 $(Q)mkdir -p $(BASEDIR) 174 $(Q)xsltproc --xinclude --nonet \ 171 $(Q)xsltproc --nonet \ 172 --xinclude \ 175 173 --output $(BASEDIR)/wget-list \ 176 174 stylesheets/wget-list.xsl \ … … 178 176 179 177 $(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP) 180 $(Q)xsltproc --nonet --xinclude \ 178 $(Q)xsltproc --nonet \ 179 --xinclude \ 181 180 --stringparam profile.revision $(REV) \ 182 181 --output $(RENDERTMP)/wget-list.xml \ 183 182 stylesheets/lfs-xsl/profile.xsl \ 184 183 chapter03/chapter03.xml 185 $(Q)xsltproc --xinclude --nonet \ 184 185 $(Q)xsltproc --nonet \ 186 186 --output $(BASEDIR)/wget-list-$(REV) \ 187 187 stylesheets/wget-list.xsl \ … … 193 193 $(Q)mkdir -p $(BASEDIR) 194 194 195 $(Q)xsltproc --nonet --xinclude \ 195 $(Q)xsltproc --nonet \ 196 --xinclude \ 196 197 --stringparam profile.revision $(REV) \ 197 198 --stringparam profile.arch $(ARCH) \ … … 200 201 chapter03/chapter03.xml 201 202 202 $(Q)xsltproc -- xinclude --nonet\203 $(Q)xsltproc --nonet \ 203 204 --output $(BASEDIR)/md5sums \ 204 205 stylesheets/md5sum.xsl \ -
stylesheets/dump-commands.xsl
rf6a43f6 r8ccf082a 1 <?xml version="1.0" ?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 3 xmlns:exsl="http://exslt.org/common"4 extension-element-prefixes="exsl"5 version="1.0">3 xmlns:exsl="http://exslt.org/common" 4 extension-element-prefixes="exsl" 5 version="1.0"> 6 6 7 7 <!-- XSLT stylesheet to extract commands from [B,H]LFS books. --> 8 8 9 9 <xsl:variable name="newline"> 10 <xsl:text> 11 </xsl:text> 10 <xsl:text>
</xsl:text> 12 11 </xsl:variable> 13 12 -
stylesheets/lfs-xsl/chunk-slave.xsl
rf6a43f6 r8ccf082a 10 10 <!-- Upstream XHTML presentation templates --> 11 11 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/> 12 13 <xsl:param name="chunker.output.method" select="'xml'"/> 14 <xsl:param name="chunker.output.encoding" select="'UTF-8'"/> 15 <xsl:param name="chunker.output.media-type" select="'application/xhtml+xml'"/> 16 <xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Strict//EN'"/> 17 <xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'"/> 18 <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/> 19 <xsl:param name="chunker.output.indent" select="'no'"/> 12 20 13 21 <!-- Including our customized elements templates --> … … 31 39 <xsl:param name="ulink.target" select="''"/> 32 40 <xsl:param name="css.decoration" select="0"/> 33 34 <!-- No XML declaration -->35 <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>36 41 37 42 <!-- Control generation of ToCs and LoTs --> -
stylesheets/lfs-xsl/nochunks.xsl
rf6a43f6 r8ccf082a 11 11 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/> 12 12 13 <xsl:output method="xml" 14 encoding="UTF-8" 15 media-type="application/xhtml+xml" 16 doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" 17 doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" 18 omit-xml-declaration="yes" 19 indent="no" /> 13 20 <!-- Include our customized templates --> 14 21 <xsl:include href="common.xsl"/> -
stylesheets/lfs-xsl/pdf.xsl
rf6a43f6 r8ccf082a 54 54 See pdf/lfs-mixed.xsl. 55 55 Note: the argument in select= is a zero-width space 56 (unicode 200b , encoded in utf-8)-->57 <xsl:param name="ulink.hyphenate" select="' '"/>56 (unicode 200b)--> 57 <xsl:param name="ulink.hyphenate" select="'​'"/> 58 58 59 59 <!-- List of characters to allow ulink URLs, and supported inline tags, -
stylesheets/lfs-xsl/profile.xsl
rf6a43f6 r8ccf082a 19 19 <!-- Generate DocBook instance with correct DOCTYPE --> 20 20 <xsl:output method="xml" 21 encoding="UTF-8" 21 22 doctype-public="-//OASIS//DTD DocBook XML V4.5//EN" 22 23 doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/> -
stylesheets/md5sum.xsl
rf6a43f6 r8ccf082a 4 4 5 5 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 6 version="1.0">6 version="1.0"> 7 7 8 8 <xsl:output method="text"/> … … 32 32 33 33 <!-- Add a newline --> 34 <xsl:text> 35 </xsl:text> 34 <xsl:text>
</xsl:text> 36 35 37 36 </xsl:if> -
stylesheets/wget-list.xsl
rf6a43f6 r8ccf082a 5 5 6 6 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 7 version="1.0">7 version="1.0"> 8 8 9 9 <xsl:output method="text"/> … … 29 29 </xsl:otherwise> 30 30 </xsl:choose> 31 <xsl:text> 32 </xsl:text> 31 <xsl:text>
</xsl:text> 33 32 </xsl:if> 34 33 </xsl:template>
Note:
See TracChangeset
for help on using the changeset viewer.