install-guide Makefile,1.11,1.12

Karsten Wade (kwade) fedora-docs-commits at redhat.com
Sat Nov 19 18:24:26 UTC 2005


Author: kwade

Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9706

Modified Files:
	Makefile 
Log Message:
Hoping I'm using this new Makefile correctly, I get errors during the build but it builds anyway, as is the way of HTML.  Please confirm I've done the right thing.  One advantage is, now the other languages should become available through Docs Rawhide.


Index: Makefile
===================================================================
RCS file: /cvs/docs/install-guide/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile	21 Sep 2005 01:17:52 -0000	1.11
+++ Makefile	19 Nov 2005 18:24:19 -0000	1.12
@@ -1,19 +1,99 @@
 ###############################################################################
 # Makefile for RHLP docs project
 # Created by: Tammy Fox <tfox at redhat.com>
-# Last edited by: Tammy Fox <tfox at redhat.com>
+# Last edited by: Tommy Reynolds <Tommy.Reynolds at MegaCoder.com>
 # WARNING: need passivetex 1.24 for pdf generation to work
 # License: GPL
 # Copyright 2003 Tammy Fox, Red Hat, Inc.
+# Copyright 2005 Tommy Reynolds, MegaCoder.com
 ###############################################################################
+#
+# Document-specific definitions.
+#
+LANGUAGES      	= en ja_JP zh_CN
+DOCBASE        	= fedora-install-guide
 
-LANGUAGES       	= en
-DOCBASE	        	= fedora-install-guide
-XMLEXTRAFILES-en        =
+define XMLEXTRAFILES_template
+XMLEXTRAFILES-$(1)=fedora-install-guide-abouttoinstall-$(1).xml fedora-install-guide-acknowledgements-$(1).xml fedora-install-guide-beginninginstallation-$(1).xml fedora-install-guide-bootloader-$(1).xml fedora-install-guide-diskpartitioning-$(1).xml fedora-install-guide-$(1).xml fedora-install-guide-firewallconfig-$(1).xml fedora-install-guide-firstboot-$(1).xml fedora-install-guide-installingpackages-$(1).xml fedora-install-guide-installtypes-$(1).xml fedora-install-guide-intro-$(1).xml fedora-install-guide-locale-$(1).xml fedora-install-guide-networkconfig-$(1).xml fedora-install-guide-nextsteps-$(1).xml fedora-install-guide-other-instmethods-$(1).xml fedora-install-guide-packageselection-$(1).xml fedora-install-guide-rootpassword-$(1).xml fedora-install-guide-timezone-$(1).xml fedora-install-guide-upgrading-$(1).xml
+endef
 
+$(foreach LANG,${LANGUAGES},$(eval $(call XMLEXTRAFILES_template,${LANG})))
+
+#
 ######################################################
 include ../docs-common/Makefile.common
 ######################################################
-$(DOCNAME)/index.html::
-	mkdir -p $(DOCNAME)/figs
-	cp figs/*.png figs/*.eps $(DOCNAME)/figs
+#
+# If you want to add additional steps to any of the 
+# targets defined in "Makefile.common", be sure to use
+# a double-colon in your rule here.  For example, to 
+# print the message "FINISHED AT LAST" after building 
+# the HTML document version, uncomment the following 
+# line:
+#${DOCBASE}-en/index.html::
+#	echo FINISHED AT LAST
+######################################################
+# Some packaging specific vars
+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/).\+//' }
+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)/SPECS/$(DOCBASE).spec
+DOCOMF=$(PWD)/SOURCES/fedora-doc-$(DOCBASE)-C.omf
+DOCDESKTOP=$(PWD)/SOURCES/fedora-doc-$(DOCBASE).desktop
+DOCSRCTAR=$(PWD)/SOURCES/$(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 "_topdir $(PWD)"
+######################################################
+
+
+clean::
+	rm -rf fedora-doc-$(DOCBASE)*.rpm
+
+
+rpm: clean
+#
+# Make RPM-compliant tarball of source XML and other stuff
+	mkdir $(DOCBASE)-$(VERSION)
+	find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \) \
+		| cpio -pamdv $(DOCBASE)-$(VERSION)
+	find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
+		-o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
+		| cpio -pamdv $(DOCBASE)-$(VERSION)
+#
+# Make RPM build tree; don't rely on local user's setup
+	mkdir -p {BUILD,RPMS/noarch,SOURCES,SPECS,SRPMS}
+	tar -zcvf $(DOCSRCTAR) $(DOCBASE)-$(VERSION)
+	rm -rf $(DOCBASE)-$(VERSION)/
+#
+# 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)
+	mv RPMS/noarch/*.rpm .
+	rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
+	rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS}
+	rm -rf $(DOCBASE)-$(VERSION)




More information about the Fedora-docs-commits mailing list