[Python-checkins] CVS: python/dist/src/Doc Makefile,1.235.2.1.2.5,1.235.2.1.2.6
Fred L. Drake
fdrake@users.sourceforge.net
Mon, 01 Apr 2002 08:11:29 -0800
Update of /cvsroot/python/python/dist/src/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv24786
Modified Files:
Tag: release22-maint
Makefile
Log Message:
Backport changes to integrate AMK's "What's New in Python X.Y"
document. This incorporates the integration of several checkins from the
trunk.
Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.235.2.1.2.5
retrieving revision 1.235.2.1.2.6
diff -C2 -d -r1.235.2.1.2.5 -r1.235.2.1.2.6
*** Makefile 29 Mar 2002 21:32:25 -0000 1.235.2.1.2.5
--- Makefile 1 Apr 2002 16:11:26 -0000 1.235.2.1.2.6
***************
*** 89,92 ****
--- 89,96 ----
HTMLBASE= file:`pwd`
+ # The end of this should reflect the major/minor version numbers of
+ # the release:
+ WHATSNEW=whatsnew22
+
# what's what
MANDVIFILES= paper-$(PAPER)/api.dvi paper-$(PAPER)/ext.dvi \
***************
*** 94,98 ****
paper-$(PAPER)/ref.dvi paper-$(PAPER)/tut.dvi
HOWTODVIFILES= paper-$(PAPER)/doc.dvi paper-$(PAPER)/inst.dvi \
! paper-$(PAPER)/dist.dvi
MANPDFFILES= paper-$(PAPER)/api.pdf paper-$(PAPER)/ext.pdf \
--- 98,102 ----
paper-$(PAPER)/ref.dvi paper-$(PAPER)/tut.dvi
HOWTODVIFILES= paper-$(PAPER)/doc.dvi paper-$(PAPER)/inst.dvi \
! paper-$(PAPER)/dist.dvi paper-$(PAPER)/$(WHATSNEW).dvi
MANPDFFILES= paper-$(PAPER)/api.pdf paper-$(PAPER)/ext.pdf \
***************
*** 100,104 ****
paper-$(PAPER)/ref.pdf paper-$(PAPER)/tut.pdf
HOWTOPDFFILES= paper-$(PAPER)/doc.pdf paper-$(PAPER)/inst.pdf \
! paper-$(PAPER)/dist.pdf
MANPSFILES= paper-$(PAPER)/api.ps paper-$(PAPER)/ext.ps \
--- 104,108 ----
paper-$(PAPER)/ref.pdf paper-$(PAPER)/tut.pdf
HOWTOPDFFILES= paper-$(PAPER)/doc.pdf paper-$(PAPER)/inst.pdf \
! paper-$(PAPER)/dist.pdf paper-$(PAPER)/$(WHATSNEW).pdf
MANPSFILES= paper-$(PAPER)/api.ps paper-$(PAPER)/ext.ps \
***************
*** 106,110 ****
paper-$(PAPER)/ref.ps paper-$(PAPER)/tut.ps
HOWTOPSFILES= paper-$(PAPER)/doc.ps paper-$(PAPER)/inst.ps \
! paper-$(PAPER)/dist.ps
DVIFILES= $(MANDVIFILES) $(HOWTODVIFILES)
--- 110,114 ----
paper-$(PAPER)/ref.ps paper-$(PAPER)/tut.ps
HOWTOPSFILES= paper-$(PAPER)/doc.ps paper-$(PAPER)/inst.ps \
! paper-$(PAPER)/dist.ps paper-$(PAPER)/$(WHATSNEW).ps
DVIFILES= $(MANDVIFILES) $(HOWTODVIFILES)
***************
*** 142,146 ****
html/tut/tut.html \
html/inst/inst.html \
! html/dist/dist.html
ALLHTMLFILES=$(INDEXFILES) html/index.html html/modindex.html html/acks.html
--- 146,151 ----
html/tut/tut.html \
html/inst/inst.html \
! html/dist/dist.html \
! html/whatsnew/$(WHATSNEW).html
ALLHTMLFILES=$(INDEXFILES) html/index.html html/modindex.html html/acks.html
***************
*** 272,275 ****
--- 277,287 ----
cd paper-$(PAPER) && $(MKPDF) ../tut/tut.tex
+ # What's New in Python X.Y
+ paper-$(PAPER)/$(WHATSNEW).dvi:
+ cd paper-$(PAPER) && $(MKDVI) ../whatsnew/$(WHATSNEW).tex
+
+ paper-$(PAPER)/$(WHATSNEW).pdf:
+ cd paper-$(PAPER) && $(MKPDF) ../whatsnew/$(WHATSNEW).tex
+
# The remaining part of the Makefile is concerned with various
# conversions, as described above. See also the README file.
***************
*** 312,316 ****
html/index.html: $(INDEXFILES)
html/index.html: html/index.html.in $(BOILERPLATE) tools/rewrite.py
! $(PYTHON) tools/rewrite.py $(BOILERPLATE) RELEASE=$(RELEASE) \
<$< >$@
--- 324,329 ----
html/index.html: $(INDEXFILES)
html/index.html: html/index.html.in $(BOILERPLATE) tools/rewrite.py
! $(PYTHON) tools/rewrite.py $(BOILERPLATE) \
! RELEASE=$(RELEASE) WHATSNEW=$(WHATSNEW) \
<$< >$@
***************
*** 360,363 ****
--- 373,380 ----
$(MKHTML) --dir html/dist --split 4 dist/dist.tex
+ whatsnew: html/whatsnew/$(WHATSNEW).html
+ html/whatsnew/$(WHATSNEW).html: whatsnew/$(WHATSNEW).tex
+ $(MKHTML) --dir html/whatsnew --split 4 whatsnew/$(WHATSNEW).tex
+
# The iSilo format is used by the iSilo document reader for PalmOS devices.
***************
*** 371,375 ****
isilo/tut/tut.html \
isilo/inst/inst.html \
! isilo/dist/dist.html
$(ISILOINDEXFILES): $(COMMONPERL) html/about.dat perl/isilo.perl
--- 388,393 ----
isilo/tut/tut.html \
isilo/inst/inst.html \
! isilo/dist/dist.html \
! isilo/whatsnew/$(WHATSNEW).html
$(ISILOINDEXFILES): $(COMMONPERL) html/about.dat perl/isilo.perl
***************
*** 383,387 ****
isilo/python-tut-$(RELEASE).pdb \
isilo/python-dist-$(RELEASE).pdb \
! isilo/python-inst-$(RELEASE).pdb
isilo/python-api-$(RELEASE).pdb: isilo/api/api.html isilo/api/api.css
--- 401,406 ----
isilo/python-tut-$(RELEASE).pdb \
isilo/python-dist-$(RELEASE).pdb \
! isilo/python-inst-$(RELEASE).pdb \
! isilo/python-whatsnew-$(RELEASE).pdb
isilo/python-api-$(RELEASE).pdb: isilo/api/api.html isilo/api/api.css
***************
*** 421,424 ****
--- 440,447 ----
isilo/inst/inst.html $@
+ isilo/python-whatsnew-$(RELEASE).pdb: isilo/whatsnew/$(WHATSNEW).html isilo/whatsnew/$(WHATSNEW).css
+ $(MKISILO) "-iWhat's New in Python X.Y" \
+ isilo/whatsnew/$(WHATSNEW).html $@
+
isilo/api/api.html: $(APIFILES)
$(MKISILOHTML) --dir isilo/api api/api.tex
***************
*** 448,451 ****
--- 471,477 ----
$(MKISILOHTML) --dir isilo/dist dist/dist.tex
+ isilo/whatsnew/$(WHATSNEW).html: whatsnew/$(WHATSNEW).tex
+ $(MKISILOHTML) --dir isilo/whatsnew whatsnew/$(WHATSNEW).tex
+
# These are useful if you need to transport the iSilo-ready HTML to
# another machine to perform the conversion:
***************
*** 473,476 ****
--- 499,503 ----
$(WEBCHECKER) $(HTMLBASE)/dist/
$(WEBCHECKER) $(HTMLBASE)/inst/
+ $(WEBCHECKER) $(HTMLBASE)/whatsnew/
fastwebcheck: $(ALLHTMLFILES)
***************
*** 484,487 ****
--- 511,515 ----
$(WEBCHECKER) -x $(HTMLBASE)/dist/
$(WEBCHECKER) -x $(HTMLBASE)/inst/
+ $(WEBCHECKER) -x $(HTMLBASE)/whatsnew/
***************
*** 615,620 ****
--- 643,650 ----
rm -rf html/api/ html/doc/ html/ext/ html/lib/ html/mac/
rm -rf html/ref/ html/tut/ html/inst/ html/dist/
+ rm -rf html/whatsnew/
rm -rf isilo/api/ isilo/doc/ isilo/ext/ isilo/lib/ isilo/mac/
rm -rf isilo/ref/ isilo/tut/ isilo/inst/ isilo/dist/
+ rm -rf isilo/whatsnew/
rm -f isilo/python-*-$(RELEASE).pdb isilo-$(RELEASE).zip