[Python-checkins] CVS: python/dist/src/Doc .cvsignore,1.20,1.20.6.1 Makefile,1.220,1.220.2.1 Makefile.deps,1.68,1.68.2.1
Tim Peters
tim_one@users.sourceforge.net
Tue, 17 Jul 2001 21:13:57 -0700
Update of /cvsroot/python/python/dist/src/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv20213/descr/dist/src/Doc
Modified Files:
Tag: descr-branch
.cvsignore Makefile Makefile.deps
Log Message:
2.2a1 release: merge of trunk date2001-07-17a -> trunk date2001-07-17b.
Index: .cvsignore
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.20.6.1
diff -C2 -r1.20 -r1.20.6.1
*** .cvsignore 2001/01/22 21:31:38 1.20
--- .cvsignore 2001/07/18 04:13:55 1.20.6.1
***************
*** 2,3 ****
--- 2,4 ----
*.tar.bz2
*.zip
+ html-*.tar
Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.220
retrieving revision 1.220.2.1
diff -C2 -r1.220 -r1.220.2.1
*** Makefile 2001/07/06 22:28:47 1.220
--- Makefile 2001/07/18 04:13:55 1.220.2.1
***************
*** 68,87 ****
# This is the *documentation* release, and is used to construct the file
# names of the downloadable tarballs.
! RELEASE=2.2a0
PYTHON= python
DVIPS= dvips -N0 -t $(PAPER)
! MKDVI= ../tools/mkhowto --paper=$(PAPER) --dvi
! MKHTML= tools/mkhowto --html --about html/stdabout.dat \
--address $(PYTHONDOCS) --up-link ../index.html \
--up-title "Python Documentation Index" \
--global-module-index "../modindex.html"
! MKPDF= ../tools/mkhowto --paper=$(PAPER) --pdf
! MKPS= ../tools/mkhowto --paper=$(PAPER) --ps
BUILDINDEX=$(TOOLSDIR)/buildindex.py
! PYTHONDOCS='See <i><a href="about.html">About this document...</a></i> for information on suggesting changes.'
HTMLBASE= file:`pwd`
--- 68,87 ----
# This is the *documentation* release, and is used to construct the file
# names of the downloadable tarballs.
! RELEASE=2.2a1
PYTHON= python
DVIPS= dvips -N0 -t $(PAPER)
! MKDVI= $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --dvi
! MKHTML= $(PYTHON) tools/mkhowto --html --about html/stdabout.dat \
--address $(PYTHONDOCS) --up-link ../index.html \
--up-title "Python Documentation Index" \
--global-module-index "../modindex.html"
! MKPDF= $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --pdf
! MKPS= $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --ps
BUILDINDEX=$(TOOLSDIR)/buildindex.py
! PYTHONDOCS="See <i><a href=\"about.html\">About this document...</a></i> for information on suggesting changes."
HTMLBASE= file:`pwd`
***************
*** 149,156 ****
# Python/C API Reference Manual
paper-$(PAPER)/api.dvi: paper-$(PAPER)/api.tex $(APIFILES)
! (cd paper-$(PAPER); $(MKDVI) api.tex)
paper-$(PAPER)/api.pdf: paper-$(PAPER)/api.tex $(APIFILES)
! (cd paper-$(PAPER); $(MKPDF) api.tex)
paper-$(PAPER)/api.tex: api/api.tex api/refcounts.dat tools/anno-api.py
--- 149,156 ----
# Python/C API Reference Manual
paper-$(PAPER)/api.dvi: paper-$(PAPER)/api.tex $(APIFILES)
! cd paper-$(PAPER) && $(MKDVI) api.tex
paper-$(PAPER)/api.pdf: paper-$(PAPER)/api.tex $(APIFILES)
! cd paper-$(PAPER) && $(MKPDF) api.tex
paper-$(PAPER)/api.tex: api/api.tex api/refcounts.dat tools/anno-api.py
***************
*** 159,215 ****
# Distributing Python Modules
paper-$(PAPER)/dist.dvi: $(DISTFILES)
! (cd paper-$(PAPER); $(MKDVI) ../dist/dist.tex)
paper-$(PAPER)/dist.pdf: $(DISTFILES)
! (cd paper-$(PAPER); $(MKPDF) ../dist/dist.tex)
# Documenting Python
paper-$(PAPER)/doc.dvi: $(DOCFILES)
! (cd paper-$(PAPER); $(MKDVI) ../doc/doc.tex)
paper-$(PAPER)/doc.pdf: $(DOCFILES)
! (cd paper-$(PAPER); $(MKPDF) ../doc/doc.tex)
# Extending and Embedding the Python Interpreter
paper-$(PAPER)/ext.dvi: $(EXTFILES)
! (cd paper-$(PAPER); $(MKDVI) ../ext/ext.tex)
paper-$(PAPER)/ext.pdf: $(EXTFILES)
! (cd paper-$(PAPER); $(MKPDF) ../ext/ext.tex)
# Installing Python Modules
paper-$(PAPER)/inst.dvi: $(INSTFILES)
! (cd paper-$(PAPER); $(MKDVI) ../inst/inst.tex)
paper-$(PAPER)/inst.pdf: $(INSTFILES)
! (cd paper-$(PAPER); $(MKPDF) ../inst/inst.tex)
# Python Library Reference
paper-$(PAPER)/lib.dvi: $(LIBFILES)
! (cd paper-$(PAPER); $(MKDVI) ../lib/lib.tex)
paper-$(PAPER)/lib.pdf: $(LIBFILES)
! (cd paper-$(PAPER); $(MKPDF) ../lib/lib.tex)
# Macintosh Library Modules
paper-$(PAPER)/mac.dvi: $(MACFILES)
! (cd paper-$(PAPER); $(MKDVI) ../mac/mac.tex)
paper-$(PAPER)/mac.pdf: $(MACFILES)
! (cd paper-$(PAPER); $(MKPDF) ../mac/mac.tex)
# Python Reference Manual
paper-$(PAPER)/ref.dvi: $(REFFILES)
! (cd paper-$(PAPER); $(MKDVI) ../ref/ref.tex)
paper-$(PAPER)/ref.pdf: $(REFFILES)
! (cd paper-$(PAPER); $(MKPDF) ../ref/ref.tex)
# Python Tutorial
paper-$(PAPER)/tut.dvi: $(TUTFILES)
! (cd paper-$(PAPER); $(MKDVI) ../tut/tut.tex)
paper-$(PAPER)/tut.pdf: $(TUTFILES)
! (cd paper-$(PAPER); $(MKPDF) ../tut/tut.tex)
# The remaining part of the Makefile is concerned with various
--- 159,215 ----
# Distributing Python Modules
paper-$(PAPER)/dist.dvi: $(DISTFILES)
! cd paper-$(PAPER) && $(MKDVI) ../dist/dist.tex
paper-$(PAPER)/dist.pdf: $(DISTFILES)
! cd paper-$(PAPER) && $(MKPDF) ../dist/dist.tex
# Documenting Python
paper-$(PAPER)/doc.dvi: $(DOCFILES)
! cd paper-$(PAPER) && $(MKDVI) ../doc/doc.tex
paper-$(PAPER)/doc.pdf: $(DOCFILES)
! cd paper-$(PAPER) && $(MKPDF) ../doc/doc.tex
# Extending and Embedding the Python Interpreter
paper-$(PAPER)/ext.dvi: $(EXTFILES)
! cd paper-$(PAPER) && $(MKDVI) ../ext/ext.tex
paper-$(PAPER)/ext.pdf: $(EXTFILES)
! cd paper-$(PAPER) && $(MKPDF) ../ext/ext.tex
# Installing Python Modules
paper-$(PAPER)/inst.dvi: $(INSTFILES)
! cd paper-$(PAPER) && $(MKDVI) ../inst/inst.tex
paper-$(PAPER)/inst.pdf: $(INSTFILES)
! cd paper-$(PAPER) && $(MKPDF) ../inst/inst.tex
# Python Library Reference
paper-$(PAPER)/lib.dvi: $(LIBFILES)
! cd paper-$(PAPER) && $(MKDVI) ../lib/lib.tex
paper-$(PAPER)/lib.pdf: $(LIBFILES)
! cd paper-$(PAPER) && $(MKPDF) ../lib/lib.tex
# Macintosh Library Modules
paper-$(PAPER)/mac.dvi: $(MACFILES)
! cd paper-$(PAPER) && $(MKDVI) ../mac/mac.tex
paper-$(PAPER)/mac.pdf: $(MACFILES)
! cd paper-$(PAPER) && $(MKPDF) ../mac/mac.tex
# Python Reference Manual
paper-$(PAPER)/ref.dvi: $(REFFILES)
! cd paper-$(PAPER) && $(MKDVI) ../ref/ref.tex
paper-$(PAPER)/ref.pdf: $(REFFILES)
! cd paper-$(PAPER) && $(MKPDF) ../ref/ref.tex
# Python Tutorial
paper-$(PAPER)/tut.dvi: $(TUTFILES)
! cd paper-$(PAPER) && $(MKDVI) ../tut/tut.tex
paper-$(PAPER)/tut.pdf: $(TUTFILES)
! cd paper-$(PAPER) && $(MKPDF) ../tut/tut.tex
# The remaining part of the Makefile is concerned with various
***************
*** 217,221 ****
info:
! (cd $(INFODIR); $(MAKE))
# Targets to convert the manuals to HTML using Nikos Drakos' LaTeX to
--- 217,221 ----
info:
! cd $(INFODIR) && $(MAKE)
# Targets to convert the manuals to HTML using Nikos Drakos' LaTeX to
***************
*** 238,250 ****
html/acks.html: ACKS $(TOOLSDIR)/support.py $(TOOLSDIR)/mkackshtml
! $(TOOLSDIR)/mkackshtml --address $(PYTHONDOCS) \
--output html/acks.html <ACKS
html/modindex.html: $(TOOLSDIR)/support.py $(TOOLSDIR)/mkmodindex
html/modindex.html: html/lib/lib.html html/mac/mac.html
! (cd html; \
! ../$(TOOLSDIR)/mkmodindex --columns 4 --output modindex.html \
! --address $(PYTHONDOCS) \
! lib/modindex.html mac/modindex.html)
html: $(INDEXFILES) html/index.html html/modindex.html html/acks.html
--- 238,262 ----
html/acks.html: ACKS $(TOOLSDIR)/support.py $(TOOLSDIR)/mkackshtml
! $(PYTHON) $(TOOLSDIR)/mkackshtml --address $(PYTHONDOCS) \
--output html/acks.html <ACKS
+
+ # html/index.html is dependent on $(INDEXFILES) since we want the date
+ # on the front index to be updated whenever any of the child documents
+ # are updated and boilerplate.tex uses \today as the date. The index
+ # files are not used to actually generate content.
+
+ BOILERPLATE=texinputs/boilerplate.tex
+ html/index.html: $(INDEXFILES)
+ html/index.html: html/index.html.in $(BOILERPLATE) tools/rewrite.py
+ $(PYTHON) tools/rewrite.py $(BOILERPLATE) RELEASE=$(RELEASE) \
+ <$< >$@
+
html/modindex.html: $(TOOLSDIR)/support.py $(TOOLSDIR)/mkmodindex
html/modindex.html: html/lib/lib.html html/mac/mac.html
! cd html && \
! $(PYTHON) ../$(TOOLSDIR)/mkmodindex --columns 4 \
! --output modindex.html --address $(PYTHONDOCS) \
! lib/modindex.html mac/modindex.html
html: $(INDEXFILES) html/index.html html/modindex.html html/acks.html
***************
*** 308,365 ****
paper-$(PAPER)/README: ps $(TOOLSDIR)/getpagecounts
! (cd paper-$(PAPER); ../$(TOOLSDIR)/getpagecounts >../$@)
info-$(RELEASE).tgz: info
! (cd $(INFODIR); tar cf - README python.dir python-???.info*) \
| gzip -9 >$@
info-$(RELEASE).tar.bz2: info
! (cd $(INFODIR); tar cf - README python.dir python-???.info*) \
| bzip2 -9 >$@
latex-$(RELEASE).tgz:
! $(TOOLSDIR)/mksourcepkg --gzip $(RELEASE)
latex-$(RELEASE).tar.bz2:
! $(TOOLSDIR)/mksourcepkg --bzip2 $(RELEASE)
latex-$(RELEASE).zip:
rm -f $@
! $(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
rm -f $@
! (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)
! html-$(RELEASE).tgz: html
! (cd $(HTMLDIR); \
! tar cf - *.html */*.css */*.html */*.gif */*.txt) \
! | gzip -9 >$@
! html-$(RELEASE).tar.bz2: html
! (cd $(HTMLDIR); \
! tar cf - *.html */*.css */*.html */*.gif */*.txt) \
! | bzip2 -9 >$@
html-$(RELEASE).zip: html
rm -f $@
! (cd $(HTMLDIR); \
! zip -q -9 ../$@ *.html */*.css */*.html */*.gif */*.txt)
# convenience targets:
--- 320,378 ----
paper-$(PAPER)/README: ps $(TOOLSDIR)/getpagecounts
! cd paper-$(PAPER) && ../$(TOOLSDIR)/getpagecounts >../$@
info-$(RELEASE).tgz: info
! cd $(INFODIR) && tar cf - README python.dir python-*.info* \
| gzip -9 >$@
info-$(RELEASE).tar.bz2: info
! cd $(INFODIR) && tar cf - README python.dir python-*.info* \
| bzip2 -9 >$@
latex-$(RELEASE).tgz:
! $(PYTHON) $(TOOLSDIR)/mksourcepkg --gzip $(RELEASE)
latex-$(RELEASE).tar.bz2:
! $(PYTHON) $(TOOLSDIR)/mksourcepkg --bzip2 $(RELEASE)
latex-$(RELEASE).zip:
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
rm -f $@
! 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
! html-$(RELEASE).tar: html
! cd $(HTMLDIR) && \
! tar cf ../html-$(RELEASE).tar *.html */*.css */*.html \
! */*.gif */*.txt
! 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) && \
! zip -q -9 ../$@ *.html */*.css */*.html */*.gif */*.txt
# convenience targets:
***************
*** 404,412 ****
# - useful results: .dvi, .pdf, .ps, .texi, .info
clean:
! (cd paper-$(PAPER); $(MAKE) clean)
! (cd $(INFODIR); $(MAKE) clean)
# Remove temporaries as well as final products
clobber:
rm -f html-$(RELEASE).tgz info-$(RELEASE).tgz
rm -f pdf-$(RELEASE).tgz postscript-$(RELEASE).tgz
--- 417,426 ----
# - useful results: .dvi, .pdf, .ps, .texi, .info
clean:
! rm -f html-$(RELEASE).tar
! cd $(INFODIR) && $(MAKE) clean
# Remove temporaries as well as final products
clobber:
+ rm -f html-$(RELEASE).tar
rm -f html-$(RELEASE).tgz info-$(RELEASE).tgz
rm -f pdf-$(RELEASE).tgz postscript-$(RELEASE).tgz
***************
*** 414,418 ****
rm -f pdf-$(RELEASE).zip postscript-$(RELEASE).zip
rm -f $(DVIFILES) $(PSFILES) $(PDFFILES)
! (cd $(INFODIR); $(MAKE) clobber)
rm -rf html/index.html html/modindex.html html/acks.html
rm -rf html/api/ html/doc/ html/ext/ html/lib/ html/mac/
--- 428,432 ----
rm -f pdf-$(RELEASE).zip postscript-$(RELEASE).zip
rm -f $(DVIFILES) $(PSFILES) $(PDFFILES)
! cd $(INFODIR) && $(MAKE) clobber
rm -rf html/index.html html/modindex.html html/acks.html
rm -rf html/api/ html/doc/ html/ext/ html/lib/ html/mac/
***************
*** 420,435 ****
realclean distclean: clobber
-
-
- # html/index.html is dependent on $(INDEXFILES) since we want the date
- # on the front index to be updated whenever any of the child documents
- # are updated and boilerplate.tex uses \today as the date.
-
- # It's at the end of the file since it wedges font-lock in XEmacs.
-
- BOILERPLATE=texinputs/boilerplate.tex
- html/index.html: html/index.html.in $(BOILERPLATE) $(INDEXFILES)
- DATE=`grep '\\date{' $(BOILERPLATE) | sed 's/.*\\date{\(.*\)}.*$$/\1/'` ; \
- if [ "$$DATE" = '\today' ] ; then DATE=`date '+%B %e, %Y'`;fi;\
- sed -e "s/@DATE@/$$DATE/g" -e "s/@RELEASE@/$(RELEASE)/g" \
- $< >$@
--- 434,435 ----
Index: Makefile.deps
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile.deps,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -C2 -r1.68 -r1.68.2.1
*** Makefile.deps 2001/07/12 23:40:13 1.68
--- Makefile.deps 2001/07/18 04:13:55 1.68.2.1
***************
*** 2,8 ****
COMMONSTYLES= texinputs/python.sty \
! texinputs/pypaper.sty \
! texinputs/python.ist
COMMONTEX= texinputs/copyright.tex \
texinputs/license.tex \
--- 2,9 ----
COMMONSTYLES= texinputs/python.sty \
! texinputs/pypaper.sty
+ INDEXSTYLES=texinputs/python.ist
+
COMMONTEX= texinputs/copyright.tex \
texinputs/license.tex \
***************
*** 17,28 ****
! APIFILES= api/api.tex $(MANSTYLES) $(COMMONTEX) \
texinputs/reportingbugs.tex
! DOCFILES= $(HOWTOSTYLES) $(COMMONTEX) \
texinputs/ltxmarkup.sty \
doc/doc.tex
! EXTFILES= ext/ext.tex $(MANSTYLES) $(COMMONTEX) \
texinputs/reportingbugs.tex
--- 18,30 ----
! APIFILES= api/api.tex $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
texinputs/reportingbugs.tex
! DOCFILES= $(HOWTOSTYLES) \
! texinputs/boilerplate.tex \
texinputs/ltxmarkup.sty \
doc/doc.tex
! EXTFILES= ext/ext.tex $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
texinputs/reportingbugs.tex
***************
*** 30,34 ****
# LaTeX source files for the Python Reference Manual
! REFFILES= $(MANSTYLES) $(COMMONTEX) \
ref/ref.tex \
ref/ref1.tex \
--- 32,36 ----
# LaTeX source files for the Python Reference Manual
! REFFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
ref/ref.tex \
ref/ref1.tex \
***************
*** 43,47 ****
# LaTeX source files for the Python Library Reference
! LIBFILES= $(MANSTYLES) $(COMMONTEX) \
lib/lib.tex \
texinputs/reportingbugs.tex \
--- 45,49 ----
# LaTeX source files for the Python Library Reference
! LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
lib/lib.tex \
texinputs/reportingbugs.tex \
***************
*** 264,268 ****
# LaTeX source files for Macintosh Library Modules.
! MACFILES= $(HOWTOSTYLES) $(COMMONTEX) \
mac/mac.tex \
mac/using.tex \
--- 266,270 ----
# LaTeX source files for Macintosh Library Modules.
! MACFILES= $(HOWTOSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
mac/mac.tex \
mac/using.tex \
***************
*** 285,289 ****
mac/libminiae.tex
! INSTFILES = $(HOWTOSTYLES) $(COMMONTEX) inst/inst.tex
! DISTFILES = $(HOWTOSTYLES) $(COMMONTEX) dist/dist.tex
--- 287,291 ----
mac/libminiae.tex
! INSTFILES = $(HOWTOSTYLES) inst/inst.tex
! DISTFILES = $(HOWTOSTYLES) dist/dist.tex