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

Added a versose flag and other fixes to the Makefile.

Browse Source 
Changed obfuscate.sh to try to prevent hangs when parsing nonchunked output.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8203 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Manuel Canales Esparcia 2007-07-06 17:54:18 +00:00
parent 0e6d3c0b45
commit 05d60cedcd
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Makefile
View File

@ -5,85 +5,92 @@ ROOT_ID=""
PDF_OUTPUT=LFS-BOOK.pdf PDF_OUTPUT=LFS-BOOK.pdf
NOCHUNKS_OUTPUT=LFS-BOOK.html NOCHUNKS_OUTPUT=LFS-BOOK.html
ifdef V
Q =
else
Q = @
endif
lfs: validxml profile-html lfs: validxml profile-html
@echo "Generating chunked XHTML files..." @echo "Generating chunked XHTML files..."
@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)/ \
stylesheets/lfs-chunked.xsl /tmp/lfs-html.xml stylesheets/lfs-chunked.xsl /tmp/lfs-html.xml
@echo "Copying CSS code and images..." @echo "Copying CSS code and images..."
@if [ ! -e $(BASEDIR)/stylesheets ]; then \ $(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \
mkdir -p $(BASEDIR)/stylesheets; \ mkdir -p $(BASEDIR)/stylesheets; \
fi; fi;
@cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
@if [ ! -e $(BASEDIR)/images ]; then \ $(Q)if [ ! -e $(BASEDIR)/images ]; then \
mkdir -p $(BASEDIR)/images; \ mkdir -p $(BASEDIR)/images; \
fi; fi;
@cp images/*.png $(BASEDIR)/images $(Q)cp images/*.png $(BASEDIR)/images
@cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html $(Q)cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
@cd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html $(Q)cd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html
@echo "Running Tidy..." @echo "Running Tidy and obfuscate.sh..."
@for filename in `find $(BASEDIR) -name "*.html"`; do \ $(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
tidy -config tidy.conf $$filename; \ tidy -config tidy.conf $$filename; \
true; \ true; \
sh obfuscate.sh $$filename; \ sh obfuscate.sh $$filename; \
sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \ sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
done; done;
@$(MAKE) wget-list $(Q)$(MAKE) wget-list
pdf: validxml pdf: validxml
@echo "Generating profiled XML for PDF..." @echo "Generating profiled XML for PDF..."
@xsltproc --nonet --stringparam profile.condition pdf \ $(Q)xsltproc --nonet --stringparam profile.condition pdf \
--output /tmp/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \ --output /tmp/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
/tmp/lfs-full.xml /tmp/lfs-full.xml
@echo "Generating FO file..." @echo "Generating FO file..."
@xsltproc --nonet -stringparam rootid $(ROOT_ID) \ $(Q)xsltproc --nonet -stringparam rootid $(ROOT_ID) \
--output /tmp//lfs-pdf.fo stylesheets/lfs-pdf.xsl /tmp/lfs-pdf.xml --output /tmp//lfs-pdf.fo stylesheets/lfs-pdf.xsl /tmp/lfs-pdf.xml
@sed -i -e 's/span="inherit"/span="all"/' /tmp/lfs-pdf.fo $(Q)sed -i -e 's/span="inherit"/span="all"/' /tmp/lfs-pdf.fo
@echo "Generating PDF file..." @echo "Generating PDF file..."
@fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) $(Q)fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
nochunks: validxml profile-html nochunks: validxml profile-html
@echo "Generating non chunked XHTML file..." @echo "Generating non chunked XHTML file..."
@xsltproc --nonet -stringparam profile.condition html \ $(Q)xsltproc --nonet -stringparam profile.condition html \
-stringparam rootid $(ROOT_ID) --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \ -stringparam rootid $(ROOT_ID) --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
stylesheets/lfs-nochunks.xsl /tmp/lfs-html.xml stylesheets/lfs-nochunks.xsl /tmp/lfs-html.xml
@echo "Running Tidy..." @echo "Running Tidy..."
@tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT) @echo "Running obfuscate.sh..."
@sed -i -e "s@text/html@application/xhtml+xml@g" \ $(Q)sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@text/html@application/xhtml+xml@g" \
$(BASEDIR)/$(NOCHUNKS_OUTPUT) $(BASEDIR)/$(NOCHUNKS_OUTPUT)
validxml: validxml:
@echo "Validating the book..." @echo "Validating the book..."
@xmllint --nonet --noent --xinclude --postvalid \ $(Q)xmllint --nonet --noent --xinclude --postvalid \
-o /tmp/lfs-full.xml index.xml -o /tmp/lfs-full.xml index.xml
profile-html: validxml profile-html: validxml
@echo "Generating profiled XML for XHTML..." @echo "Generating profiled XML for XHTML..."
@xsltproc --nonet --stringparam profile.condition html \ $(Q)xsltproc --nonet --stringparam profile.condition html \
--output /tmp/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \ --output /tmp/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
/tmp/lfs-full.xml /tmp/lfs-full.xml
wget-list: wget-list:
@echo "Generating wget list..." @echo "Generating wget list..."
@mkdir -p $(BASEDIR) $(Q)mkdir -p $(BASEDIR)
@xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \ $(Q)xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
stylesheets/wget-list.xsl chapter03/chapter03.xml stylesheets/wget-list.xsl chapter03/chapter03.xml
dump-commands: dump-commands: validxml
@echo "Dumping book commands..." @echo "Dumping book commands..."
@xsltproc --xinclude --nonet --output $(DUMPDIR)/ \ $(Q)xsltproc --output $(DUMPDIR)/ \
stylesheets/dump-commands.xsl index.xml stylesheets/dump-commands.xsl /tmp/lfs-full.xml
validate: validate:
@echo "Validating the book..." @echo "Validating the book..."
@xmllint --noout --nonet --xinclude --postvalid index.xml $(Q)xmllint --noout --nonet --xinclude --postvalid index.xml
all: lfs nochunks pdf dump-commands all: lfs nochunks pdf dump-commands

12
obfuscate.sh
View File

@ -3,6 +3,8 @@
# obfuscate.sh # obfuscate.sh
# obfuscate email addresses in XML/HTML # obfuscate email addresses in XML/HTML
# Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org> # Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org>
# Modified from "sed -i" to old style "sed -e" by Manuel Canales <manuel AT linuxfromscratch D0T org>
# to prevent hangs on very long files, like nonckunked books.
# Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org> # Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org>
# Released under the GNU General Public License # Released under the GNU General Public License
# #
@ -25,11 +27,13 @@
# Nothing like a backup plan! # Nothing like a backup plan!
#cp "$1" "$1".bak #cp "$1" "$1".bak
for i in `grep -o '"mailto:.*@.*"' "$1" |sed -e 's|^"mailto:||' -e 's|"$||'`; do for i in `grep -o '"mailto:.*@.*"' ${1} |sed -e 's|^"mailto:||' -e 's|"$||'`; do
link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'` link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'` plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
sed -i "s|mailto:$i|mailto:$link|" "$1" cp ${1}{,.tmp}
sed -i "s|$i|$plaintext|" "$1" sed -e "s|mailto:$i|mailto:$link|" \
-e "s|$i|$plaintext|" ${1}.tmp > ${1}
rm ${1}.tmp
done done
#rm $FILE.tmp
#exit 0 #exit 0