[Python-checkins] python/dist/src/Mac/OSX/Doc setup.py,1.1,1.2

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/OSX/Doc
In directory sc8-pr-cvs1:/tmp/cvs-serv9930/Mac/OSX/Doc

Modified Files:
	setup.py 
Log Message:
The MacPython introductory help is now called MacPython Help, and the
optional full documentation Python Documentation.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Doc/setup.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup.py	14 Feb 2003 23:46:22 -0000	1.1
--- setup.py	16 Mar 2003 22:09:22 -0000	1.2
***************
*** 33,37 ****
  		self.build_dest = None
  		self.download = 1
! 		self.doc_version = '2.2.1'
  		
  	def finalize_options(self):
--- 33,37 ----
  		self.build_dest = None
  		self.download = 1
! 		self.doc_version = '2.2.2'
  		
  	def finalize_options(self):
***************
*** 47,57 ****
  	def downloadDocs(self):
  		workdir = os.getcwd()
! 		self.mkpath(self.build_html)
  		os.chdir(self.build_base)
! 		self.spawn('curl','-O', 'http://www.python.org/ftp/python/doc/%s/html-%s.tgz' % (self.doc_version,self.doc_version))
! 		os.chdir(workdir)
! 		os.chdir(self.build_html)
! 		self.spawn('tar', '-xzf', '../html-%s.tgz' % self.doc_version)
  		os.chdir(workdir)
  		
  	def buildDocsFromSource(self):
--- 47,64 ----
  	def downloadDocs(self):
  		workdir = os.getcwd()
! 		url = 'http://www.python.org/ftp/python/doc/%s/html-%s.tgz' % \
! 			(self.doc_version,self.doc_version)
  		os.chdir(self.build_base)
! 		self.spawn('curl','-O', url)
  		os.chdir(workdir)
+ 		tarfile = 'html-%s.tgz' % self.doc_version
+ ## This no longer works due to name changes
+ ##		self.mkpath(self.build_html)
+ ##		os.chdir(self.build_html)
+ ##		self.spawn('tar', '-xzf', '../' + tarfile)
+ ##		os.chdir(workdir)
+ 		print "** Please unpack %s" % os.path.join(self.build_base, tarfile)
+ 		print "** Unpack the files into %s" % self.build_html
+ 		raise RuntimeError, "You need to unpack the docs manually"
  		
  	def buildDocsFromSource(self):
***************
*** 76,80 ****
  		origIndex = file(os.path.join(self.build_html,ind_html))
  		r = re.compile('<style type="text/css">.*</style>', re.DOTALL)
! 		hackedIndex.write(r.sub('<META NAME="AppleTitle" CONTENT="Python Help">',origIndex.read()))
  	
  	def hackFile(self,d,f):
--- 83,87 ----
  		origIndex = file(os.path.join(self.build_html,ind_html))
  		r = re.compile('<style type="text/css">.*</style>', re.DOTALL)
! 		hackedIndex.write(r.sub('<META NAME="AppleTitle" CONTENT="Python Documentation">',origIndex.read()))
  	
  	def hackFile(self,d,f):
***************
*** 108,111 ****
--- 115,119 ----
  	def run(self):
  		self.ensure_finalized()
+ 		self.mkpath(self.build_base)
  		self.ensureHtml()
  		if not os.path.isdir(self.build_html):
***************
*** 143,147 ****
  			self.build_dest = build_cmd.build_dest
  		if self.install_doc == None:
! 			self.install_doc = os.path.join(self.prefix, 'Resources/English.lproj/Documentation')
  		print 'INSTALL', self.build_dest, '->', self.install_doc
  		
--- 151,155 ----
  			self.build_dest = build_cmd.build_dest
  		if self.install_doc == None:
! 			self.install_doc = os.path.join(self.prefix, 'Resources/Python.app/Contents/Resources/English.lproj/PythonDocumentation')
  		print 'INSTALL', self.build_dest, '->', self.install_doc