release-notes/devel Makefile,1.45,1.46

Author: pfrields

Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23975

Modified Files:
	Makefile 
Log Message:
Remove unnecessary sections of Makefile now replicated in new modules


Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile	8 Oct 2006 21:29:38 -0000	1.45
+++ Makefile	27 Jan 2007 22:10:35 -0000	1.46
@@ -52,11 +52,7 @@
 			${1}/Virtualization.xml			\
 			${1}/WebServers.xml			\
 			${1}/Welcome.xml			\
-			${1}/Xorg.xml				\
-			${1}/about-fedora.xml			\
-			${1}/README.xml				\
-			${1}/README-BURNING-ISOS.xml		\
-			${1}/homepage.xml
+			${1}/Xorg.xml
 
 endef
 
@@ -76,190 +72,6 @@
 ########################################################################
 
 
-###########
-#
-# Get or build OMF.
-# 
-# If the per-doc Makefile provides a ${OMFINFILES} list, we use those.
-# If it does not, and ${BUILDOMF} is defined, make one using XSLT and
-# rpm-info data.
-#
-# The template OMF files are expected to use @VARNAME@ notation to
-# allow replacement of their content dynamically at build time.  They
-# should retain this notation during PO/POT conversion so that
-# translators never have to worry about that content.  Substitution
-# only occurs during the packaging process.
-#
-
-# FIXME: There may not be a need to have the ${PRI_LANG} prefixing
-# each entry in ${OMFINFILES}.  Might be a good idea to take that out.
-
-# if OMFINFILES is empty, try and get the file list.
-# If it's still empty, and BUILDOMF is set, use that to populate the list.
-# Otherwise it stays empty.  After all, we may not want them at all.
-
-ifeq "${OMFINFILES}" ""
-OMFINFILES=$(foreach F,$(wildcard ${PRI_LANG}/*.omf.in),$(shell basename ${F}))
-ifeq "${OMFINFILES}" ""
-ifdef BUILDOMF
-OMFINFILES=${PKGNAME}.omf.in
-${PRI_LANG}/${PKGNAME}.omf.in:: ${PRI_LANG}/${RPMINFO}
-	${XSLTPROC} --stringparam lang ${PRI_LANG}		\
-		--stringparam docbase ${PKGNAME}		\
-		${FDPDIR}/docs-common/packaging/omf-in.xsl 	\
-		$< > $@
-endif
-endif
-endif
-
-showvars::
-	@echo "OMFINFILES=\"${OMFINFILES}\""
-
-define OMFVAR_template
-$(foreach F,${OMFINFILES},$(eval OMFINFILES-${1}+=${1}/${F}))
-$(foreach F,${OMFINFILES},$(eval OMFFILES-${1}+=$(patsubst %.in,${1}/%,${F})))
-$(foreach F,${OMFINFILES},$(eval PKGOMFFILES-${1}+=$(patsubst \
-	%.omf.in,$(if $(findstring ${PRI_LANG},${1}),%-C.omf,%-${1}.omf), \
-	${F})))
-showvars-debug::
-	@echo "PKGOMFFILES-${1}=\"${PKGOMFFILES-${1}}\""
-	@echo "OMFFILES-${1}=\"${PKGOMFFILES-${1}}\""
-endef
-
-$(foreach L,${LANGUAGES},$(eval $(call OMFVAR_template,${L})))
-
-define OMFIN_template
-.PHONY: omf-in-${1}
-omf-in-${1}:: ${OMFINFILES-${1}}
-# Treat .omf.in files just like XML... since they are!
-$(foreach F,${OMFINFILES},$(eval $(call XML_template,${1},${PRI_LANG}/${F})))
-
-clean::
-	${RM} ${OMFINFILES-${1}}
-
-help::
-	@printf ${TFMT} 'omf-in-${1}' 'Make OMF input file for ${1}'
-
-endef
-
-$(foreach L,${OTHERS},$(eval $(call OMFIN_template,${L})))
-
-.PHONY: omf-in
-omf-in:: $(foreach L,${LANGUAGES},${OMFINFILES-${L}})
-
-help::
-	@printf ${TFMT} 'omf-in' 'Make all OMF input files'
-
-
-# To make the real OMF, just do a quick bit of sed processing.
-# The spacing in the second command is purposeful to ensure no extra
-# space appears in the sed command.
-#
-# Note the difference between @LANG@ and @LANGC@: the former is always
-# replaced by the locale name, whereas the latter is replaced by the
-# locale name *unless* the locale is en_US, in which case is is replaced
-# by "C", the fallback.
-%.omf:	%.omf.in
-	sed -e 's!@RELEASE@!${VERSION}!g' $< > $@
-	sed -i 's!@DATE@!${REVDATE}!g' $@
-	sed -i 's!@LANG@!$(patsubst %/$(shell basename $<),%,$<)!g' $@
-	sed -i 's!@LANGC@!$(if $(findstring en_US,$(patsubst 		\
-		%/$(shell basename $<),%,$<)),C,$(patsubst 		\
-		%/$(shell basename $<),%,$<))!g' $@
-
-
-define OMF_template
-.PHONY: omf-${1}
-omf-${1}:: ${OMFFILES-${1}}
-
-clean::
-	${RM} ${OMFFILES-${1}}
-
-help::
-	@printf ${TFMT} 'omf-${1}' 'Make all OMF files for ${1} locale'
-
-endef
-
-$(foreach L,${LANGUAGES},$(eval $(call OMF_template,${L})))
-
-.PHONY: omf
-omf:: $(foreach L,${LANGUAGES},${OMFFILES-${L}})
-help::
-	@printf ${TFMT} 'omf' 'Make all OMF files for all locales'
-
-
-
-define HACK_HTML_template
-.PHONY: homepage-${1}
-$(eval HOMEPAGEDIR=homepage)
-$(eval HTMLEXTRAFILES-${1}=${HOMEPAGEDIR}/index-${1}.html)
-$(eval HOMEPAGE_CSS=${HOMEPAGEDIR}/homepage.css)
-$(eval HOMEPAGE_XSL=${HOMEPAGEDIR}/homepage.xsl)
-
-homepage-${1}:: ${HOMEPAGEDIR}/index-${1}.html
-
-${HOMEPAGEDIR}/index-${1}.html:: ${1}/homepage.xml ${XMLDEPFILES-${1}}
-# Can we get away with just the above?  Let's see...
-	LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -m ${HOMEPAGE_XSL} $(1)/homepage.xml
-	move-if-change index.html ${HOMEPAGEDIR}/index-${1}.html
-	mkdir -p stylesheet-images/
-	cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images
-
-clean::
-	rm -rf ${HOMEPAGEDIR}/index-${1}.html stylesheet-images/
-
-endef
-$(foreach L,${LANGUAGES},$(eval $(call HACK_HTML_template,${L})))
-
-
-define HACK_TXT_template
-.PHONY: readme-${1} readme-isoburn-${1}
-$(eval TXTEXTRAFILES-${1}=README-${1}.txt README-BURNING-ISOS-${1}.txt)
-
-readme-${1}:: README-${1}.txt
-
-README-${1}.txt:: ${1}/README.xml
-	LANG=${1}.UTF-8 ${XMLLINT} ${XMLLINTOPT} ${1}/README.xml	\
-		> ${1}/README.lint.xml
-	LANG=${1}.UTF-8 ${XSLTPROC}					\
-		${FDPDIR}/docs-common/packaging/strip-for-txt.xsl	\
-		${1}/README.lint.xml > ${1}/README.stripped.xml &&	\
-		${RM} -f ${1}/README.lint.xml
-	LANG=${1}.UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt 		\
-		${1}/README.stripped.xml &&				\
-		move-if-change README.stripped.txt README-${1}.txt
-
-readme-isoburn-${1}:: README-BURNING-ISOS-${1}.txt
-
-README-BURNING-ISOS-${1}.txt:: ${1}/README-BURNING-ISOS.xml
-	LANG=${1}.UTF-8 ${XMLLINT} ${XMLLINTOPT} ${1}/README-BURNING-ISOS.xml \
-		> ${1}/README-BURNING-ISOS.lint.xml
-	LANG=${1}.UTF-8 ${XSLTPROC}					\
-		${FDPDIR}/docs-common/packaging/strip-for-txt.xsl	\
-		${1}/README-BURNING-ISOS.lint.xml > 			\
-		${1}/README-BURNING-ISOS.stripped.xml &&		\
-		${RM} -f ${1}/README-BURNING-ISOS.lint.xml
-	LANG=${1}.UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt 		\
-		${1}/README-BURNING-ISOS.stripped.xml &&		\
-		move-if-change README-BURNING-ISOS.stripped.txt 	\
-		README-BURNING-ISOS-${1}.txt
-
-clean::
-	${RM} -f ${TXTEXTRAFILES-${1}}
-	${RM} -f ${1}/README.stripped.xml ${1}/README-BURNING-ISOS.stripped.xml
-
-txt-${1} text-${1}:: ${TXTEXTRAFILES-${1}}
-
-showvars::
-	@echo "TXTEXTRAFILES-${1}=\"${TXTEXTRAFILES-${1}}\""
-
-endef
-
-$(foreach L,${LANGUAGES},$(eval $(call HACK_TXT_template,${L})))
-
-.PHONY: readme
-readme:: $(foreach L,${LANGUAGES},${TXTEXTRAFILES-${L}})
-
 
 ######### 
 # 
@@ -270,46 +82,6 @@
 # 
 #########
 
-
-#define PKGOMFFILES_template
-#ifeq "${1}" "${PRI_LANG}"
-#PKGOMFFILES-${1}=$(patsubst %.omf,%-C.omf,${OMFFILES-${1}})
-#else
-#PKGOMFFILES-${1}=$(patsubst %.omf,%-${1}.omf,${OMFFILES-${1}})
-#endif
-#showvars::
-#	@echo "PKGOMFFILES-${1}=${PKGOMFFILES-${1}}"
-#endef
-
-$(foreach L,${LANGUAGES},$(eval $(call PKGOMFFILES_template,${L})))
-
-define PKGOMF_DOC_template
-.PHONY: pkgomf-${1}-${2}
-ifeq "${2}" "${PRI_LANG}"
-pkgomf-${1}-${2}:: ${PKGNAME}-${VERSION}/${1}-C.omf
-${PKGNAME}-${VERSION}/${1}-C.omf:: ${2}/${1}.omf
-	mkdir -p ${PKGNAME}-${VERSION}
-	cp ${2}/${1}.omf $$@
-else
-pkgomf-${1}-${2}:: ${PKGNAME}-${VERSION}/${1}-${2}.omf
-${PKGNAME}-${VERSION}/${1}-${2}.omf:: ${2}/${1}.omf
-	mkdir -p ${PKGNAME}-${VERSION}
-	cp ${2}/${1}.omf $$@
-endif
-endef
-
-$(foreach L,${LANGUAGES}, \
-	$(foreach F,$(patsubst %.omf.in,%,${OMFINFILES}), \
-		$(eval $(call PKGOMF_DOC_template,${F},${L}))))
-
-define PKGOMF_template
-.PHONY: pkgomf-${1}
-pkgomf-${1}::  $(foreach F,${PKGOMFFILES-${1}},${PKGNAME}-${VERSION}/${F})
-$(eval PKGFILES-${1}+=$(foreach F,${PKGOMFFILES-${1}},${PKGNAME}-${VERSION}/${F}))
-endef
-
-$(foreach L,${LANGUAGES},$(eval $(call PKGOMF_template,${L})))
-
 define PKGHTML_NOCHUNKS_template
 .PHONY: pkghtml-nochunks-${1}
 pkghtml-nochunks-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.html
@@ -321,31 +93,14 @@
 
 $(foreach L,${LANGUAGES},$(eval $(call PKGHTML_NOCHUNKS_template,${L})))
 
-define PKGHTML_HOMEPAGE_template
-.PHONY: pkghtml-homepage-${1}
-pkghtml-homepage-${1}:: ${PKGNAME}-${VERSION}/${HOMEPAGEDIR}/index-${1}.html
-$(eval PKGFILES-${1}+=${PKGNAME}-${VERSION}/${HOMEPAGEDIR}/index-${1}.html)
-${PKGNAME}-${VERSION}/${HOMEPAGEDIR}/index-${1}.html:: ${HOMEPAGEDIR}/index-${1}.html
-	mkdir -p ${PKGNAME}-${VERSION}/${HOMEPAGEDIR}
-	cp ${HOMEPAGEDIR}/index-${1}.html $$@
-endef
-
-$(foreach L,${LANGUAGES},$(eval $(call PKGHTML_HOMEPAGE_template,${L})))
 
 define PKGTXT_template
 .PHONY: pkgtxt-${1}
-pkgtxt-${1}::
${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt	${PKGNAME}-${VERSION}/README-${1}.txt
${PKGNAME}-${VERSION}/README-BURNING-ISOS-${1}.txt
-$(eval
PKGFILES-${1}+=${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt	${PKGNAME}-${VERSION}/README-${1}.txt
${PKGNAME}-${VERSION}/README-BURNING-ISOS-${1}.txt)
+pkgtxt-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt
+$(eval PKGFILES-${1}+=${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt)
 ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt:: ${DOCBASE}-${1}.txt
 	mkdir -p ${PKGNAME}-${VERSION}
 	cp ${DOCBASE}-${1}.txt $$@
-### README is hacked in until we have more control here...
-${PKGNAME}-${VERSION}/README-${1}.txt:: README-${1}.txt
-	mkdir -p ${PKGNAME}-${VERSION}
-	cp README-${1}.txt $$@
-${PKGNAME}-${VERSION}/README-BURNING-ISOS-${1}.txt:: README-BURNING-ISOS-${1}.txt
-	mkdir -p ${PKGNAME}-${VERSION}
-	cp README-BURNING-ISOS-${1}.txt $$@
 endef
 
 $(foreach L,${LANGUAGES},$(eval $(call PKGTXT_template,${L})))
@@ -362,35 +117,10 @@
 $(foreach L,${LANGUAGES},$(eval $(call PKG_template,${L})))
 
 
-${PKGNAME}-${VERSION}/about-gnome.desktop:: about-gnome.desktop.in 	\
-				$(foreach LN,${OTHERS},${LN}/about-fedora.xml)
-	$(eval NAME_L10N=Name=$(shell ${XSLTPROC} 			\
-		about-title.xsl ${PRI_LANG}/about-fedora.xml))
-	$(eval COMMENT_L10N=Comment=$(shell ${XSLTPROC}			\
-		about-title.xsl ${PRI_LANG}/about-fedora.xml))
-	$(eval EXEC_L10N=Exec=yelp
file:///usr/share/doc/${PKGNAME}-${VERSION}/about/C/about-fedora.xml)
-	$(foreach L,${LANGUAGES},$(eval					\
-		NAME_L10N+=\nName[${L}]=$(shell ${XSLTPROC}		\
-			about-title.xsl ${L}/about-fedora.xml)))
-	$(foreach L,${LANGUAGES},$(eval					\
-		COMMENT_L10N+=\nComment[${L}]=$(shell ${XSLTPROC}	\
-			about-title.xsl ${L}/about-fedora.xml)))
-	$(foreach L,${LANGUAGES},$(eval					\
-		EXEC_L10N+=\nExec[${L}]=yelp
file:///usr/share/doc/${PKGNAME}-${VERSION}/about/${L}/about-fedora.xml))
-	sed -e 's!@NAME-L10N@!${NAME_L10N}!' -e
's!@COMMENT-L10N@!${COMMENT_L10N}!' -e 's!@EXEC-L10N@!${EXEC_L10N}!' $<
> $@
-
-
 .PHONY: release-pkg
 release-pkg:: ${PKGNAME}-${VERSION}.tar.gz
-${PKGNAME}-${VERSION}.tar.gz:: $(foreach L,${LANGUAGES},${PKGFILES-${L}}) \
-		${PKGNAME}-${VERSION}/about-gnome.desktop
-	cp -a --parents css/*css fedora.css ${HOMEPAGE_CSS} img/*png stylesheet-images/*png
${PKGNAME}-${VERSION}
-	mkdir -p ${PKGNAME}-${VERSION}/about/C && \
-		cp ${PRI_LANG}/about-fedora.xml ${PKGNAME}-${VERSION}/about/C
-	$(foreach LN,${OTHERS},$(eval \
-		$(shell mkdir -p ${PKGNAME}-${VERSION}/about/${LN})))
-	$(foreach LN,${OTHERS},$(eval \
-		$(shell cp ${LN}/about-fedora.xml ${PKGNAME}-${VERSION}/about/${LN})))
+${PKGNAME}-${VERSION}.tar.gz:: $(foreach L,${LANGUAGES},${PKGFILES-${L}})
+	cp -a --parents css/*css fedora.css img/*png stylesheet-images/*png
${PKGNAME}-${VERSION}
 	cp -a README-Accessibility ${PKGNAME}-${VERSION}
 	tar czf ${PKGNAME}-${VERSION}.tar.gz ${PKGNAME}-${VERSION}
 
@@ -401,10 +131,22 @@
 help::
 	@printf ${TFMT} 'release-pkg' 'Make a tarball suitable for import to
Core'
 
+# To build the SRPM, you must build "make release-pkg" in the following
+# modules and copy the resulting tarball to this module:
+#   homepage/
+#   readme/
+#   readme-burning-isos/
+# Make sure that each external module's Makefile defines VERSION the
+# same as in this module's specfile.
 
 .PHONY: release-srpm
 release-srpm:: ${PKGNAME}-${VERSION}-${RELEASE}.src.rpm
-${PKGNAME}-${VERSION}-${RELEASE}.src.rpm::  ${SPECFILE} ${PKGNAME}-${VERSION}.tar.gz
+${PKGNAME}-${VERSION}-${RELEASE}.src.rpm::  ${SPECFILE} \
+		${PKGNAME}-${VERSION}.tar.gz \
+		homepage-${VERSION}.tar.gz \
+		about-fedora-${VERSION}.tar.gz \
+		README-${VERSION}.tar.gz \
+		README-BURNING-ISOS-${VERSION}.tar.gz
 	rpmbuild -bs ${PKGRPMFLAGS} ${SPECFILE}
 
 clean::