[Python-checkins] r70748 - in python/branches/release26-maint: Doc/library/os.path.rst Mac/BuildScript/build-installer.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Mon Mar 30 22:04:12 2009
New Revision: 70748

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/os.path.rst
   python/branches/release26-maint/Mac/BuildScript/build-installer.py

Modified: python/branches/release26-maint/Doc/library/os.path.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/os.path.rst	(original)
+++ python/branches/release26-maint/Doc/library/os.path.rst	Mon Mar 30 22:04:12 2009
@@ -190,7 +190,7 @@
 
 .. 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
    also converts forward slashes to backward slashes.
 

Modified: python/branches/release26-maint/Mac/BuildScript/build-installer.py
==============================================================================
--- python/branches/release26-maint/Mac/BuildScript/build-installer.py	(original)
+++ python/branches/release26-maint/Mac/BuildScript/build-installer.py	Mon Mar 30 22:04:12 2009
@@ -649,6 +649,11 @@
     # several paths.
     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..."
     runCommand("%s -C --enable-framework --enable-universalsdk=%s "
                "--with-universal-archs=%s "
@@ -670,6 +675,7 @@
     runCommand("make frameworkinstallextras DESTDIR=%s"%(
         shellQuote(rootDir)))
 
+    del os.environ['DYLD_LIBRARY_PATH']
     print "Copying required shared libraries"
     if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
         runCommand("mv %s/* %s"%(