[Python-checkins] python/dist/src/Mac/Lib bundlebuilder.py,1.12,1.13

jvr@users.sourceforge.net jvr@users.sourceforge.net
Fri, 29 Nov 2002 13:22:36 -0800


Update of /cvsroot/python/python/dist/src/Mac/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv31817

Modified Files:
	bundlebuilder.py 
Log Message:
Forgot to do os.path.basename() on mainprogram: a nonworking app was built if the mainprogram wan't in the current directory. Fixed.

Index: bundlebuilder.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/bundlebuilder.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** bundlebuilder.py	29 Nov 2002 20:06:52 -0000	1.12
--- bundlebuilder.py	29 Nov 2002 21:22:33 -0000	1.13
***************
*** 351,364 ****
  
  		if self.mainprogram is not None:
! 			mainname = os.path.basename(self.mainprogram)
! 			self.files.append((self.mainprogram, pathjoin(resdir, mainname)))
! 			# Create execve wrapper
! 			mainprogram = self.mainprogram  # XXX for locals() call
  			executable = os.path.basename(self.executable)
  			execdir = pathjoin(self.bundlepath, self.execdir)
! 			mainwrapperpath = pathjoin(execdir, self.name)
  			makedirs(execdir)
! 			open(mainwrapperpath, "w").write(BOOTSTRAP_SCRIPT % locals())
! 			os.chmod(mainwrapperpath, 0775)
  
  	def postProcess(self):
--- 351,363 ----
  
  		if self.mainprogram is not None:
! 			mainprogram = os.path.basename(self.mainprogram)
! 			self.files.append((self.mainprogram, pathjoin(resdir, mainprogram)))
! 			# Write bootstrap script
  			executable = os.path.basename(self.executable)
  			execdir = pathjoin(self.bundlepath, self.execdir)
! 			bootstrappath = pathjoin(execdir, self.name)
  			makedirs(execdir)
! 			open(bootstrappath, "w").write(BOOTSTRAP_SCRIPT % locals())
! 			os.chmod(bootstrappath, 0775)
  
  	def postProcess(self):