Update of /cvsroot/python/python/dist/src/Mac/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2806/Mac/scripts Modified Files: Tag: release24-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.21 retrieving revision 1.21.4.1 diff -u -d -r1.21 -r1.21.4.1 --- BuildApplet.py 18 Jul 2004 05:58:15 -0000 1.21 +++ BuildApplet.py 31 Dec 2004 11:23:20 -0000 1.21.4.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,7 +100,8 @@ 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"