From: Just van Rossum <just@letterror.com>
Date: Fri, 29 Nov 2002 21:22:33 +0000 (+0000)
Subject: Forgot to do os.path.basename() on mainprogram: a nonworking app was built if the... 
X-Git-Tag: v2.3c1~3193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24884f76c6b59aa9cd716174907a02d5d172c2fc;p=thirdparty%2FPython%2Fcpython.git

Forgot to do os.path.basename() on mainprogram: a nonworking app was built if the mainprogram wan't in the current directory. Fixed.
---

diff --git a/Mac/Lib/bundlebuilder.py b/Mac/Lib/bundlebuilder.py
index 52d657988bbd..a4811f19805c 100755
--- a/Mac/Lib/bundlebuilder.py
+++ b/Mac/Lib/bundlebuilder.py
@@ -350,16 +350,15 @@ class AppBuilder(BundleBuilder):
 			self.execpath = execpath
 
 		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
+			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)
-			mainwrapperpath = pathjoin(execdir, self.name)
+			bootstrappath = pathjoin(execdir, self.name)
 			makedirs(execdir)
-			open(mainwrapperpath, "w").write(BOOTSTRAP_SCRIPT % locals())
-			os.chmod(mainwrapperpath, 0775)
+			open(bootstrappath, "w").write(BOOTSTRAP_SCRIPT % locals())
+			os.chmod(bootstrappath, 0775)
 
 	def postProcess(self):
 		self.addPythonModules()