[Python-checkins] python/dist/src/Doc Makefile,1.244,1.245

fdrake@users.sourceforge.net fdrake@users.sourceforge.net
Fri, 09 Aug 2002 13:20:52 -0700


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

Modified Files:
	Makefile 
Log Message:
Lots of changes to the packaging of the documentation, all to keep
directories clean where the packages are unpacked.  Each package now
contains a single directory, Python-Docs-<version>/, which contains the
files for that version of the documentation.

Closes SF feature request #567576.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.244
retrieving revision 1.245
diff -C2 -d -r1.244 -r1.245
*** Makefile	25 May 2002 20:28:46 -0000	1.244
--- Makefile	9 Aug 2002 20:20:50 -0000	1.245
***************
*** 397,448 ****
  $(ISILOINDEXFILES): $(COMMONPERL) html/about.dat perl/isilo.perl
  
! isilo:	isilo/python-api-$(RELEASE).pdb \
! 	isilo/python-doc-$(RELEASE).pdb \
! 	isilo/python-ext-$(RELEASE).pdb \
! 	isilo/python-lib-$(RELEASE).pdb \
! 	isilo/python-mac-$(RELEASE).pdb \
! 	isilo/python-ref-$(RELEASE).pdb \
! 	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
  	$(MKISILO) "-iPython/C API Reference Manual" \
  		isilo/api/api.html $@
  
! isilo/python-doc-$(RELEASE).pdb: isilo/doc/doc.html isilo/doc/doc.css
  	$(MKISILO) "-iDocumenting Python" \
  		isilo/doc/doc.html $@
  
! isilo/python-ext-$(RELEASE).pdb: isilo/ext/ext.html isilo/ext/ext.css
  	$(MKISILO) "-iExtending & Embedding Python" \
  		isilo/ext/ext.html $@
  
! isilo/python-lib-$(RELEASE).pdb: isilo/lib/lib.html isilo/lib/lib.css
  	$(MKISILO) "-iPython Library Reference" \
  		isilo/lib/lib.html $@
  
! isilo/python-mac-$(RELEASE).pdb: isilo/mac/mac.html isilo/mac/mac.css
  	$(MKISILO) "-iPython/C API Reference Manual" \
  		isilo/mac/mac.html $@
  
! isilo/python-ref-$(RELEASE).pdb: isilo/ref/ref.html isilo/ref/ref.css
  	$(MKISILO) "-iPython Reference Manual" \
  		isilo/ref/ref.html $@
  
! isilo/python-tut-$(RELEASE).pdb: isilo/tut/tut.html isilo/tut/tut.css
  	$(MKISILO) "-iPython Tutorial" \
  		isilo/tut/tut.html $@
  
! isilo/python-dist-$(RELEASE).pdb: isilo/dist/dist.html isilo/dist/dist.css
  	$(MKISILO) "-iDistributing Python Modules" \
  		isilo/dist/dist.html $@
  
! isilo/python-inst-$(RELEASE).pdb: isilo/inst/inst.html isilo/inst/inst.css
  	$(MKISILO) "-iInstalling Python Modules" \
  		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 $@
--- 397,448 ----
  $(ISILOINDEXFILES): $(COMMONPERL) html/about.dat perl/isilo.perl
  
! isilo:	isilo/python-api.pdb \
! 	isilo/python-doc.pdb \
! 	isilo/python-ext.pdb \
! 	isilo/python-lib.pdb \
! 	isilo/python-mac.pdb \
! 	isilo/python-ref.pdb \
! 	isilo/python-tut.pdb \
! 	isilo/python-dist.pdb \
! 	isilo/python-inst.pdb \
! 	isilo/python-whatsnew.pdb
  
! isilo/python-api.pdb: isilo/api/api.html isilo/api/api.css
  	$(MKISILO) "-iPython/C API Reference Manual" \
  		isilo/api/api.html $@
  
! isilo/python-doc.pdb: isilo/doc/doc.html isilo/doc/doc.css
  	$(MKISILO) "-iDocumenting Python" \
  		isilo/doc/doc.html $@
  
! isilo/python-ext.pdb: isilo/ext/ext.html isilo/ext/ext.css
  	$(MKISILO) "-iExtending & Embedding Python" \
  		isilo/ext/ext.html $@
  
! isilo/python-lib.pdb: isilo/lib/lib.html isilo/lib/lib.css
  	$(MKISILO) "-iPython Library Reference" \
  		isilo/lib/lib.html $@
  
! isilo/python-mac.pdb: isilo/mac/mac.html isilo/mac/mac.css
  	$(MKISILO) "-iPython/C API Reference Manual" \
  		isilo/mac/mac.html $@
  
! isilo/python-ref.pdb: isilo/ref/ref.html isilo/ref/ref.css
  	$(MKISILO) "-iPython Reference Manual" \
  		isilo/ref/ref.html $@
  
! isilo/python-tut.pdb: isilo/tut/tut.html isilo/tut/tut.css
  	$(MKISILO) "-iPython Tutorial" \
  		isilo/tut/tut.html $@
  
! isilo/python-dist.pdb: isilo/dist/dist.html isilo/dist/dist.css
  	$(MKISILO) "-iDistributing Python Modules" \
  		isilo/dist/dist.html $@
  
! isilo/python-inst.pdb: isilo/inst/inst.html isilo/inst/inst.css
  	$(MKISILO) "-iInstalling Python Modules" \
  		isilo/inst/inst.html $@
  
! isilo/python-whatsnew.pdb: isilo/whatsnew/$(WHATSNEW).html isilo/whatsnew/$(WHATSNEW).css
  	$(MKISILO) "-iWhat's New in Python X.Y" \
  		isilo/whatsnew/$(WHATSNEW).html $@
