docs-common Makefile.common,1.26,1.27
Tommy Reynolds (jtr)
fedora-docs-commits at redhat.com
Thu Jan 12 18:18:26 UTC 2006
- Previous message (by thread): release-notes Colophon-pa.xml, NONE, 1.1 Entertainment-pa.xml, NONE, 1.1 FileServers-pa.xml, NONE, 1.1 I18n-pa.xml, NONE, 1.1 Installer-pa.xml, NONE, 1.1 Introduction-pa.xml, NONE, 1.1 Multimedia-pa.xml, NONE, 1.1 PackageChanges-pa.xml, NONE, 1.1 PackageNotes-pa.xml, NONE, 1.1 README-pa.xml, NONE, 1.1 RELEASE-pa.xml, NONE, 1.1 ServerTools-pa.xml, NONE, 1.1 WebServers-pa.xml, NONE, 1.1 Desktop-pa.xml, 1.1, 1.2 Welcome-pa.xml, 1.1, 1.2
- Next message (by thread): release-notes PackageNotes-en.xml,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27837
Modified Files:
Makefile.common
Log Message:
Remove in-place sed(1) edit when generating fdp-info-${LANG}.xml
file.
Added "rpm-info.xml" dependancies to force production of said file.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.common 7 Jan 2006 03:33:20 -0000 1.26
+++ Makefile.common 12 Jan 2006 18:18:18 -0000 1.27
@@ -58,12 +58,17 @@
XMLTO =xmlto
# Let's also do this for xsltproc(1).
XSLTPROC=xsltproc
+XMLFORMAT=$(FDPDIR)/docs-common/bin/xmlformat
+XMLFOPTS=-f $(FDPDIR)/docs-common/bin/xmlformat-fdp.conf
#########################################################################
# PUT NO TARGETS BEFORE THIS ONE, not even in your base Makefile
# In a properly-constructed Makefile, this will be the default target
-TARGETS=all tarball pdf html html-nochunks clean distclean showvars
+TARGETS=all tarball pdf html html-nochunks clean distclean showvars fdp-info
.PHONY: ${TARGETS}
+.PHONY: $(foreach LANG,${LANGUAGES},html-${LANG})
+.PHONY: $(foreach LANG,${LANGUAGES},html-nochunks-${LANG})
+.PHONY: $(foreach LANG,${LANGUAGES},pdf-${LANG})
all:: html html-nochunks tarball # pdf
@@ -82,7 +87,7 @@
# but we do avoid copying EPS files since they are nonsense to the HTML world.
#
define HTML_template
-html-$(1) ${DOCBASE}-$(1)/index.html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1))
+html-$(1) ${DOCBASE}-$(1)/index.html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) fdp-info-$(1).xml
LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(DOCBASE)-$(1).xml
mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
@@ -93,14 +98,15 @@
-l ${LANG} figs $(DOCBASE)-$(1)
endef
#
-html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG)/index.html)
-
$(foreach LANG,${LANGUAGES},$(eval $(call HTML_template,${LANG})))
+
+html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-${LANG}/index.html)
+html:: $(foreach LANG,${LANGUAGES},html-${LANG})
#
#########################################################################
# For each language in ${LANGUAGES}, generate a single HTML file
define HTMLNOCHUNK_template
-${DOCBASE}-$(1).html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1))
+html-nochunks-$(1) ${DOCBASE}-$(1).html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) fdp-info-$(1).xml
${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(DOCBASE)-$(1).xml
mkdir -p stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
@@ -109,9 +115,10 @@
cp ${HTMLCSSEXTRA} watermark.png
endef
#
-html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html)
-
$(foreach LANG,${LANGUAGES},$(eval $(call HTMLNOCHUNK_template,${LANG})))
+
+html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html)
+html-nochunks:: $(foreach LANG,${LANGUAGES},html-nochunks-$(LANG))
#
#########################################################################
# For each language in ${LANGUAGES}, build a tarball of the HTML files.
@@ -129,29 +136,40 @@
# For each language in ${LANGUAGES}, generate an Adobe Portable Document
# Format (PDF) file.
define PDF_template
-${DOCBASE}-$(1).pdf:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1))
+pdf-$(1) ${DOCBASE}-$(1).pdf:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1))
${XMLTO} pdf -x $(XSLPDF) $(DOCBASE)-$(1).xml
endef
#
-pdf:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).pdf)
-
$(foreach LANG,${LANGUAGES},$(eval $(call PDF_template,${LANG})))
+
+pdf:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).pdf)
+pdf:: $(foreach LANG,${LANGUAGES},pdf-$(LANG).pdf)
#
#########################################################################
# For each language in ${LANGUAGES}, clean up!
define CLEAN_template
${DOCBASE}-$(1)-clean::
+ ${RM} fdp-info-$(1).xml
+ ${RM} fedora.css watermark-${LANG}.png watermark.png
+endef
+#
+$(foreach LANG,${LANGUAGES},$(eval $(call CLEAN_template,${LANG})))
+#
+clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean)
+#########################################################################
+define DISTCLEAN_template
+${DOCBASE}-$(1)-distclean:: ${DOCBASE}-$(1)-clean
${RM} -r ${DOCBASE}-$(1)
${RM} -r ${DOCBASE}-$(1).html stylesheet-images
${RM} -r ${DOCBASE}-$(1).pdf
${RM} -r ${DOCBASE}-$(1).tar.gz
- ${RM} fedora.css watermark-${LANG}.png watermark.png
endef
#
-distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean)
-
-$(foreach LANG,${LANGUAGES},$(eval $(call CLEAN_template,${LANG})))
-
+$(foreach LANG,${LANGUAGES},$(eval $(call DISTCLEAN_template,${LANG})))
+#
+distclean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-distclean)
+#########################################################################
+#
showvars::
@echo "DOCBASE=\"$(DOCBASE)\""
@echo "LANGUAGES=\"$(LANGUAGES)\""
@@ -170,5 +188,25 @@
${FDPBIN}/xmldiff ${DIFFS} ${OLD} ${NEW}
#
#########################################################################
+# The "fdp-info-${LANG}.xml" file contains the <articleinfo> or
+# <bookinfo> stanza. It is automatically generated from data in the
+# "rpm-info.xml" file.
+#
+define fdp-info_template
+fdp-info-$(1).xml:: rpm-info.xml
+ ${XSLTPROC} --stringparam lang $(1) \
+ --stringparam doctype $(shell \
+ ${FDPDIR}/docs-common/packaging/doctype \
+ $(DOCBASE)-$(1).xml \
+ ) ${FDPDIR}/docs-common/packaging/bookinfo.xsl \
+ rpm-info.xml | \
+ $(XMLFORMAT) $(XMLFOPTS) > fdp-info-$(1).xml
+endef
+#
+$(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
+#
+fdp-info:: $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml)
+#
+#########################################################################
# End of Makefile.common
#########################################################################
- Previous message (by thread): release-notes Colophon-pa.xml, NONE, 1.1 Entertainment-pa.xml, NONE, 1.1 FileServers-pa.xml, NONE, 1.1 I18n-pa.xml, NONE, 1.1 Installer-pa.xml, NONE, 1.1 Introduction-pa.xml, NONE, 1.1 Multimedia-pa.xml, NONE, 1.1 PackageChanges-pa.xml, NONE, 1.1 PackageNotes-pa.xml, NONE, 1.1 README-pa.xml, NONE, 1.1 RELEASE-pa.xml, NONE, 1.1 ServerTools-pa.xml, NONE, 1.1 WebServers-pa.xml, NONE, 1.1 Desktop-pa.xml, 1.1, 1.2 Welcome-pa.xml, 1.1, 1.2
- Next message (by thread): release-notes PackageNotes-en.xml,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-docs-commits
mailing list