Merged revisions 72789 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72789 | ronald.oussoren | 2009-05-19 21:29:24 +0200 (Tue, 19 May 2009) | 2 lines

  Remove some traces of 'MacPython'
........
This commit is contained in:
Ronald Oussoren 2009-05-19 19:30:44 +00:00
parent 69026bb75f
commit 360bcac5fc
2 changed files with 4 additions and 7 deletions

View File

@ -1,4 +1,4 @@
This package will install MacPython $FULL_VERSION for Mac OS X This package will install Python $FULL_VERSION for Mac OS X
$MACOSX_DEPLOYMENT_TARGET for the following $MACOSX_DEPLOYMENT_TARGET for the following
architecture(s): $ARCHITECTURES. architecture(s): $ARCHITECTURES.
@ -12,7 +12,7 @@ You must install onto your current boot disk, even
though the installer does not enforce this, otherwise though the installer does not enforce this, otherwise
things will not work. things will not work.
MacPython consists of the Python programming language Python consists of the Python programming language
interpreter, plus a set of programs to allow easy interpreter, plus a set of programs to allow easy
access to it for Mac users including an integrated development access to it for Mac users including an integrated development
environment, IDLE, plus a set of pre-built extension modules environment, IDLE, plus a set of pre-built extension modules
@ -25,8 +25,5 @@ links to the command-line tools in /usr/local as well,
by default you have to add the "bin" directory inside by default you have to add the "bin" directory inside
the framework to you shell's search path. the framework to you shell's search path.
More information on MacPython can be found at
http://www.python.org/download/mac/.
More information on Python in general can be found at More information on Python in general can be found at
http://www.python.org. http://www.python.org.

View File

@ -57,7 +57,7 @@ case "${BSH}" in
cp -fp "${RC}" "${RC}.pysave" cp -fp "${RC}" "${RC}.pysave"
fi fi
echo "" >> "${RC}" 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 "# The orginal version is saved in .cshrc.pysave" >> "${RC}"
echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}" echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}"
if [ `id -ur` = 0 ]; then if [ `id -ur` = 0 ]; then
@ -86,7 +86,7 @@ if [ -f "${PR}" ]; then
cp -fp "${PR}" "${PR}.pysave" cp -fp "${PR}" "${PR}.pysave"
fi fi
echo "" >> "${PR}" 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 "# The orginal version is saved in `basename ${PR}`.pysave" >> "${PR}"
echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}" echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}"
echo 'export PATH' >> "${PR}" echo 'export PATH' >> "${PR}"