[Python-checkins] CVS: python/dist/src/Doc/html Makefile,1.34,1.35

Fred L. Drake python-dev@python.org
Wed, 30 Aug 2000 23:12:37 -0700


Update of /cvsroot/python/python/dist/src/Doc/html
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21826/html

Modified Files:
	Makefile 
Log Message:

Centralize the processing logic for LaTeX documents into the mkhowto script;
do not use mkdvi.sh or mkhtl.sh any more.

This slows down building all versions of the documentation, but if you are
only building one format, it does not matter.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/html/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** Makefile	2000/08/11 17:36:21	1.34
--- Makefile	2000/08/31 06:12:35	1.35
***************
*** 1,8 ****
! # Convenience Makefile for building HTML documentation.  You probably need to
! # set TEXINPUTS from the command line for this to be useful, unless you
! # actually build the .dvi files in the top level directory.
! #
! # Note that the .dvi files must already be built and TEXINPUTS must include the
! # directory where latex's working files (esp. *.aux) are kept.
  
  PAPER=letter
--- 1,5 ----
! # Convenience Makefile for building HTML documentation.  You probably
! # need to set TEXINPUTS from the command line for this to be useful,
! # unless you actually build the .dvi files in the top level directory.
  
  PAPER=letter
***************
*** 16,29 ****
  PYTHON=	   python
  WEBCHECKER=$(PYTHON) $(TOPDIR)/../Tools/webchecker/webchecker.py
! WCNEW=$(PYTHON) $(TOPDIR)/../Tools/webchecker/wcnew.py
! MKAUX=	   PAPER=$(PAPER) TEXINPUTS=$(TEXINPUTS) $(TOOLSDIR)/mkdvi.sh --aux
! MKHTML=	   PAPER=$(PAPER) $(TOOLSDIR)/mkhtml.sh
! KPSEWHICH= TEXINPUTS=$(TEXINPUTS) kpsewhich tex
  
  BUILDINDEX=$(TOOLSDIR)/buildindex.py
  
- # make it clear to l2h, since our support only generates HTML 4.0
- L2HARGS=   -html_version 4.0
- 
  PYTHONDOCS='<hr>See <i><a href="about.html">About this document...</a></i> for information on suggesting changes.'
  HTMLBASE=  file:`pwd`
--- 13,20 ----
  PYTHON=	   python
  WEBCHECKER=$(PYTHON) $(TOPDIR)/../Tools/webchecker/webchecker.py
! MKHOWTO=   $(TOOLSDIR)/mkhowto
  
  BUILDINDEX=$(TOOLSDIR)/buildindex.py
  
  PYTHONDOCS='<hr>See <i><a href="about.html">About this document...</a></i> for information on suggesting changes.'
  HTMLBASE=  file:`pwd`
***************
*** 71,123 ****
  		lib/modindex.html mac/modindex.html
  
! api/api.html:  $(PAPERDIR)/api.aux $(BUILDINDEX) $(TOOLSDIR)/mkhtml.sh
! 	$(MKHTML) api $(L2HARGS) -split 5
  
! doc/doc.html:  $(DOCFILES) $(BUILDINDEX) $(TOPDIR)/perl/ltxmarkup.perl
! 	$(TOOLSDIR)/mkhowto --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/doc/doc.tex
- 
- ext/ext.html:  $(PAPERDIR)/ext.aux $(TOOLSDIR)/mkhtml.sh
- 	$(MKHTML) ext $(L2HARGS) -split 5
  
! lib/lib.html:  $(PAPERDIR)/lib.aux $(BUILDINDEX) $(TOOLSDIR)/mkhtml.sh
! 	$(TOOLSDIR)/fix_libaux.sed <`$(KPSEWHICH) lib.aux` >lib1.aux
! 	mv lib1.aux `$(KPSEWHICH) lib.aux`
! 	$(MKHTML) lib $(L2HARGS) -split 5
  
  mac/mac.html:  $(MACFILES) $(BUILDINDEX)
! 	$(TOOLSDIR)/mkhowto --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/mac/mac.tex
- 
- ref/ref.html:  $(PAPERDIR)/ref.aux $(BUILDINDEX) $(TOOLSDIR)/mkhtml.sh
- 	$(MKHTML) ref $(L2HARGS) -split 5
  
! tut/tut.html:  $(PAPERDIR)/tut.aux $(TOOLSDIR)/mkhtml.sh
! 	$(MKHTML) --numeric tut $(L2HARGS) -split 3
  
