diff options
| author | Ned Deily <nad@acm.org> | 2012-06-24 07:44:30 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2012-06-24 07:44:30 (GMT) |
| commit | 4c2f4e5c7732fe6731c0cb5c8819824f4a169b13 (patch) | |
| tree | cb432c0acda3f7dd0ea9cf755d621afbce02d6af | |
| parent | ec177c14d326a06204f0922bc61565b60589ba82 (diff) | |
| download | cpython-4c2f4e5c7732fe6731c0cb5c8819824f4a169b13.zip cpython-4c2f4e5c7732fe6731c0cb5c8819824f4a169b13.tar.gz cpython-4c2f4e5c7732fe6731c0cb5c8819824f4a169b13.tar.bz2 | |
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+.
| -rwxr-xr-x | Mac/BuildScript/scripts/postflight.documentation | 9 | ||||
| -rwxr-xr-x | Mac/BuildScript/scripts/postflight.framework | 14 |
2 files changed, 12 insertions, 11 deletions
diff --git a/Mac/BuildScript/scripts/postflight.documentation b/Mac/BuildScript/scripts/postflight.documentation index 31fbf2f..c4ba616 100755 --- a/Mac/BuildScript/scripts/postflight.documentation +++ b/Mac/BuildScript/scripts/postflight.documentation @@ -5,19 +5,10 @@ FWK="/Library/Frameworks/Python.framework/Versions/${PYVER}" 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" diff --git a/Mac/BuildScript/scripts/postflight.framework b/Mac/BuildScript/scripts/postflight.framework index 9fc9151..eb08297 100755 --- a/Mac/BuildScript/scripts/postflight.framework +++ b/Mac/BuildScript/scripts/postflight.framework @@ -8,14 +8,24 @@ FWK="/Library/Frameworks/Python.framework/Versions/@PYVER@" "${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}" |