Changeset 391 for python/trunk/Mac/BuildScript/scripts

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Mac/BuildScript/scripts/postflight.documentation (modified) (1 diff)
• Mac/BuildScript/scripts/postflight.framework (modified) (1 diff)
• Mac/BuildScript/scripts/postflight.patch-profile (modified) (4 diffs)

python/trunk/Mac/BuildScript/scripts/postflight.documentation

@@ -2 +2 @@
 
 PYVER="@PYVER@"
+FWK="/Library/Frameworks/Python.framework/Versions/${PYVER}"
+FWK_DOCDIR_SUBPATH="Resources/English.lproj/Documentation"
+FWK_DOCDIR="${FWK}/${FWK_DOCDIR_SUBPATH}"
+APPDIR="/Applications/Python ${PYVER}"
+SHARE_DIR="${FWK}/share"
+SHARE_DOCDIR="${SHARE_DIR}/doc/python${PYVER}"
+SHARE_DOCDIR_TO_FWK="../../.."
 
-if [ -d /Developer/Documentation ]; then
-        if [ ! -d /Developer/Documentation/Python ]; then
-                mkdir -p /Developer/Documentation/Python
-        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"
+fi
 
-        ln -fhs /Library/Frameworks/Python.framework/Versions/${PYVER}/Resources/English.lproj/Documentation "/Developer/Documentation/Python/Reference Documentation @PYVER@"
+# make share/doc link in framework for command line users
+if [ -d "${SHARE_DIR}" ]; then
+    mkdir -m 775 -p "${SHARE_DOCDIR}"
+    # make relative link to html doc directory
+    ln -fhs "${SHARE_DOCDIR_TO_FWK}/${FWK_DOCDIR_SUBPATH}" "${SHARE_DOCDIR}/html"
 fi
+

python/trunk/Mac/BuildScript/scripts/postflight.framework

@@ -9 +9 @@
 "${FWK}/bin/python@PYVER@" -Wi -tt \
     "${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 -tt -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}"

python/trunk/Mac/BuildScript/scripts/postflight.patch-profile

@@ -21 +21 @@
 BSH="`basename "${theShell}"`"
 case "${BSH}" in
-bash|ksh|sh|*csh)
+bash|ksh|sh|*csh|zsh)
         if [ `id -ur` = 0 ]; then
                 P=`su - ${USER} -c 'echo A-X-4-X@@$PATH@@X-4-X-A' | grep 'A-X-4-X@@.*@@X-4-X-A' | sed -e 's/^A-X-4-X@@//g' -e 's/@@X-4-X-A$//g'`
@@ -58 +58 @@
         fi
         echo "" >> "${RC}"
-        echo "# Setting PATH for MacPython ${PYVER}" >> "${RC}"
+        echo "# Setting PATH for Python ${PYVER}" >> "${RC}"
         echo "# The orginal version is saved in .cshrc.pysave" >> "${RC}"
         echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}"
@@ -77 +77 @@
         fi
         ;;
+zsh)
+        PR="${HOME}/.zprofile"
+        ;;
 *sh)
         PR="${HOME}/.profile"
@@ -87 +90 @@
 fi
 echo "" >> "${PR}"
-echo "# Setting PATH for MacPython ${PYVER}" >> "${PR}"
+echo "# Setting PATH for Python ${PYVER}" >> "${PR}"
 echo "# The orginal version is saved in `basename ${PR}`.pysave" >> "${PR}"
 echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}"