Starting on the 2.4 MacPython installer.

3 files changed, 38 insertions, 16 deletions

diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build
index db6e2fb..603012e 100755
--- a/Mac/OSX/Dist/build
+++ b/Mac/OSX/Dist/build
@@ -1,11 +1,11 @@
 #!/bin/sh -e
 #----------------------------------------------------------------------
-# Build MacPython 2.3 and make an Installer package of it
+# Build MacPython 2.4 and make an Installer package of it
 
 # TODO:  Parameterize the versions, builddirs, etc...
 
 # Script configs
-PYVERSION=2.4a0
+PYVERSION=2.4.1
 PYVER=2.4
 BUILDNUM=1
 DOCLEANUP=no
@@ -19,6 +19,16 @@ x/*) ;;
    ;;
 esac
 
+if [ ! -e /usr/bin/python ]; then
+	echo "No /usr/bin/python; this script expects to be run on 10.3 only"
+	exit 1
+fi
+vers=`/usr/bin/python -V 2>&1`
+if [ "$vers" != "Python 2.3" ]; then
+    echo "/usr/bin/python is not version 2.3; this script expects to be run on 10.3 only"
+    exit 1
+fi
+
 TMPDIR=/tmp/_py
 #TMPDIR=/projects/_py
 
@@ -29,6 +39,20 @@ DESTDIR=$TMPDIR/dist
 PYTHONSRC=$PROGDIR/../../..
 WASTEDIR=$PYTHONSRC/../waste
 
+# Check that the Apple Python 2.3 Makefile fixes have been applied on this
+# machine
+if python $PYTHONSRCDIR/Mac/OSX/fixapplepython23.py -n; then
+    :
+else
+    echo
+    echo This installer will also install a fix to Apple-installed 2.3
+    echo to make building extensions work in the face of other Pythons.
+    echo But this system needs to have that fix to be able to put it in the installer.
+    echo
+    echo Please run $PYTHONSRCDIR/Mac/OSX/fixapplepython23.py to install the fix.
+    exit
+fi
+
 case x$1 in
 x)
 	BUILDROOT=$TMPDIR/build
@@ -66,12 +90,6 @@ if [ "$welcome" = "n" -o "$welcome" = "N" ]; then
 	exit
 fi
 
-# Check if we should build and install the docs, but only if it
-# doesn't appear to be done already.  TODO: fix this path to be version independent
-if [ ! -e "build/temp.darwin-6.3-Power Macintosh-2.3/build-html/build-html idx" ]; then
-    read -p "Build the Python docs? (y/N)? " builddocs
-fi
-
 # If the filesystem is case-sensitive then "python" will be built, but
 # some parts of the install expect "python.exe which is what is built
 # on a case-insensitive filesystem.  Make a link just in case it is
@@ -91,6 +109,10 @@ make
 make DIRMODE=775 EXEMODE=775 FILEMODE=664 DESTDIR=$INSTALLROOT frameworkinstall
 make DIRMODE=775 EXEMODE=775 FILEMODE=664 DESTDIR=$INSTALLROOT frameworkinstallextras
 
+# Install the Makefile fixes
+config=System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/config
+(cd / ; tar cf - $config/Makefile $config/PantherPythonFix) | (cd $INSTALLROOT; tar xf -)
+
 # Unfortunately all the ...MODE arguments above still don't do the trick.
 # Cop out, and recursively set everything group-writeable.
 chmod -R ug+w $INSTALLROOT
@@ -121,7 +143,7 @@ rm -rf MacPython-OSX.pkg
 python $PYTHONSRC/Mac/scripts/buildpkg.py \
     --Title=MacPython-OSX \
     --Version=$PYVERSION-$BUILDNUM \
-    --Description="Python $PYVERSION for Mac OS X, framework based" \
+    --Description="Python $PYVERSION for Mac OS X 10.3, framework based" \
     --NeedsAuthorization="YES" \
     --Relocatable="NO" \
     --InstallOnly="YES" \
diff --git a/Mac/OSX/Dist/resources/ReadMe.txt b/Mac/OSX/Dist/resources/ReadMe.txt
index a01725e..1fdeed9 100644
--- a/Mac/OSX/Dist/resources/ReadMe.txt
+++ b/Mac/OSX/Dist/resources/ReadMe.txt
@@ -1,6 +1,6 @@
-This package will install MacPython 2.3.2 for Mac OS X
-10.2. Installation on the Panther preview may work, on
-10.1 or earlier will not work.
+This package will install MacPython 2.4.1 for Mac OS X
+10.3. Separate installers are available for older versions
+of MacOSX, see the homepage, below.
 
 Installation requires approximately 20 MB of disk
 space, ignore the message that it will take zero bytes.
@@ -27,6 +27,6 @@ you started quickly with MacPython and contains
 references to other documentation.
 
 More information on MacPython can be found at
-http://www.cwi.nl/~jack/macpython.html, more
+http://www.cwi.nl/~jack/macpython, more
 information on Python in general at
 http://www.python.org.
diff --git a/Mac/OSX/Dist/resources/Welcome.rtf b/Mac/OSX/Dist/resources/Welcome.rtf
index b565ba8..7756eb3 100644
--- a/Mac/OSX/Dist/resources/Welcome.rtf
+++ b/Mac/OSX/Dist/resources/Welcome.rtf
@@ -5,10 +5,10 @@
 \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 2.3
+\f1\b MacPython 2.4.1
 \f0\b0  for 
-\f1\b Mac OS X 10.2
-\f0\b0 . Installation on the Panther preview may work, on 10.1 or earlier will not work.\
+\f1\b Mac OS X 10.3
+\f0\b0 .\
 \
 MacPython consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac users (an integrated development environment, a Python extension package manager), plus a set of pre-built extension modules that open up specific Macintosh technologies to Python programs (Carbon, AppleScript, Quicktime, more).\
 \