[Python-checkins] python/dist/src/Mac/scripts BuildApplet.py, 1.20, 1.20.8.1

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28333/Mac/scripts

Modified Files:
      Tag: release23-maint
	BuildApplet.py 
Log Message:
Backport:
Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot
option to various tools, and do the right thing when we're doing a destroot
install.



Index: BuildApplet.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/BuildApplet.py,v
retrieving revision 1.20
retrieving revision 1.20.8.1
diff -u -d -r1.20 -r1.20.8.1
--- BuildApplet.py	25 May 2003 22:00:17 -0000	1.20
+++ BuildApplet.py	31 Dec 2004 10:44:24 -0000	1.20.8.1
@@ -53,8 +53,8 @@
 			buildtools.process(template, filename, dstfilename, 1)
 	else:
 		
-		SHORTOPTS = "o:r:ne:v?P"
-		LONGOPTS=("output=", "resource=", "noargv", "extra=", "verbose", "help", "python=")
+		SHORTOPTS = "o:r:ne:v?PR"
+		LONGOPTS=("output=", "resource=", "noargv", "extra=", "verbose", "help", "python=", "destroot=")
 		try:
 			options, args = getopt.getopt(sys.argv[1:], SHORTOPTS, LONGOPTS)
 		except getopt.error:
@@ -67,6 +67,7 @@
 		raw = 0
 		extras = []
 		verbose = None
+		destroot = ''
 		for opt, arg in options:
 			if opt in ('-o', '--output'):
 				dstfilename = arg
@@ -87,6 +88,8 @@
 				verbose = Verbose()
 			elif opt in ('-?', '--help'):
 				usage()
+			elif opt in ('-d', '--destroot'):
+				destroot = arg
 		# On OS9 always be verbose
 		if sys.platform == 'mac' and not verbose:
 			verbose = 'default'
@@ -97,21 +100,22 @@
 				buildtools.update(template, filename, dstfilename)
 			else:
 				buildtools.process(template, filename, dstfilename, 1,
-					rsrcname=rsrcfilename, others=extras, raw=raw, progress=verbose)
+						rsrcname=rsrcfilename, others=extras, raw=raw,
+						progress=verbose, destroot=destroot)
 
 def usage():
 	print "BuildApplet creates an application from a Python source file"
 	print "Usage:"
-	print "  BuildApplet     interactive, single file, no options"
-	print "  BuildApplet src1.py src2.py ...   non-interactive multiple file"
-	print "  BuildApplet [options] src.py    non-interactive single file"
+	print "	 BuildApplet	 interactive, single file, no options"
+	print "	 BuildApplet src1.py src2.py ...   non-interactive multiple file"
+	print "	 BuildApplet [options] src.py	 non-interactive single file"
 	print "Options:"
-	print "  --output o        Output file; default based on source filename, short -o"
-	print "  --resource r      Resource file; default based on source filename, short -r"
-	print "  --noargv          Build applet without drag-and-drop sys.argv emulation, short -n, OSX only"
-	print "  --extra src[:dst] Extra file to put in .app bundle, short -e, OSX only"
-	print "  --verbose         Verbose, short -v"
-	print "  --help            This message, short -?"
+	print "	 --output o		   Output file; default based on source filename, short -o"
+	print "	 --resource r	   Resource file; default based on source filename, short -r"
+	print "	 --noargv		   Build applet without drag-and-drop sys.argv emulation, short -n, OSX only"
+	print "	 --extra src[:dst] Extra file to put in .app bundle, short -e, OSX only"
+	print "	 --verbose		   Verbose, short -v"
+	print "	 --help			   This message, short -?"
 	sys.exit(1)
 
 class Verbose: