Updated version numbers.

diff --git a/Mac/OSX/Dist/README.txt b/Mac/OSX/Dist/README.txt
index 918b15de206c26592b97378f9e06ffeaa831d031..371c3fe99a7bf87c48053a9b7f7f8744e4fc65c6 100644 (file)
--- a/Mac/OSX/Dist/README.txt
+++ b/Mac/OSX/Dist/README.txt
@@ -17,6 +17,7 @@ Here are the steps you ned to follow to build a MacPython installer:
 - 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 db6e2fb1161fbc272eae125b2fe00cae55718ebe..b5ebe3edbcf26e2aefe8a9a405e877ba8cf4ad07 100755 (executable)
--- 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 @@ if [ ! -e waste ]; then
     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 a01725e73476edb2e7b7a9986b9f7e8a2947f2eb..39a7b824210a0e6b384dc3e80d8ff2ade47bf38e 100644 (file)
--- 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 @@ 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
+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 @@ 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 b565ba82093a7ba9e66024c462d37972ae0ce44b..ec6bb1a4048cc7055b90989f6cc76fdccbffcb41 100644 (file)
--- 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 e5c7f9de22b0dc1fb7ad75bf1794bab69d0b54a1..878b6d4b64696c7157863a42a784947fdd70c649 100755 (executable)
--- 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 d6b7bed70402e15c046f8e4203e38ef04d5aeaa0..387bbed2de376393513139a8062a5e9829cecbb1 100644 (file)
--- 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 51193fd20568b65ac1255488f531d26cefdef9d9..f8a8bc18fe208eeeda81429cd83686635da535fe 100644 (file)
Binary files a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings and b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings differ

diff --git a/Mac/OSXResources/framework/English.lproj/InfoPlist.strings b/Mac/OSXResources/framework/English.lproj/InfoPlist.strings
index 954066a348d201097f4ca021e1b7675687e8de86..cc24bfcf3efeb37ea20d8492f19c0dde6b279047 100644 (file)
Binary files a/Mac/OSXResources/framework/English.lproj/InfoPlist.strings and b/Mac/OSXResources/framework/English.lproj/InfoPlist.strings differ

diff --git a/Mac/OSXResources/framework/version.plist b/Mac/OSXResources/framework/version.plist
index 4c28ffa0351c0fdf5a0f8bab59475153970441c5..7527442ab20e7b3105cfcd2766d62c4e05ef0338 100644 (file)
--- 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 d61e00fc9460c13aec7ef66b3bd7ae22b17d1693..a79dee17d178248c8a3b28bacce6ab0853e90cb1 100644 (file)
--- 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 0ba8f326344da37c51df9e17feb87dddd2d33f25..dd61c0c37321a61aeb79cbfaef36067a3d79fd8e 100644 (file)
--- 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 ec628817cf31165e4b615c734edbc9ebebe1aebc..0f142c9eb5c98bdba42950b5f44b499f7642d021 100644 (file)
--- 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>