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

Allow aux-file-data.sh to be run successfully from the command line, and rename validxml target to validate. Thanks to Pierre Labastie for the report.

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9762 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Matthew Burgess 2012-03-05 20:16:58 +00:00
parent 45eab11921
commit 924ab90abf
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -13,7 +13,7 @@ else
Q = @ Q = @
endif endif
lfs: maketar validxml profile-html lfs: validate profile-html
@echo "Generating chunked XHTML files..." @echo "Generating chunked XHTML files..."
$(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \ $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-stringparam rootid "$(ROOT_ID)" -stringparam base.dir $(BASEDIR)/ \ -stringparam rootid "$(ROOT_ID)" -stringparam base.dir $(BASEDIR)/ \
@ -41,7 +41,7 @@ lfs: maketar validxml profile-html
$(Q)$(MAKE) wget-list $(Q)$(MAKE) wget-list
pdf: validxml pdf: validate
@echo "Generating profiled XML for PDF..." @echo "Generating profiled XML for PDF..."
$(Q)xsltproc --nonet --stringparam profile.condition pdf \ $(Q)xsltproc --nonet --stringparam profile.condition pdf \
--output $(RENDERTMP)/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \ --output $(RENDERTMP)/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
@ -60,7 +60,7 @@ pdf: validxml
fi; fi;
$(Q)fop $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) $(Q)fop $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
nochunks: maketar validxml profile-html nochunks: validate profile-html
@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) \
@ -82,7 +82,7 @@ tmpdir:
$(Q)rm -f $(RENDERTMP)/lfs-{full,html,pdf}.xml $(Q)rm -f $(RENDERTMP)/lfs-{full,html,pdf}.xml
$(Q)rm -f $(RENDERTMP)/lfs-pdf.fo $(Q)rm -f $(RENDERTMP)/lfs-pdf.fo
validxml: 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..."
@ -90,14 +90,9 @@ validxml: tmpdir
-o $(RENDERTMP)/lfs-full.xml index.xml -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."
maketar: profile-html: validate
$(Q)if [ "x$(MAKETAR)" == "x" ]; then \
echo "Making tarballs..."; \
sh make-aux-files.sh; \
fi;
profile-html: validxml
@echo "Generating profiled XML for XHTML..." @echo "Generating profiled XML for XHTML..."
$(Q)xsltproc --nonet --stringparam profile.condition html \ $(Q)xsltproc --nonet --stringparam profile.condition html \
--output $(RENDERTMP)/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \ --output $(RENDERTMP)/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
@ -120,15 +115,13 @@ md5sums:
$(BASEDIR)/md5sums $(BASEDIR)/md5sums
dump-commands: validxml dump-commands: validate
@echo "Dumping book commands..." @echo "Dumping book commands..."
$(Q)xsltproc --output $(DUMPDIR)/ \ $(Q)xsltproc --output $(DUMPDIR)/ \
stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
validate: maketar validxml
@echo "Validation complete."
all: lfs nochunks pdf dump-commands md5sums all: lfs nochunks pdf dump-commands md5sums
.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate \ .PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate \
validxml wget-list maketar md5sums validate wget-list maketar md5sums

2
aux-file-data.sh
View File

@ -7,6 +7,8 @@ fi
FILE=$1 FILE=$1
./make-aux-files.sh
# Bootscript data # Bootscript data
bootscripts=$(ls lfs-bootscripts*.bz2) bootscripts=$(ls lfs-bootscripts*.bz2)
base=$(basename $bootscripts .tar.bz2) base=$(basename $bootscripts .tar.bz2)