summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-05-19 19:29:24 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-05-19 19:29:24 (GMT)
commitcc00a262a654b7584d79ebe694c0922d8bd78cf8 (patch)
treedec716fdd0be9ce19a59eb066f1ceb6a78b64cbe
parentf44c6540fb416552ff9826f133bb76204af29989 (diff)
downloadcpython-cc00a262a654b7584d79ebe694c0922d8bd78cf8.zip
cpython-cc00a262a654b7584d79ebe694c0922d8bd78cf8.tar.gz
cpython-cc00a262a654b7584d79ebe694c0922d8bd78cf8.tar.bz2
Remove some traces of 'MacPython'
-rw-r--r--Mac/BuildScript/resources/ReadMe.txt7
-rw-r--r--Mac/BuildScript/resources/Welcome.rtf6
-rwxr-xr-xMac/BuildScript/scripts/postflight.patch-profile4
3 files changed, 7 insertions, 10 deletions
diff --git a/Mac/BuildScript/resources/ReadMe.txt b/Mac/BuildScript/resources/ReadMe.txt
index d99f9f6..4f78e82 100644
--- a/Mac/BuildScript/resources/ReadMe.txt
+++ b/Mac/BuildScript/resources/ReadMe.txt
@@ -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
architecture(s): $ARCHITECTURES.
@@ -12,7 +12,7 @@ You must install onto your current boot disk, even
though the installer does not enforce this, otherwise
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
access to it for Mac users including an integrated development
environment, IDLE, plus a set of pre-built extension modules
@@ -23,8 +23,5 @@ in your Applications folder, command-line tools in
/usr/local/bin and the underlying machinery in
$PYTHONFRAMEWORKINSTALLDIR.
-More information on MacPython can be found at
-http://www.python.org/download/mac/.
-
More information on Python in general can be found at
http://www.python.org.
diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf
index 0753ea4..72a6e63 100644
--- a/Mac/BuildScript/resources/Welcome.rtf
+++ b/Mac/BuildScript/resources/Welcome.rtf
@@ -5,14 +5,14 @@
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f0\fs24 \cf0 This package will install
-\f1\b MacPython $FULL_VERSION
+\f1\b Python $FULL_VERSION
\f0\b0 for
\f1\b Mac OS X $MACOSX_DEPLOYMENT_TARGET
\f0\b0 .\
\
-MacPython consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac users including an integrated development environment \b IDLE\b0 plus a set of pre-built extension modules that open up specific Macintosh technologies to Python programs.\
+Python consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac users including an integrated development environment \b IDLE\b0 plus a set of pre-built extension modules that open up specific Macintosh technologies to Python programs.\
\
See the ReadMe file for more information.\
\
\
-This package will by default update your shell profile to ensure that this version of Python is on the search path of your shell. Please deselect the "Shell profile updater" package on the package customization screen if you want to avoid this modification. Double-click \b Update Shell Profile\b0 at any time to make $FULL_VERSION the default Python.} \ No newline at end of file
+This package will by default update your shell profile to ensure that this version of Python is on the search path of your shell. Please deselect the "Shell profile updater" package on the package customization screen if you want to avoid this modification. Double-click \b Update Shell Profile\b0 at any time to make $FULL_VERSION the default Python.}
diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index aa5e93c..0c0e4ff 100755
--- a/Mac/BuildScript/scripts/postflight.patch-profile
+++ b/Mac/BuildScript/scripts/postflight.patch-profile
@@ -57,7 +57,7 @@ case "${BSH}" in
cp -fp "${RC}" "${RC}.pysave"
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}"
if [ `id -ur` = 0 ]; then
@@ -86,7 +86,7 @@ if [ -f "${PR}" ]; then
cp -fp "${PR}" "${PR}.pysave"
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}"
echo 'export PATH' >> "${PR}"