gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Makefile for merged files" nochunks, md5sums, wget-list

Browse Source 
Fix some formatting ant typos


git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11074 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2016-05-25 02:51:36 +00:00
parent 1118b1757d
commit 77ab7f35e9
4 changed files with 190 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
Makefile
View File

@ -6,6 +6,7 @@ CHUNK_QUIET = 1
ROOT_ID = ROOT_ID =
PDF_OUTPUT = LFS-BOOK.pdf PDF_OUTPUT = LFS-BOOK.pdf
NOCHUNKS_OUTPUT = LFS-BOOK.html NOCHUNKS_OUTPUT = LFS-BOOK.html
NOCHUNKS_SYSD_FILE = LFS-SYSD-BOOK.html
SHELL = /bin/bash SHELL = /bin/bash
ifdef V ifdef V
@ -30,17 +31,14 @@ sysv: validate profile-html
$(RENDERTMP)/lfs-html2.xml $(RENDERTMP)/lfs-html2.xml
@echo "Copying CSS code and images..." @echo "Copying CSS code and images..."
$(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \ $(Q)mkdir -p $(BASEDIR)/stylesheets
mkdir -p $(BASEDIR)/stylesheets; \
fi;
$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
$(Q)pushd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html; popd $(Q)pushd $(BASEDIR)/ > /dev/null; \
sed -i -e "s@../stylesheets@stylesheets@g" *.html; \
popd > /dev/null
$(Q)if [ ! -e $(BASEDIR)/images ]; then \ $(Q)mkdir -p $(BASEDIR)/images
mkdir -p $(BASEDIR)/images; \
fi;
$(Q)cp images/*.png $(BASEDIR)/images $(Q)cp images/*.png $(BASEDIR)/images
# $(Q)pushd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html; popd
@echo "Running Tidy and obfuscate.sh..." @echo "Running Tidy and obfuscate.sh..."
$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \ $(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
@ -52,7 +50,7 @@ sysv: validate profile-html
-i $$filename; \ -i $$filename; \
done; done;
$(Q)$(MAKE) $(BASEDIR)/wget-list $(BASEDIR)/md5sums $(Q)$(MAKE) --no-print-directory wget-list md5sums
systemd: validated profile-html systemd: validated profile-html
$(Q)xsltproc --nonet \ $(Q)xsltproc --nonet \
@ -70,14 +68,10 @@ systemd: validated profile-html
$(RENDERTMP)/lfs-html2.xml $(RENDERTMP)/lfs-html2.xml
@echo "Copying CSS code and images..." @echo "Copying CSS code and images..."
$(Q)if [ ! -e $(SYSDDIR)/stylesheets ]; then \ $(Q)mkdir -p $(SYSDDIR)/stylesheets
mkdir -p $(SYSDDIR)/stylesheets; \
fi;
$(Q)cp stylesheets/lfs-xsl/*.css $(SYSDDIR)/stylesheets $(Q)cp stylesheets/lfs-xsl/*.css $(SYSDDIR)/stylesheets
$(Q)if [ ! -e $(SYSDDIR)/images ]; then \ $(Q)mkdir -p $(SYSDDIR)/images
mkdir -p $(SYSDDIR)/images; \
fi;
$(Q)cp images/*.png $(SYSDDIR)/images $(Q)cp images/*.png $(SYSDDIR)/images
@echo "Running Tidy and obfuscate.sh..." @echo "Running Tidy and obfuscate.sh..."
@ -90,103 +84,226 @@ systemd: validated profile-html
-i $$filename; \ -i $$filename; \
done; done;
# $(Q)$(MAKE) $(SYSDDIR)/wget-list $(SYSDDIR)/md5sumsd $(Q)$(MAKE) --no-print-directory wget-listd md5sumsd
pdf: validate pdf: validate
@echo "Generating profiled XML for PDF..." @echo "Generating profiled XML for PDF..."
$(Q)xsltproc --nonet --stringparam profile.condition pdf \ $(Q)xsltproc --nonet \
--output $(RENDERTMP)/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \ --stringparam profile.condition pdf \
--stringparam profile.revision sysv \
--output $(RENDERTMP)/lfs-pdf.xml \
stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-full.xml $(RENDERTMP)/lfs-full.xml
@echo "Generating FO file..." @echo "Generating FO file..."
$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \ $(Q)xsltproc --nonet \
--output $(RENDERTMP)/lfs-pdf.fo stylesheets/lfs-pdf.xsl \ --stringparam rootid "$(ROOT_ID)" \
--output $(RENDERTMP)/lfs-pdf.fo \
stylesheets/lfs-pdf.xsl \
$(RENDERTMP)/lfs-pdf.xml $(RENDERTMP)/lfs-pdf.xml
$(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/lfs-pdf.fo $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/lfs-pdf.fo
$(Q)bash pdf-fixups.sh $(RENDERTMP)/lfs-pdf.fo $(Q)bash pdf-fixups.sh $(RENDERTMP)/lfs-pdf.fo
@echo "Generating PDF file..." @echo "Generating PDF file..."
$(Q)if [ ! -e $(BASEDIR) ]; then \ $(Q)mkdir -p $(BASEDIR)
mkdir -p $(BASEDIR); \
fi;
$(Q)fop -q $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) 2>fop.log $(Q)fop -q $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) 2>fop.log
@echo "$(BASEDIR)/$(PDF_OUTPUT) created" @echo "$(BASEDIR)/$(PDF_OUTPUT) created"
@echo "fop.log created" @echo "fop.log created"
nochunks: validate profile-html nochunks: validate profile-html
$(Q)xsltproc --nonet \
--output $(RENDERTMP)/lfs-html2.xml \
--stringparam profile.revision sysv \
stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-html.xml
@echo "Generating non chunked XHTML file..." @echo "Generating non chunked XHTML file..."
$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \ $(Q)xsltproc --nonet \
--stringparam rootid "$(ROOT_ID)" \
--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \ --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
stylesheets/lfs-nochunks.xsl $(RENDERTMP)/lfs-html.xml stylesheets/lfs-nochunks.xsl \
$(RENDERTMP)/lfs-html2.xml
@echo "Running Tidy..." @echo "Running Tidy..."
$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@echo "Running obfuscate.sh..." @echo "Running obfuscate.sh..."
$(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)$(MAKE) $(BASEDIR)/wget-list $(BASEDIR)/md5sums $(Q)sed -i -e "s@\xa9@\©@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"
nochunksd: validated profile-html
$(Q)xsltproc --nonet \
--output $(RENDERTMP)/lfs-html2.xml \
--stringparam profile.revision systemd \
stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-html.xml
@echo "Generating non chunked XHTML file..."
$(Q)xsltproc --nonet \
--stringparam rootid "$(ROOT_ID)" \
--output $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) \
stylesheets/lfs-nochunks.xsl \
$(RENDERTMP)/lfs-html2.xml
@echo "Running Tidy..."
$(Q)tidy -config tidy.conf $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) || true
@echo "Running obfuscate.sh..."
$(Q)bash obfuscate.sh $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
$(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
$(Q)sed -i -e "s@../wget-list@wget-list@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
$(Q)sed -i -e "s@../md5sums@md5sums@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
$(Q)sed -i -e "s@\xa9@\©@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)
@echo "Output at $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)"
tmpdir: tmpdir:
@echo "Creating and cleaning $(RENDERTMP)" @echo "Creating and cleaning $(RENDERTMP)"
$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP) $(Q)mkdir -p $(RENDERTMP)
$(Q)rm -f $(RENDERTMP)/lfs-{full,html,pdf}.xml $(Q)rm -f $(RENDERTMP)/lfs*.xml
$(Q)rm -f $(RENDERTMP)/lfs-pdf.fo $(Q)rm -f $(RENDERTMP)/sysd*.xml
$(Q)rm -f $(RENDERTMP)/*pdf.fo
validate: tmpdir validate: tmpdir
@echo "Processing bootscripts..." @echo "Processing bootscripts..."
$(Q)bash process-scripts.sh $(Q)bash process-scripts.sh
@echo "Validating the book..." @echo "Validating the book..."
$(Q)xmllint --nonet --noent --xinclude --postvalid \ $(Q)xmllint --nonet \
-o $(RENDERTMP)/lfs-full.xml index.xml --noent \
--xinclude \
--postvalid \
-o $(RENDERTMP)/lfs-full.xml \
index.xml
$(Q)rm -f appendices/*.script $(Q)rm -f appendices/*.script
$(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml $(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
@echo "Validation complete." @echo "Validation complete."
validated: tmpdir validated: tmpdir
@echo "Validating the book..." @echo "Validating the book..."
$(Q)xmllint --nonet --noent --xinclude --postvalid \ $(Q)xmllint --nonet \
-o $(RENDERTMP)/lfs-full.xml indexd.xml --noent \
--xinclude \
--postvalid \
-o $(RENDERTMP)/lfs-full.xml \
indexd.xml
@echo "Validation complete." @echo "Validation complete."
profile-html: profile-html:
@echo "Generating profiled XML for XHTML..." @echo "Generating profiled XML for XHTML..."
$(Q)xsltproc --nonet --stringparam profile.condition html \ $(Q)xsltproc --nonet \
--output $(RENDERTMP)/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \ --stringparam profile.condition html \
--output $(RENDERTMP)/lfs-html.xml \
stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-full.xml $(RENDERTMP)/lfs-full.xml
wget-list: $(BASEDIR)/wget-list wget-list: $(BASEDIR)/wget-list
$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.ent patches.ent $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
@echo "Generating wget list..." packages.ent patches.ent
@echo "Generating wget list for sysv..."
$(Q)mkdir -p $(BASEDIR) $(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
stylesheets/wget-list.xsl chapter03/chapter03.xml $(Q)xsltproc --nonet --xinclude \
--stringparam profile.revision sysv \
--output $(RENDERTMP)/sysd-wget.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
--output $(BASEDIR)/wget-list \
stylesheets/wget-list.xsl \
chapter03/chapter03.xml
wget-listd: $(SYSDDIR)/wget-listd
$(SYSDDIR)/wget-listd: stylesheets/wget-list.xsl chapter03/chapter03.xml \
packages.ent patches.ent
@echo "Generating wget list for systemd..."
$(Q)mkdir -p $(SYSDDIR)
$(Q)xsltproc --xinclude --nonet \
--stringparam profile.revision systemd \
--output $(RENDERTMP)/sysd-wget.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
--output $(SYSDDIR)/wget-list \
stylesheets/wget-list.xsl \
$(RENDERTMP)/sysd-wget.xml
md5sums: $(BASEDIR)/md5sums md5sums: $(BASEDIR)/md5sums
$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.ent patches.ent $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
@echo "Generating md5sum file..." packages.ent patches.ent
@echo "Generating md5sum file for sysv..."
$(Q)mkdir -p $(BASEDIR) $(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --xinclude --nonet --output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl chapter03/chapter03.xml $(Q)xsltproc --nonet --xinclude \
--stringparam profile.revision sysv \
--output $(RENDERTMP)/sysv-md5sum.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
--output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl \
$(RENDERTMP)/sysv-md5sum.xml
$(Q)sed -i -e \ $(Q)sed -i -e \
"s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \ "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
$(BASEDIR)/md5sums $(BASEDIR)/md5sums
md5sumsd: $(SYSDDIR)/md5sumsd md5sumsd: $(SYSDDIR)/md5sums
$(SYSDDIR)/md5sumsd: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.ent patches.ent $(SYSDDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
@echo "Generating md5sum file..." packages.ent patches.ent
@echo "Generating md5sum file for systemd..."
$(Q)mkdir -p $(SYSDDIR) $(Q)mkdir -p $(SYSDDIR)
$(Q)xsltproc --xinclude --nonet --output $(SYSDDIR)/md5sums \ $(Q)xsltproc --nonet --xinclude \
stylesheets/md5sum.xsl chapter03/chapter03.xml --stringparam profile.revision systemd \
--output $(RENDERTMP)/sysd-md5sum.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
--output $(SYSDDIR)/md5sums \
stylesheets/md5sum.xsl \
$(RENDERTMP)/sysd-md5sum.xml
dump-commands: validate dump-commands: validate
@echo "Dumping book commands..." @echo "Dumping book commands..."
$(Q)xsltproc --output $(DUMPDIR)/ \ $(Q)xsltproc --nonet \
stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml --output $(RENDERTMP)/lfs-html.xml \
--stringparam profile.revision sysv \
stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-full.xml
$(Q)rm -rf $(DUMPDIR)
$(Q)xsltproc --output $(DUMPDIR)/ \
stylesheets/dump-commands.xsl \
$(RENDERTMP)/lfs-html.xml
@echo "Dumping book commands complete in $(DUMPDIR)"
dump-commandsd: validated
@echo "Dumping book commands..."
$(Q)xsltproc --nonet \
--output $(RENDERTMP)/lfs-html.xml \
--stringparam profile.revision systemd \
stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-full.xml
$(Q)rm -rf $(DUMPDIR)
$(Q)xsltproc --output $(DUMPDIR)/ \
stylesheets/dump-commands.xsl \
$(RENDERTMP)/lfs-html.xml
@echo "Dumping book commands complete in $(DUMPDIR)"
all: lfs nochunks pdf dump-commands all: lfs nochunks pdf dump-commands
.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate .PHONY : all sysv systemd dump-commands lfs nochunks pdf profile-html tmpdir validate

2
chapter01/changelog.xml
View File

@ -18,8 +18,6 @@
<para>Below is a list of changes made since the previous release of the <para>Below is a list of changes made since the previous release of the
book.</para> book.</para>
<para revision="systemd">A test</para>
<itemizedlist> <itemizedlist>
<title>Changelog Entries:</title> <title>Changelog Entries:</title>

2
chapter03/packages.xml
View File

@ -373,7 +373,7 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry revision="sysv">
<term>LFS-Bootscripts (&lfs-bootscripts-version;) - <token>&lfs-bootscripts-size;</token>:</term> <term>LFS-Bootscripts (&lfs-bootscripts-version;) - <token>&lfs-bootscripts-size;</token>:</term>
<listitem> <listitem>
<para>Home page: <ulink url="&lfs-bootscripts-home;"/></para> <para>Home page: <ulink url="&lfs-bootscripts-home;"/></para>

5
stylesheets/wget-list.xsl
View File

@ -16,8 +16,9 @@
<!-- If some package don't have the predefined strings in their <!-- If some package don't have the predefined strings in their
name, the next test must be fixed to match it also. Skip possible name, the next test must be fixed to match it also. Skip possible
duplicated URLs due that may be splitted for PDF output --> duplicated URLs due that may be splitted for PDF output -->
<xsl:if test="(contains(@url, '.tar.') or contains(@url, '.tgz') <xsl:if test="(contains(@url, '.tar.') or
or contains(@url, '.patch')) and contains(@url, '.tgz') or
contains(@url, '.patch')) and
not(ancestor-or-self::*/@condition = 'pdf')"> not(ancestor-or-self::*/@condition = 'pdf')">
<xsl:choose> <xsl:choose>
<xsl:when test="contains(@url,'?download')"> <xsl:when test="contains(@url,'?download')">