Moved various files over from the release23-maint branch.

4 files changed, 51 insertions, 29 deletions

diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build
index ee5c450..db6e2fb 100755
--- a/Mac/OSX/Dist/build
+++ b/Mac/OSX/Dist/build
@@ -5,9 +5,9 @@
 # TODO:  Parameterize the versions, builddirs, etc...
 
 # Script configs
-PYVERSION=2.3rc1plus
-PYVER=2.3
-BUILDNUM=8
+PYVERSION=2.4a0
+PYVER=2.4
+BUILDNUM=1
 DOCLEANUP=no
 
 PROGDIR="`dirname \"$0\"`"
@@ -133,7 +133,7 @@ python $PYTHONSRC/Mac/scripts/buildpkg.py \
 
 # ...and then make a disk image containing the package.
 mv MacPython-OSX.pkg $DMGDIR/root
-cp $RESOURCEDIR/Welcome.txt $DMGDIR/root/README.txt
+cp $RESOURCEDIR/ReadMe.txt $DMGDIR/root/ReadMe.txt
 $PROGDIR/makedmg $DMGDIR/root $DMGDIR MacPython-OSX-$PYVERSION-$BUILDNUM
 
 echo Moving $DMGDIR/MacPython-OSX-$PYVERSION-$BUILDNUM to $DESTDIR
diff --git a/Mac/OSX/Dist/resources/ReadMe.txt b/Mac/OSX/Dist/resources/ReadMe.txt
new file mode 100644
index 0000000..a01725e
--- /dev/null
+++ b/Mac/OSX/Dist/resources/ReadMe.txt
@@ -0,0 +1,32 @@
+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.
+
+Installation requires approximately 20 MB of disk
+space, ignore the message that it will take zero bytes.
+
+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
+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).
+
+The installer puts the applications in MacPython-2.3 in
+your Applications folder, command-line tools in
+/usr/local/bin and the underlying machinery in
+/Library/Frameworks/Python.framework.
+
+The PythonIDE application has a Help command that gets
+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
+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
new file mode 100644
index 0000000..b565ba8
--- /dev/null
+++ b/Mac/OSX/Dist/resources/Welcome.rtf
@@ -0,0 +1,15 @@
+{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww9920\viewh10660\viewkind0
+\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
+\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.\
+\
+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).\
+\
+See the ReadMe file for more information.}
\ No newline at end of file
diff --git a/Mac/OSX/Dist/resources/Welcome.txt b/Mac/OSX/Dist/resources/Welcome.txt
deleted file mode 100644
index c8a1161..0000000
--- a/Mac/OSX/Dist/resources/Welcome.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-This package will install MacPython 2.3rc1+ for Mac OS X 10.2. Installation
-on the Panther preview may work, on 10.1 or earlier will not work.
-
-Installation requires approximately 20 MB of disk space, ignore the
-message that it will take zero bytes. 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 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).
-
-The installer puts the applications in MacPython-2.3 in your
-Applications folder, command-line tools in /usr/local/bin and the
-underlying machinery in /Library/Frameworks/Python.framework.
-
-The PythonIDE application has a Help command that gets 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 information on Python in
-general at http://www.python.org.