example-tutorial Makefile, 1.21, 1.22 example-tutorial-de.xml, 1.4, 1.5 example-tutorial-en.xml, 1.18, 1.19
Paul W. Frields (pfrields)
fedora-docs-commits at redhat.com
Wed Dec 28 22:19:13 UTC 2005
Author: pfrields
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10466
Modified Files:
Makefile example-tutorial-de.xml example-tutorial-en.xml
Log Message:
Current state of the world, the light at the end of the tunnel is an oncoming train
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile 28 Dec 2005 00:43:25 -0000 1.21
+++ Makefile 28 Dec 2005 22:19:04 -0000 1.22
@@ -48,100 +48,85 @@
DATE=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/.\+(//' | sed 's/).\+//')
VERSION=$(shell grep " DOCVERSION" $(DOCBASE)-en.xml | sed 's/.\+"\([0-9\.]\+\)".\+/\1/' )
NOW=$(shell date +"%a %b %e %Y")
-SPECIN=../docs-common/packaging/fedora-doc.spec.in.common
-OMFIN=../docs-common/packaging/fedora-doc.omf.in.common
-DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common
-DOCSPEC=$(PWD)/$(DOCBASE).spec.in
-DOCOMF=$(PWD)/fedora-doc-$(DOCBASE)-C.omf
-DOCDESKTOP=$(PWD)/fedora-doc-$(DOCBASE).desktop
-DOCSRCTAR=$(PWD)/$(DOCBASE)-$(VERSION).src.tar.gz
-TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//')
+#SPECIN=../docs-common/packaging/fedora-doc.spec.in.common
+#OMFIN=../docs-common/packaging/fedora-doc.omf.in.common
+#DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common
+#DOCSPEC=$(PWD)/$(DOCBASE).spec.in
+#DOCOMF=$(PWD)/fedora-doc-$(DOCBASE)-C.omf
+#DOCDESKTOP=$(PWD)/fedora-doc-$(DOCBASE).desktop
+#DOCSRCTAR=$(PWD)/$(DOCBASE)-$(VERSION).src.tar.gz
+#TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//')
######################################################
# Some RPM flags...
######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "lang $(1)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-$(1)-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)" --define "lang $(LANG)"
+RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)"
######################################################
-$(DOCBASE)-$(VERSION).src.tar.gz:: tarball
- mkdir $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \
- -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \
- | cpio -pamdv $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
- -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
- | cpio -pamdv $(DOCBASE)-$(VERSION)
- ( cd $(DOCBASE)-$(VERSION) ; tar xzf ../$(DOCBASE)-$(VERSION).tar.gz )
- pwd
- tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
- rm -rf $(DOCBASE)-$(VERSION)/
-
-#$(DOCBASE)-$(1)-clean::
clean::
${RM} -rf fedora-doc-$(DOCBASE)*.rpm
${RM} -rf $(DOCBASE)-$(VERSION)*.src.tar.gz
${RM} -rf BUILD/ $(DOCBASE)-$(VERSION)/
- ${RM} -f *omf *desktop *spec.in
+ ${RM} -f *omf *desktop *spec
${RM} -f fdp-info-*.xml
+ sed -i 's@^\( *[^<]*&FDP-INFO;.*\)@\<!-- \1 - DO NOT REMOVE THIS COMMENT --\>@g' $(DOCBASE)-*.xml
+
define fdp-info_template
-fdp-info-$(1).xml:: rpm-info.xml
- xsltproc --stringparam doctype $(shell xsltproc ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > $@
+fdp-info-$(1).xml::
+ ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC} ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) --stringparam lang $(1) ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > fdp-info-$(1).xml
+ sed -i 's@<!-- .*&FDP-INFO;.* -->@\&FDP-INFO;@g' $(DOCBASE)-$(1).xml
endef
-fdp-info.xml:: $(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
+fdp-info:: $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml)
+
+$(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
+
+
+spec::
+ $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > \
+ fedora-doc-$(DOCBASE).spec
+
+
+gnome.desktop::
+ $(XSLTPROC) ../docs-common/packaging/gnome-desktop.xsl rpm-info.xml > \
+ fedora-doc-$(DOCBASE)-gnome.desktop
-spec:: rpm-info.xml
- $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > ${DOCBASE}.spec
-gnome-desktop-file:: rpm-info.xml
- $(XSLTPROC) ../docs-common/packaging/gnome-desktop.xsl rpm-info.xml > ${DOCBASE}-gnome.desktop
+kde.desktop::
+ $(XSLTPROC) ../docs-common/packaging/kde-desktop.xsl rpm-info.xml > \
+ fedora-doc-$(DOCBASE)-kde.desktop
-kde-desktop-file:: rpm-info.xml
- $(XSLTPROC) ../docs-common/packaging/kde-desktop.xsl rpm-info.xml > ${DOCBASE}-kde.desktop
-khelpcenter-file:: rpm-info.xml
- $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > ${DOCBASE}-khelpcenter.desktop
+khelp.desktop::
+ $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > \
+ fedora-doc-$(DOCBASE)-khelp.desktop
-define rpm_template
-rpm-$(1):: clean $(DOCBASE)-$(1).src.tar.gz
+
+
+$(DOCBASE)-$(VERSION).src.tar.gz:: fdp-info
+ mkdir $(DOCBASE)-$(VERSION)
+ find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \
+ -o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \
+ | cpio -pamdv $(DOCBASE)-$(VERSION)
+ find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
+ -o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
+ | cpio -pamdv $(DOCBASE)-$(VERSION)
+# ( cd $(DOCBASE)-$(VERSION) ; tar xzf ../$(DOCBASE)-*.tar.gz )
+# pwd
+ tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
+ rm -rf $(DOCBASE)-$(VERSION)/
+
+
+rpm:: clean $(DOCBASE)-$(VERSION).src.tar.gz spec gnome.desktop kde.desktop khelp.desktop
# depend on source tarball and lang-specific HTML tarball
# Make RPM build tree; don't rely on local user's setup
mkdir -p BUILD
-#
-# Make rpmlint happy with a changelog entry
-# FIXME: Maybe more magic would make this stickier; pity
-# I'm no magician...
-# sed 's/\(%changelog\)/\1\n* $(NOW) Fedora Docs Project <fedora-docs-list at redhat.com> - $(VERSION)-1\n- Update to version $(VERSION)\n/' \
-# $(SPECIN) > $(DOCSPEC)
-
-#
-# Fill in files
-# FIXME: Needs to be multiplexed for LANGUAGES (see above)
-# cp $(OMFIN) $(DOCOMF)
-# cp $(DESKTOPIN) $(DOCDESKTOP)
-# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCOMF)
-# sed -i 's/@DATE@/$(DATE)/g' $(DOCOMF)
-# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCOMF)
-# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCOMF)
-# sed -i 's/@VERSION@/$(VERSION)/g' $(DOCDESKTOP)
-# sed -i 's/@DATE@/$(DATE)/g' $(DOCDESKTOP)
-# sed -i 's/@TITLE@/$(TITLE)/g' $(DOCDESKTOP)
-# sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCDESKTOP)
-#
-# Do the build...
-#
-
- rpmbuild -bb $(RPMFLAGS) \
- $(DOCSPEC)
+ rpmbuild -bb $(RPMFLAGS) fedora-doc-$(DOCBASE).spec
rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
# rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS}
# rm -rf $(DOCBASE)-$(VERSION)
-endef
-
-rpm:: $(foreach LANG,$(LANGUAGES),rpm-$(LANG))
-$(foreach LANG,${LANGUAGES},$(eval $(call rpm_template,${LANG})))
showvars::
@echo "VERSION=$(VERSION)"
Index: example-tutorial-de.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/example-tutorial-de.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- example-tutorial-de.xml 28 Dec 2005 00:43:25 -0000 1.4
+++ example-tutorial-de.xml 28 Dec 2005 22:19:04 -0000 1.5
@@ -11,6 +11,7 @@
<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY BUG-NUM "000000"> <!-- use this only while in draft stage -->
+<!ENTITY FDP-INFO SYSTEM "fdp-info-de.xml">
]>
<!-- This file is just a copy of the English version, only here for testing -->
@@ -19,38 +20,8 @@
<article id="example-tutorial" lang="de">
- <articleinfo>
- <title>Beispieltutorial</title>
- <copyright>
- <year>2003, 2005</year>
- <holder>&FORMAL-RHI;</holder>
- <holder>Tammy Fox</holder>
- </copyright>
- <authorgroup>
- <author>
- <surname>Fox</surname>
- <firstname>Tammy</firstname>
- </author>
- <editor>
- <surname>Frields</surname>
- <firstname>Paul</firstname>
- <othername role="mi">W.</othername>
- </editor>
- </authorgroup>
- &LEGALNOTICE;
- <revhistory>
- <revision>
- <revnumber>0.13</revnumber>
- <date>2005-09-18</date>
- <authorinitials>PaulWFrields</authorinitials>
- <revdescription>
- <para>
- Add revision history.
- </para>
- </revdescription>
- </revision>
- </revhistory>
- </articleinfo>
+
+<!-- &FDP-INFO; - DO NOT REMOVE THIS COMMENT -->
<section id="sn-some-section">
<title>Some Section</title>
@@ -61,7 +32,7 @@
<para>
This is an example section. You should not use sect1, sect2, etc., since
- those tags will make sections less modular — that is, harder to
+ those tags will make sections less modular, i.e., harder to
relocate without changing a lot of other markup.
</para>
<para>
Index: example-tutorial-en.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/example-tutorial-en.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- example-tutorial-en.xml 26 Dec 2005 17:21:55 -0000 1.18
+++ example-tutorial-en.xml 28 Dec 2005 22:19:04 -0000 1.19
@@ -12,13 +12,13 @@
<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY BUG-NUM "000000"> <!-- use this only while in draft stage -->
-<!ENTITY ARTICLE-INFO-EN SYSTEM "article-info-en.xml" >
+<!ENTITY FDP-INFO SYSTEM "fdp-info-en.xml" >
]>
<article id="example-tutorial" lang="en">
- &ARTICLE-INFO-EN;
+<!-- &FDP-INFO; - DO NOT REMOVE THIS COMMENT -->
<section id="sn-some-section">
<title>Some Section</title>
@@ -27,7 +27,7 @@
</indexterm>
<para>
This is an example section. You should not use sect1, sect2, etc.,
- since those tags will make sections less modular — that is,
+ since those tags will make sections less modular, i.e.,
harder to relocate without changing a lot of other markup.
</para>
More information about the Fedora-docs-commits
mailing list