Author: pfrields
Update of /cvs/docs/example-tutorial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32347
Modified Files: Makefile example-tutorial-de.xml Log Message: Update to use new entity standards
Index: Makefile =================================================================== RCS file: /cvs/docs/example-tutorial/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Makefile 1 Dec 2005 21:10:41 -0000 1.20 +++ Makefile 28 Dec 2005 00:43:25 -0000 1.21 @@ -18,10 +18,10 @@ DOCBASE = example-tutorial # DOCTITLE-en = Example Tutorial -XMLEXTRAFILES-en=article-info-en.xml +XMLEXTRAFILES-en= fdp-info-en.xml # DOCTITLE-de = Beispiel Tutorial -XMLEXTRAFILES-de= +XMLEXTRAFILES-de= fdp-info-de.xml # ###################################################### include ../docs-common/Makefile.common @@ -38,20 +38,15 @@
###################################################### # -article-info-en.xml:: rpm-info.xml - xsltproc --stringparam doctype articleinfo ../docs-common/packaging/bookinfo.xsl rpm-info.xml | ../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf > $@ - -clean:: - ${RM} bookinfo.xml ######################################################
###################################################### # Some packaging specific vars
# These are obviated by new standard -#VERSION=$(shell grep BOOKID $(DOCBASE)-en.xml | sed 's/<!ENTITY BOOKID "[^0-9.]+//' | sed 's/ .+//') -DATE=$(shell grep BOOKID $(DOCBASE)-en.xml | sed 's/.+(//' | sed 's/).+//') -VERSION=$(shell grep " BOOKVERSION" $(DOCBASE)-en.xml | sed 's/.+"([0-9.]+)".+/\1/' ) +#VERSION=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/<!ENTITY DOCID "[^0-9.]+//' | sed 's/ .+//') +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 @@ -64,13 +59,13 @@ ###################################################### # 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)" +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)" ######################################################
$(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 '$(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)*' ) \ @@ -87,10 +82,29 @@ ${RM} -rf $(DOCBASE)-$(VERSION)*.src.tar.gz ${RM} -rf BUILD/ $(DOCBASE)-$(VERSION)/ ${RM} -f *omf *desktop *spec.in + ${RM} -f fdp-info-*.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 > $@ +endef + +fdp-info.xml:: $(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
+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-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
define rpm_template -rpm-$(1):: clean $(DOCBASE)-$(VERSION).src.tar.gz +rpm-$(1):: clean $(DOCBASE)-$(1).src.tar.gz # depend on source tarball and lang-specific HTML tarball # Make RPM build tree; don't rely on local user's setup mkdir -p BUILD @@ -98,24 +112,26 @@ # 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@redhat.com - $(VERSION)-1\n- Update to version $(VERSION)\n/' \ - $(SPECIN) > $(DOCSPEC) +# sed 's/(%changelog)/\1\n* $(NOW) Fedora Docs Project fedora-docs-list@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) +# 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 --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
Index: example-tutorial-de.xml =================================================================== RCS file: /cvs/docs/example-tutorial/example-tutorial-de.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- example-tutorial-de.xml 24 Dec 2005 16:43:05 -0000 1.3 +++ example-tutorial-de.xml 28 Dec 2005 00:43:25 -0000 1.4 @@ -5,10 +5,10 @@ <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent"> %FEDORA-ENTITIES-EN;
-<!ENTITY BOOKNAME "example-tutorial"> -<!ENTITY BOOKVERSION "0.14"> <!-- change version here --> -<!ENTITY BOOKDATE "2005-09-18"> <!-- change revision date here --> -<!ENTITY BOOKID "&BOOKNAME;-&BOOKVERSION; (&BOOKDATE;)"> +<!ENTITY DOCNAME "example-tutorial"> +<!ENTITY DOCVERSION "0.14"> <!-- change version here --> +<!ENTITY DOCDATE "2005-09-18"> <!-- change revision date here --> +<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)"> <!ENTITY BUG-NUM "000000"> <!-- use this only while in draft stage -->
]>