! inst/inst.html:$(INSTFILES) $(TOPDIR)/perl/distutils.perl
! 	$(TOOLSDIR)/mkhowto --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/inst/inst.tex
  
  dist/dist.html:$(DISTFILES) $(TOPDIR)/perl/distutils.perl
! 	$(TOOLSDIR)/mkhowto --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/dist/dist.tex
  
- $(PAPERDIR)/api.aux: $(APIFILES)
- 	(cd $(PAPERDIR); $(MKAUX) api)
- 
- $(PAPERDIR)/ext.aux: $(EXTFILES)
- 	(cd $(PAPERDIR); $(MKAUX) ext)
- 
- $(PAPERDIR)/lib.aux: $(LIBFILES)
- 	(cd $(PAPERDIR); $(MKAUX) lib)
- 
- $(PAPERDIR)/ref.aux: $(REFFILES)
- 	(cd $(PAPERDIR); $(MKAUX) ref)
- 
- $(PAPERDIR)/tut.aux: $(TUTFILES)
- 	(cd $(PAPERDIR); $(MKAUX) tut)
- 
- 
  webcheck: all
  	$(WEBCHECKER) $(HTMLBASE)/api/
--- 62,102 ----
  		lib/modindex.html mac/modindex.html
  
! api/api.html:  $(APIFILES) $(BUILDINDEX)
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
! 		--html $(TOPDIR)/api/api.tex
  
! doc/doc.html:  $(DOCFILES) $(BUILDINDEX)
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/doc/doc.tex
  
! ext/ext.html:  $(EXTFILES)
! 	echo $(EXTFILES)
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
! 		--html $(TOPDIR)/ext/ext.tex
! 
! lib/lib.html:  $(LIBFILES) $(BUILDINDEX)
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
! 		--html $(TOPDIR)/lib/lib.tex
  
  mac/mac.html:  $(MACFILES) $(BUILDINDEX)
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/mac/mac.tex
  
! ref/ref.html:  $(REFFILES) $(BUILDINDEX)
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
! 		--html $(TOPDIR)/ref/ref.tex
! 
! tut/tut.html:  $(TUTFILES) $(TOOLSDIR)/mkhowto
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
! 		--html --numeric --split 3 $(TOPDIR)/tut/tut.tex
  
! inst/inst.html: $(INSTFILES) $(TOPDIR)/perl/distutils.perl
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/inst/inst.tex
  
  dist/dist.html:$(DISTFILES) $(TOPDIR)/perl/distutils.perl
! 	$(MKHOWTO) --about stdabout.dat --address $(PYTHONDOCS) \
  		--html $(TOPDIR)/dist/dist.tex
  
  webcheck: all
  	$(WEBCHECKER) $(HTMLBASE)/api/
***************
*** 131,144 ****
  	$(WEBCHECKER) $(HTMLBASE)/inst/
  
- wcnew: all
- 	$(WCNEW) $(HTMLBASE)/api/
- 	$(WCNEW) $(HTMLBASE)/doc/
- 	$(WCNEW) $(HTMLBASE)/ext/
- 	$(WCNEW) -m290000 $(HTMLBASE)/lib/
- 	$(WCNEW) $(HTMLBASE)/mac/
- 	$(WCNEW) $(HTMLBASE)/ref/
- 	$(WCNEW) $(HTMLBASE)/tut/
- 
- 
  clean:
  	rm -rf @webchecker.pickle
--- 110,113 ----
***************
*** 155,159 ****
  
  BOILERPLATE=$(TOPDIR)/texinputs/boilerplate.tex
! index.html: index.html.in $(BOILERPLATE)
  	REL=`grep '\\release{' $(BOILERPLATE) | sed 's/.*\\release{\(.*\)}.*$$/\1/'`; \
  		REL=`echo "$$REL" | sed 's/[$$]//g'`; \
--- 124,128 ----
  
  BOILERPLATE=$(TOPDIR)/texinputs/boilerplate.tex
! index.html: $(TOPDIR)/html/index.html.in $(BOILERPLATE)
  	REL=`grep '\\release{' $(BOILERPLATE) | sed 's/.*\\release{\(.*\)}.*$$/\1/'`; \
  		REL=`echo "$$REL" | sed 's/[$$]//g'`; \
***************
*** 163,165 ****
  		sed "s/@DATE@/$$DATE/g" TEMP >$@
  	rm -f TEMP
- 
--- 132,133 ----