[Python-checkins] CVS: python/dist/src/Doc Makefile,1.222,1.223

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv22979

Modified Files:
	Makefile 
Log Message:

Look to the future: bump the version number.

Do more to ensure we don't do any more formatting than we need to.
Use separate targets for the distribution packages for paper-based and
non-paper-based formats; this avoids some extra packaging when a complete
distribution is being built with both paper sizes.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.222
retrieving revision 1.223
diff -C2 -r1.222 -r1.223
*** Makefile	2001/07/17 23:35:46	1.222
--- Makefile	2001/07/18 21:17:29	1.223
***************
*** 68,72 ****
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=2.2a1
  
  PYTHON=	   python
--- 68,72 ----
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=2.2a2
  
  PYTHON=	   python
***************
*** 119,122 ****
--- 119,124 ----
  	html/dist/dist.html
  
+ ALLHTMLFILES=$(INDEXFILES) html/index.html html/modindex.html html/acks.html
+ 
  COMMONPERL= perl/manual.perl perl/python.perl perl/l2hinit.perl
  
***************
*** 260,264 ****
  		lib/modindex.html mac/modindex.html
  
! html:	$(INDEXFILES) html/index.html html/modindex.html html/acks.html
  
  api html/api/api.html: $(APIFILES)
--- 262,266 ----
  		lib/modindex.html mac/modindex.html
  
! html:	$(ALLHTMLFILES)
  
  api html/api/api.html: $(APIFILES)
***************
*** 294,298 ****
  HTMLBASE=  file:`pwd`/html
  
! webcheck: html
  	$(WEBCHECKER) $(HTMLBASE)/api/
  	$(WEBCHECKER) $(HTMLBASE)/doc/
--- 296,300 ----
  HTMLBASE=  file:`pwd`/html
  
! webcheck: $(ALLHTMLFILES)
  	$(WEBCHECKER) $(HTMLBASE)/api/
  	$(WEBCHECKER) $(HTMLBASE)/doc/
***************
*** 305,309 ****
  	$(WEBCHECKER) $(HTMLBASE)/inst/
  
! fastwebcheck: html
  	$(WEBCHECKER) -x $(HTMLBASE)/api/
  	$(WEBCHECKER) -x $(HTMLBASE)/doc/
--- 307,311 ----
  	$(WEBCHECKER) $(HTMLBASE)/inst/
  
! fastwebcheck: $(ALLHTMLFILES)
  	$(WEBCHECKER) -x $(HTMLBASE)/api/
  	$(WEBCHECKER) -x $(HTMLBASE)/doc/
***************
*** 319,323 ****
  # Release packaging targets:
  
! paper-$(PAPER)/README: ps $(TOOLSDIR)/getpagecounts
  	cd paper-$(PAPER) && ../$(TOOLSDIR)/getpagecounts >../$@
  
--- 321,325 ----
  # Release packaging targets:
  
! paper-$(PAPER)/README: $(PSFILES) $(TOOLSDIR)/getpagecounts
  	cd paper-$(PAPER) && ../$(TOOLSDIR)/getpagecounts >../$@
  
***************
*** 339,348 ****
  	rm -f $@
  	$(PYTHON) $(TOOLSDIR)/mksourcepkg --zip $(RELEASE)
  
! pdf-$(PAPER)-$(RELEASE).tgz: pdf
! 	cd paper-$(PAPER) && tar cf - *.pdf | gzip -9 >$@
  
! pdf-$(PAPER)-$(RELEASE).tar.bz2: pdf
! 	cd paper-$(PAPER) && tar cf - *.pdf | bzip2 -9 >$@
  
  pdf-$(PAPER)-$(RELEASE).zip: pdf
--- 341,353 ----
  	rm -f $@
  	$(PYTHON) $(TOOLSDIR)/mksourcepkg --zip $(RELEASE)
+ 
+ pdf-$(PAPER)-$(RELEASE).tar: $(PDFFILES)
+ 	cd paper-$(PAPER) && tar cf ../$@ *.pdf
  
! pdf-$(PAPER)-$(RELEASE).tgz: pdf-$(PAPER)-$(RELEASE).tar
! 	gzip -9 <$? >$@
  
! pdf-$(PAPER)-$(RELEASE).tar.bz2: pdf-$(PAPER)-$(RELEASE).tar
! 	bzip2 -9 <$? >$@
  
  pdf-$(PAPER)-$(RELEASE).zip: pdf
***************
*** 350,360 ****
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.pdf
  
! postscript-$(PAPER)-$(RELEASE).tar.bz2: ps paper-$(PAPER)/README
! 	cd paper-$(PAPER) && tar cf - *.ps README | bzip2 -9 >$@
  
! postscript-$(PAPER)-$(RELEASE).tgz: ps paper-$(PAPER)/README
! 	cd paper-$(PAPER) && tar cf - *.ps README | gzip -9 >$@
  
! postscript-$(PAPER)-$(RELEASE).zip: ps paper-$(PAPER)/README
  	rm -f $@
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.ps README
--- 355,368 ----
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.pdf
  
! postscript-$(PAPER)-$(RELEASE).tar: $(PSFILES) paper-$(PAPER)/README
! 	cd paper-$(PAPER) && tar cf ../$@ *.ps README
  
! postscript-$(PAPER)-$(RELEASE).tar.bz2: postscript-$(PAPER)-$(RELEASE).tar
! 	bzip2 -9 <$< >$@
  
! postscript-$(PAPER)-$(RELEASE).tgz: postscript-$(PAPER)-$(RELEASE).tar
! 	gzip -9 <$< >$@
! 
! postscript-$(PAPER)-$(RELEASE).zip: $(PSFILES) paper-$(PAPER)/README
  	rm -f $@
  	cd paper-$(PAPER) && zip -q -9 ../$@ *.ps README
***************
*** 366,375 ****
  
  html-$(RELEASE).tgz:	html-$(RELEASE).tar
! 	gzip -9 <html-$(RELEASE).tar >$@
  
  html-$(RELEASE).tar.bz2: html-$(RELEASE).tar
! 	bzip2 -9 <html-$(RELEASE).tar >$@
  
! html-$(RELEASE).zip:	html
  	rm -f $@
  	cd $(HTMLDIR) && \
--- 374,383 ----
  
  html-$(RELEASE).tgz:	html-$(RELEASE).tar
! 	gzip -9 <$? >$@
  
  html-$(RELEASE).tar.bz2: html-$(RELEASE).tar
! 	bzip2 -9 <$? >$@
  
! html-$(RELEASE).zip:	$(ALLHTMLFILES)
  	rm -f $@
  	cd $(HTMLDIR) && \
***************
*** 406,411 ****
  distpdf:	tarpdf bzippdf zippdf
  distlatex:	tarlatex bziplatex ziplatex
  
! distfiles:	tarballs zips bzips
  	$(TOOLSDIR)/mksourcepkg --all $(RELEASE)
  
--- 414,422 ----
  distpdf:	tarpdf bzippdf zippdf
  distlatex:	tarlatex bziplatex ziplatex
+ 
+ paperdist:	distpdf distps
+ edist:		disthtml
  
! distfiles:	paperdist edist
  	$(TOOLSDIR)/mksourcepkg --all $(RELEASE)