[Python-checkins] r70804 - in python/branches/release26-maint: Mac/BuildScript/build-installer.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Mar 31 15:23:26 2009
New Revision: 70804

Log:
Merged revisions 70802 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70802 | ronald.oussoren | 2009-03-31 08:20:45 -0500 (Tue, 31 Mar 2009) | 4 lines
  
  Minor update to OSX build-installer script, needed
  to ensure that the build will succeed in a clean
  checkout and with a non-default deployment target.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Mac/BuildScript/build-installer.py

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	Tue Mar 31 15:23:26 2009
@@ -1018,7 +1018,18 @@
 
     # Now build python itself
     buildPython()
+
+    # And then build the documentation
+    # Remove the Deployment Target from the shell
+    # environment, it's no longer needed and
+    # an unexpected build target can cause problems
+    # when Sphinx and its dependencies need to
+    # be (re-)installed.
+    del os.environ['MACOSX_DEPLOYMENT_TARGET']
     buildPythonDocs()
+
+
+    # Prepare the applications folder
     fn = os.path.join(WORKDIR, "_root", "Applications",
                 "Python %s"%(getVersion(),), "Update Shell Profile.command")
     patchScript("scripts/postflight.patch-profile",  fn)