Mercurial > cpython-lru_cache-weakref

changeset 77676:99708bb33bf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update compileall calls in OS X installer postflight script to properly skip uncompilable files and to compile existing files in site-packages if reinstalling. Also, no longer attempt to install a documentation link in /Developer as that no longer necessarily exists with Xcode 4.3+.
author Ned Deily <nad@acm.org>
date Sun, 24 Jun 2012 00:44:30 -0700
parents e989e7586da6
children 4f41c5b9433b
files Mac/BuildScript/scripts/postflight.documentation Mac/BuildScript/scripts/postflight.framework
diffstat 2 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Mac/BuildScript/scripts/postflight.documentation	Sun Jun 24 03:27:43 2012 -0400
+++ b/Mac/BuildScript/scripts/postflight.documentation	Sun Jun 24 00:44:30 2012 -0700
@@ -5,19 +5,10 @@
 FWK_DOCDIR_SUBPATH="Resources/English.lproj/Documentation"
 FWK_DOCDIR="${FWK}/${FWK_DOCDIR_SUBPATH}"
 APPDIR="/Applications/Python ${PYVER}"
-DEV_DOCDIR="/Developer/Documentation"
 SHARE_DIR="${FWK}/share"
 SHARE_DOCDIR="${SHARE_DIR}/doc/python${PYVER}"
 SHARE_DOCDIR_TO_FWK="../../.."
 
-# make link in /Developer/Documentation/ for Xcode users
-if [ -d "${DEV_DOCDIR}" ]; then
-    if [ ! -d "${DEV_DOCDIR}/Python" ]; then
-        mkdir -p "${DEV_DOCDIR}/Python"
-    fi
-    ln -fhs "${FWK_DOCDIR}" "${DEV_DOCDIR}/Python/Reference Documentation ${PYVER}"
-fi
-
 # make link in /Applications/Python m.n/ for Finder users
 if [ -d "${APPDIR}" ]; then
     ln -fhs "${FWK_DOCDIR}/index.html" "${APPDIR}/Python Documentation.html"
--- a/Mac/BuildScript/scripts/postflight.framework	Sun Jun 24 03:27:43 2012 -0400
+++ b/Mac/BuildScript/scripts/postflight.framework	Sun Jun 24 00:44:30 2012 -0700
@@ -8,14 +8,24 @@
 
 "${FWK}/bin/python@PYVER@" -Wi \
     "${FWK}/lib/python${PYVER}/compileall.py" \
-    -x badsyntax -x site-packages \
+    -f -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
     "${FWK}/lib/python${PYVER}"
 
 "${FWK}/bin/python@PYVER@" -Wi -O \
     "${FWK}/lib/python${PYVER}/compileall.py" \
-    -x badsyntax -x site-packages \
+    -f -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
     "${FWK}/lib/python${PYVER}"
 
+"${FWK}/bin/python@PYVER@" -Wi \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
+    -f -x badsyntax \
+    "${FWK}/lib/python${PYVER}/site-packages"
+
+"${FWK}/bin/python@PYVER@" -Wi -O \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
+    -f -x badsyntax \
+    "${FWK}/lib/python${PYVER}/site-packages"
+
 chgrp -R admin "${FWK}"
 chmod -R g+w "${FWK}"