Tuesday, 11 April
2006
Tue, 11 Apr
'06
3:07 p.m.
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv671
Modified Files:
Makefile.common
Log Message:
This parsing appears to be necessary to treat entities properly whether they are used in
XInclude snippets or the main document. I am not sure yet whether or not we are doing
something monumentally twisted here, but the fact that the tools support this kind of
usage makes me feel better. A little better, at least.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Makefile.common 11 Apr 2006 20:05:22 -0000 1.108
+++ Makefile.common 11 Apr 2006 20:07:44 -0000 1.109
@@ -382,7 +382,9 @@
.PHONY: html-${1}
html-$(1):: ${DOCBASE}-$(1)/index.html
${DOCBASE}-$(1)/index.html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
- LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(1)/$(DOCBASE).xml
+ LANG=$(1).UTF-8 ${XMLLINT} --noent --xinclude $(1)/$(DOCBASE).xml 2>/dev/null
>$(1)/$(DOCBASE).xml-parsed
+ LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1)
$(1)/$(DOCBASE).xml-parsed
+ ${RM} -f $(1)/$(DOCBASE).xml-parsed
mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
@@ -417,7 +419,9 @@
html-nochunks-$(1):: ${DOCBASE}-$(1).html
${DOCBASE}-$(1).html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
- LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml
+ LANG=$(1).UTF-8 ${XMLLINT} --noent --xinclude $(1)/$(DOCBASE).xml 2>/dev/null >
$(1)/$(DOCBASE).xml-parsed
+ LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml-parsed
+ ${RM} -f $(1)/$(DOCBASE).xml-parsed
mv $(DOCBASE).html $(DOCBASE)-$(1).html
mkdir -p stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
Show replies by date