***************
*** 542,546 ****
  
  pdf-$(PAPER)-$(RELEASE).tar: $(PDFFILES)
! 	cd paper-$(PAPER) && tar cf ../$@ *.pdf
  
  pdf-$(PAPER)-$(RELEASE).tgz: pdf-$(PAPER)-$(RELEASE).tar
--- 542,550 ----
  
  pdf-$(PAPER)-$(RELEASE).tar: $(PDFFILES)
! 	rm -f $@
! 	mkdir Python-Docs-$(RELEASE)
! 	cp paper-$(PAPER)/*.pdf Python-Docs-$(RELEASE)
! 	tar cf $@ Python-Docs-$(RELEASE)
! 	rm -r Python-Docs-$(RELEASE)
  
  pdf-$(PAPER)-$(RELEASE).tgz: pdf-$(PAPER)-$(RELEASE).tar
***************
*** 552,559 ****
  pdf-$(PAPER)-$(RELEASE).zip: pdf
  	rm -f $@
! 	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
--- 556,571 ----
  pdf-$(PAPER)-$(RELEASE).zip: pdf
  	rm -f $@
! 	mkdir Python-Docs-$(RELEASE)
! 	cp paper-$(PAPER)/*.pdf Python-Docs-$(RELEASE)
! 	zip -q -r -9 $@ Python-Docs-$(RELEASE)
! 	rm -r Python-Docs-$(RELEASE)
  
  postscript-$(PAPER)-$(RELEASE).tar: $(PSFILES) paper-$(PAPER)/README
! 	rm -f $@
! 	mkdir Python-Docs-$(RELEASE)
! 	cp paper-$(PAPER)/*.ps Python-Docs-$(RELEASE)
! 	cp paper-$(PAPER)/README Python-Docs-$(RELEASE)
! 	tar cf $@ Python-Docs-$(RELEASE)
! 	rm -r Python-Docs-$(RELEASE)
  
  postscript-$(PAPER)-$(RELEASE).tar.bz2: postscript-$(PAPER)-$(RELEASE).tar
***************
*** 565,574 ****
  postscript-$(PAPER)-$(RELEASE).zip: $(PSFILES) paper-$(PAPER)/README
  	rm -f $@
! 	cd paper-$(PAPER) && zip -q -9 ../$@ *.ps README
  
  html-$(RELEASE).tar:	$(ALLHTMLFILES) $(HTMLCSSFILES)
! 	cd html && \
! 		tar cf ../html-$(RELEASE).tar *.html */*.css */*.html \
! 					      */*.gif */*.txt
  
  html-$(RELEASE).tgz:	html-$(RELEASE).tar
--- 577,595 ----
  postscript-$(PAPER)-$(RELEASE).zip: $(PSFILES) paper-$(PAPER)/README
  	rm -f $@
! 	mkdir Python-Docs-$(RELEASE)
! 	cp paper-$(PAPER)/*.ps Python-Docs-$(RELEASE)
! 	cp paper-$(PAPER)/README Python-Docs-$(RELEASE)
! 	zip -q -r -9 $@ Python-Docs-$(RELEASE)
! 	rm -r Python-Docs-$(RELEASE)
! 
! HTMLPKGFILES=*.html */*.css */*.html */*.gif */*.txt
  
  html-$(RELEASE).tar:	$(ALLHTMLFILES) $(HTMLCSSFILES)
! 	mkdir Python-Docs-$(RELEASE)
! 	cd html && tar cf ../temp.tar $(HTMLPKGFILES)
! 	cd Python-Docs-$(RELEASE) && tar xf ../temp.tar
! 	rm temp.tar
! 	tar cf html-$(RELEASE).tar Python-Docs-$(RELEASE)
! 	rm -r Python-Docs-$(RELEASE)
  
  html-$(RELEASE).tgz:	html-$(RELEASE).tar
***************
*** 580,588 ****
  html-$(RELEASE).zip:	$(ALLHTMLFILES) $(HTMLCSSFILES)
  	rm -f $@
! 	cd html && \
! 		zip -q -9 ../$@ *.html */*.css */*.html */*.gif */*.txt
  
  isilo-$(RELEASE).zip:	isilo
! 	cd isilo && zip -q -9 ../$@ python-*-$(RELEASE).pdb
  
  
--- 601,617 ----
  html-$(RELEASE).zip:	$(ALLHTMLFILES) $(HTMLCSSFILES)
  	rm -f $@
! 	mkdir Python-Docs-$(RELEASE)
! 	cd html && tar cf ../temp.tar $(HTMLPKGFILES)
! 	cd Python-Docs-$(RELEASE) && tar xf ../temp.tar
! 	rm temp.tar
! 	zip -q -r -9 $@ Python-Docs-$(RELEASE)
! 	rm -r Python-Docs-$(RELEASE)
  
  isilo-$(RELEASE).zip:	isilo
! 	rm -f $@
! 	mkdir Python-Docs-$(RELEASE)
! 	cp isilo/python-*.pdb Python-Docs-$(RELEASE)
! 	zip -q -r -9 $@ Python-Docs-$(RELEASE)
! 	rm -r Python-Docs-$(RELEASE)
  
  
***************
*** 653,657 ****
  	rm -rf isilo/ref/ isilo/tut/ isilo/inst/ isilo/dist/
  	rm -rf isilo/whatsnew/
! 	rm -f isilo/python-*-$(RELEASE).pdb isilo-$(RELEASE).zip
  
  realclean distclean:  clobber
--- 682,686 ----
  	rm -rf isilo/ref/ isilo/tut/ isilo/inst/ isilo/dist/
  	rm -rf isilo/whatsnew/
! 	rm -f isilo/python-*.pdb isilo-$(RELEASE).zip
  
  realclean distclean:  clobber