Updated version numbers.
diff --git a/Mac/OSX/Dist/README.txt b/Mac/OSX/Dist/README.txt
index 918b15d..371c3fe 100644
--- a/Mac/OSX/Dist/README.txt
+++ b/Mac/OSX/Dist/README.txt
@@ -17,6 +17,7 @@
- Edit ``resource/ReadMe.txt`` and ``resources/Welcome.rtf`` to reflect
version number and such.
- Edit ``build`` to change ``PYVERSION``, ``PYVER`` and ``BUILDNUM``.
+- Edit ``resources/postflight`` and change version number.
- Run ``./build``. Optionally you can pass the name of the directory
where Python will be built, so you don't have to wait for the complete
build when you're debugging the process. For the final distribution use
diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build
index db6e2fb..b5ebe3e 100755
--- a/Mac/OSX/Dist/build
+++ b/Mac/OSX/Dist/build
@@ -1,12 +1,12 @@
#!/bin/sh -e
#----------------------------------------------------------------------
-# Build MacPython 2.3 and make an Installer package of it
+# Build MacPython 2.5 and make an Installer package of it
# TODO: Parameterize the versions, builddirs, etc...
# Script configs
-PYVERSION=2.4a0
-PYVER=2.4
+PYVERSION=2.5a0
+PYVER=2.5
BUILDNUM=1
DOCLEANUP=no
@@ -86,7 +86,8 @@
ln -s $WASTEDIR waste
fi
-$PYTHONSRC/configure -C --enable-framework LDFLAGS=-Wl,-x
+#$PYTHONSRC/configure -C --enable-framework LDFLAGS=-Wl,-x
+$PYTHONSRC/configure -C --enable-framework
make
make DIRMODE=775 EXEMODE=775 FILEMODE=664 DESTDIR=$INSTALLROOT frameworkinstall
make DIRMODE=775 EXEMODE=775 FILEMODE=664 DESTDIR=$INSTALLROOT frameworkinstallextras
diff --git a/Mac/OSX/Dist/resources/ReadMe.txt b/Mac/OSX/Dist/resources/ReadMe.txt
index a01725e..39a7b82 100644
--- a/Mac/OSX/Dist/resources/ReadMe.txt
+++ b/Mac/OSX/Dist/resources/ReadMe.txt
@@ -1,6 +1,5 @@
-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.5a0 for Mac OS X
+10.3.
Installation requires approximately 20 MB of disk
space, ignore the message that it will take zero bytes.
@@ -17,7 +16,7 @@
specific Macintosh technologies to Python programs
(Carbon, AppleScript, Quicktime, more).
-The installer puts the applications in MacPython-2.3 in
+The installer puts the applications in MacPython-2.5 in
your Applications folder, command-line tools in
/usr/local/bin and the underlying machinery in
/Library/Frameworks/Python.framework.
@@ -27,6 +26,6 @@
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..ec6bb1a 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.5a0
\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 . Installation on 10.2 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).\
\
diff --git a/Mac/OSX/Dist/resources/postflight b/Mac/OSX/Dist/resources/postflight
index e5c7f9d..878b6d4 100755
--- a/Mac/OSX/Dist/resources/postflight
+++ b/Mac/OSX/Dist/resources/postflight
@@ -4,7 +4,7 @@
# installed.
#----------------------------------------------------------------------
-PYVER=2.3
+PYVER=2.5
PKG=$1
DEST=$2
diff --git a/Mac/OSXResources/app/Info.plist b/Mac/OSXResources/app/Info.plist
index d6b7bed..387bbed 100644
--- a/Mac/OSXResources/app/Info.plist
+++ b/Mac/OSXResources/app/Info.plist
@@ -20,7 +20,7 @@
<key>CFBundleExecutable</key>
<string>Python</string>
<key>CFBundleGetInfoString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key>
<array>
<string>Documentation</string>
@@ -37,17 +37,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleName</key>
<string>Python</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CFBundleSignature</key>
<string>PytX</string>
<key>CFBundleVersion</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
index 51193fd..f8a8bc1 100644
--- a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
+++ b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
Binary files differ
diff --git a/Mac/OSXResources/framework/English.lproj/InfoPlist.strings b/Mac/OSXResources/framework/English.lproj/InfoPlist.strings
index 954066a..cc24bfc 100644
--- a/Mac/OSXResources/framework/English.lproj/InfoPlist.strings
+++ b/Mac/OSXResources/framework/English.lproj/InfoPlist.strings
Binary files differ
diff --git a/Mac/OSXResources/framework/version.plist b/Mac/OSXResources/framework/version.plist
index 4c28ffa..7527442 100644
--- a/Mac/OSXResources/framework/version.plist
+++ b/Mac/OSXResources/framework/version.plist
@@ -5,9 +5,9 @@
<key>BuildVersion</key>
<string>1</string>
<key>CFBundleShortVersionString</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CFBundleVersion</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>ProjectName</key>
<string>Python</string>
<key>ReleaseStatus</key>
diff --git a/Mac/Tools/IDE/PackageManager.plist b/Mac/Tools/IDE/PackageManager.plist
index d61e00f..a79dee1 100644
--- a/Mac/Tools/IDE/PackageManager.plist
+++ b/Mac/Tools/IDE/PackageManager.plist
@@ -10,7 +10,7 @@
<key>CFBundleExecutable</key>
<string>PackageManager</string>
<key>CFBundleGetInfoString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleIconFile</key>
<string>PackageManager.icns</string>
<key>CFBundleIdentifier</key>
@@ -18,17 +18,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleName</key>
<string>PythonIDE</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CFBundleSignature</key>
<string>Pide</string>
<key>CFBundleVersion</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/Mac/Tools/IDE/PythonIDE.plist b/Mac/Tools/IDE/PythonIDE.plist
index 0ba8f32..dd61c0c 100644
--- a/Mac/Tools/IDE/PythonIDE.plist
+++ b/Mac/Tools/IDE/PythonIDE.plist
@@ -26,7 +26,7 @@
<key>CFBundleExecutable</key>
<string>PythonIDE</string>
<key>CFBundleGetInfoString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key>
<array>
<string>PythonDocumentation</string>
@@ -42,17 +42,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleName</key>
<string>PythonIDE</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CFBundleSignature</key>
<string>Pide</string>
<key>CFBundleVersion</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
diff --git a/Mac/scripts/BuildApplet.plist b/Mac/scripts/BuildApplet.plist
index ec62881..0f142c9 100644
--- a/Mac/scripts/BuildApplet.plist
+++ b/Mac/scripts/BuildApplet.plist
@@ -26,7 +26,7 @@
<key>CFBundleExecutable</key>
<string>BuildApplet</string>
<key>CFBundleGetInfoString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleIconFile</key>
<string>BuildApplet.icns</string>
<key>CFBundleIdentifier</key>
@@ -34,17 +34,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.4alpha1, (c) 2004 Python Software Foundation.</string>
+ <string>2.5alpha0, (c) 2004 Python Software Foundation.</string>
<key>CFBundleName</key>
<string>PythonIDE</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CFBundleSignature</key>
<string>Pide</string>
<key>CFBundleVersion</key>
- <string>2.4alpha1</string>
+ <string>2.5alpha0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>