nad0022-py3k-30   by default install versioned-only links in /usr/local/bin for 3.x

APPLIES     py3k, 3.0

diff -r db2b361fa419 Mac/BuildScript/build-installer.py
--- Mac/BuildScript/build-installer.py	Tue Mar 31 21:20:11 2009 -0500
+++ Mac/BuildScript/build-installer.py	Tue Mar 31 23:46:27 2009 -0500
@@ -222,10 +222,11 @@
         readme="""\
             This package installs the unix tools in /usr/local/bin for
             compatibility with older releases of Python. This package
-            is not necessary to use Python.
+            is not necessary to use Python.  For Python 3, only the
+            versioned names are installed, i.e. /usr/local/python%(VER)s
             """,
         required=False,
-        selected='unselected',
+        selected='selected',
     ),
     dict(
         name="PythonDocumentation",
@@ -771,6 +772,7 @@
     fp.close()
 
     # Add symlinks in /usr/local/bin, using relative links
+    # For python 3, only include versioned links and 2to3
     usr_local_bin = os.path.join(rootDir, 'usr', 'local', 'bin')
     to_framework = os.path.join('..', '..', '..', 'Library', 'Frameworks',
             'Python.framework', 'Versions', version, 'bin')
@@ -779,8 +781,9 @@
     os.makedirs(usr_local_bin)
     for fn in os.listdir(
                 os.path.join(frmDir, 'Versions', version, 'bin')):
-        os.symlink(os.path.join(to_framework, fn),
-                   os.path.join(usr_local_bin, fn))
+        if version in fn or fn == "2to3":
+            os.symlink(os.path.join(to_framework, fn),
+                       os.path.join(usr_local_bin, fn))
 
     os.chdir(curdir)
 
diff -r db2b361fa419 Mac/BuildScript/resources/ReadMe.txt
--- Mac/BuildScript/resources/ReadMe.txt	Tue Mar 31 21:20:11 2009 -0500
+++ Mac/BuildScript/resources/ReadMe.txt	Tue Mar 31 23:46:27 2009 -0500
@@ -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 @@
 though the installer does not enforce this, otherwise
 things will not work.
 
-MacPython consists of the Python programming language
+Python for OS X 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
@@ -21,11 +21,16 @@
 The installer puts the applications in "Python $VERSION" 
 in your Applications folder, and the underlying machinery in
 $PYTHONFRAMEWORKINSTALLDIR. It can optionally place
-links to the command-line tools in /usr/local as well,
-by default you have to add the "bin" directory inside
-the framework to you shell's search path.
+links to the command-line tools in /usr/local/bin as well.
+For Python 3, only links to the versioned names of the
+commands are installed in /usr/local/bin.  Both versioned
+and unversioned names are available if you add the "bin"
+directory inside the framework to your shell's search path.
+Select the "PythonProfileChanges" packages of the installer
+to do this.  You can also use the "Update Shell Profile"
+command at any time after installation.
 
-More information on MacPython can be found at
+More information on Python for OS X can be found at
 http://www.python.org/download/mac/.
 
 More information on Python in general can be found at
diff -r db2b361fa419 Mac/BuildScript/resources/Welcome.rtf
--- Mac/BuildScript/resources/Welcome.rtf	Tue Mar 31 21:20:11 2009 -0500
+++ Mac/BuildScript/resources/Welcome.rtf	Tue Mar 31 23:46:27 2009 -0500
@@ -5,15 +5,15 @@
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 
 \f0\fs24 \cf0 This package will install 
-\b MacPython $FULL_VERSION
+\b Python $FULL_VERSION
 \b0  for 
 \b Mac OS X $MACOSX_DEPLOYMENT_TARGET
 \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 for OS X 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.\
 \
 
 \b NOTE: 
-\b0 This package will by default not update your shell profile and will also not install files in /usr/local.  Double-click \b Update Shell Profile\b0  at any time to make $FULL_VERSION the default Python.}
+\b0 This package will by default not update your shell profile.  Only versioned file names are installed in /usr/local/bin.  Double-click \b Update Shell Profile\b0  at any time to make $FULL_VERSION the default Python.}