traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 70746 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70746 | ronald.oussoren | 2009-03-30 15:02:08 -0500 (Mon, 30 Mar 2009) | 2 lines

  Fix for issue 13095
........
This commit is contained in:
Ronald Oussoren 2009-03-30 20:04:12 +00:00
parent ed96036049
commit 524e36a5d0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/os.path.rst
View File

@ -190,7 +190,7 @@ write files see :func:`open`, and for accessing the filesystem see the
.. function:: normcase(path) .. function:: normcase(path)
Normalize the case of a pathname. On Unix, this returns the path unchanged; on Normalize the case of a pathname. On Unix and MacOSX, this returns the path unchanged; on
case-insensitive filesystems, it converts the path to lowercase. On Windows, it case-insensitive filesystems, it converts the path to lowercase. On Windows, it
also converts forward slashes to backward slashes. also converts forward slashes to backward slashes.

6
Mac/BuildScript/build-installer.py
View File

@ -649,6 +649,11 @@ def buildPython():
# several paths. # several paths.
version = getVersion() version = getVersion()
# Since the extra libs are not in their installed framework location
# during the build, augment the library path so that the interpreter
# will find them during its extension import sanity checks.
os.environ['DYLD_LIBRARY_PATH'] = os.path.join(WORKDIR,
'libraries', 'usr', 'local', 'lib')
print "Running configure..." print "Running configure..."
runCommand("%s -C --enable-framework --enable-universalsdk=%s " runCommand("%s -C --enable-framework --enable-universalsdk=%s "
"--with-universal-archs=%s " "--with-universal-archs=%s "
@ -670,6 +675,7 @@ def buildPython():
runCommand("make frameworkinstallextras DESTDIR=%s"%( runCommand("make frameworkinstallextras DESTDIR=%s"%(
shellQuote(rootDir))) shellQuote(rootDir)))
del os.environ['DYLD_LIBRARY_PATH']
print "Copying required shared libraries" print "Copying required shared libraries"
if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')): if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
runCommand("mv %s/* %s"%( runCommand("mv %s/* %s"%(