diff --git a/Mac/OSX/Dist/README.txt b/Mac/OSX/Dist/README.txt index 918b15de206..371c3fe99a7 100644 --- 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 db6e2fb1161..b5ebe3edbcf 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 @@ 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 a01725e7347..39a7b824210 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 @@ 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 b565ba82093..ec6bb1a4048 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 e5c7f9de22b..878b6d4b646 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 d6b7bed7040..387bbed2de3 100644 --- a/Mac/OSXResources/app/Info.plist +++ b/Mac/OSXResources/app/Info.plist @@ -20,7 +20,7 @@ CFBundleExecutable Python CFBundleGetInfoString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleHelpBookFolder Documentation @@ -37,17 +37,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleName Python CFBundlePackageType APPL CFBundleShortVersionString - 2.4alpha1 + 2.5alpha0 CFBundleSignature PytX CFBundleVersion - 2.4alpha1 + 2.5alpha0 CSResourcesFileMapped LSRequiresCarbon diff --git a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings index 51193fd2056..f8a8bc18fe2 100644 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 954066a348d..cc24bfcf3ef 100644 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 4c28ffa0351..7527442ab20 100644 --- a/Mac/OSXResources/framework/version.plist +++ b/Mac/OSXResources/framework/version.plist @@ -5,9 +5,9 @@ BuildVersion 1 CFBundleShortVersionString - 2.4alpha1 + 2.5alpha0 CFBundleVersion - 2.4alpha1 + 2.5alpha0 ProjectName Python ReleaseStatus diff --git a/Mac/Tools/IDE/PackageManager.plist b/Mac/Tools/IDE/PackageManager.plist index d61e00fc946..a79dee17d17 100644 --- a/Mac/Tools/IDE/PackageManager.plist +++ b/Mac/Tools/IDE/PackageManager.plist @@ -10,7 +10,7 @@ CFBundleExecutable PackageManager CFBundleGetInfoString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleIconFile PackageManager.icns CFBundleIdentifier @@ -18,17 +18,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleName PythonIDE CFBundlePackageType APPL CFBundleShortVersionString - 2.4alpha1 + 2.5alpha0 CFBundleSignature Pide CFBundleVersion - 2.4alpha1 + 2.5alpha0 CSResourcesFileMapped LSRequiresCarbon diff --git a/Mac/Tools/IDE/PythonIDE.plist b/Mac/Tools/IDE/PythonIDE.plist index 0ba8f326344..dd61c0c3732 100644 --- a/Mac/Tools/IDE/PythonIDE.plist +++ b/Mac/Tools/IDE/PythonIDE.plist @@ -26,7 +26,7 @@ CFBundleExecutable PythonIDE CFBundleGetInfoString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleHelpBookFolder PythonDocumentation @@ -42,17 +42,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleName PythonIDE CFBundlePackageType APPL CFBundleShortVersionString - 2.4alpha1 + 2.5alpha0 CFBundleSignature Pide CFBundleVersion - 2.4alpha1 + 2.5alpha0 CSResourcesFileMapped LSRequiresCarbon diff --git a/Mac/scripts/BuildApplet.plist b/Mac/scripts/BuildApplet.plist index ec628817cf3..0f142c9eb5c 100644 --- a/Mac/scripts/BuildApplet.plist +++ b/Mac/scripts/BuildApplet.plist @@ -26,7 +26,7 @@ CFBundleExecutable BuildApplet CFBundleGetInfoString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleIconFile BuildApplet.icns CFBundleIdentifier @@ -34,17 +34,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.4alpha1, (c) 2004 Python Software Foundation. + 2.5alpha0, (c) 2004 Python Software Foundation. CFBundleName PythonIDE CFBundlePackageType APPL CFBundleShortVersionString - 2.4alpha1 + 2.5alpha0 CFBundleSignature Pide CFBundleVersion - 2.4alpha1 + 2.5alpha0 CSResourcesFileMapped LSRequiresCarbon