mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 15:43:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix for #1091468: DESTROOTed frameworkinstalls fail. Added a --destroot

Browse source 
option to various tools, and do the right thing when we're doing a destroot
install.

Will backport to 2.4 and 2.3.
This commit is contained in:
Jack Jansen 2004-12-27 15:51:03 +00:00
parent be95462c1c
commit c77f6dfd92
4 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/plat-mac/buildtools.py
View file

@ -60,7 +60,7 @@ def findtemplate(template=None):
return file
def process(template, filename, destname, copy_codefragment=0,
rsrcname=None, others=[], raw=0, progress="default"):
rsrcname=None, others=[], raw=0, progress="default", destroot=""):
if progress == "default":
progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120)
@ -108,7 +108,7 @@ def process(template, filename, destname, copy_codefragment=0,
except os.error:
pass
process_common(template, progress, code, rsrcname, destname, 0,
copy_codefragment, raw, others, filename)
copy_codefragment, raw, others, filename, destroot)
def update(template, filename, output):
@ -130,10 +130,10 @@ def update(template, filename, output):
def process_common(template, progress, code, rsrcname, destname, is_update,
copy_codefragment, raw=0, others=[], filename=None):
copy_codefragment, raw=0, others=[], filename=None, destroot=""):
if MacOS.runtimemodel == 'macho':
return process_common_macho(template, progress, code, rsrcname, destname,
is_update, raw, others, filename)
is_update, raw, others, filename, destroot)
if others:
raise BuildError, "Extra files only allowed for MachoPython applets"
# Create FSSpecs for the various files
@ -265,7 +265,7 @@ def process_common(template, progress, code, rsrcname, destname, is_update,
progress.inc(0)
def process_common_macho(template, progress, code, rsrcname, destname, is_update,
raw=0, others=[], filename=None):
raw=0, others=[], filename=None, destroot=""):
# Check that we have a filename
if filename is None:
raise BuildError, "Need source filename on MacOSX"
@ -302,6 +302,7 @@ def process_common_macho(template, progress, code, rsrcname, destname, is_update
builder.mainprogram = filename
builder.builddir = destdir
builder.name = shortname
builder.destroot = destroot
if rsrcname:
realrsrcname = macresource.resource_pathname(rsrcname)
builder.files.append((realrsrcname,