From: Jack Jansen Date: Mon, 27 Dec 2004 16:41:57 +0000 (+0000) Subject: - Changed version numbers to get ready for 2.3.5 X-Git-Tag: v2.3.5c1~53 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f96a57e4e3c9ece539831a240bdfa07deccfaa6f;p=thirdparty%2FPython%2Fcpython.git - Changed version numbers to get ready for 2.3.5 - Various of the mods to build the 3rd MacPython additions (but not all). --- diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build index 532f50a556a1..b5e09e111c2d 100755 --- a/Mac/OSX/Dist/build +++ b/Mac/OSX/Dist/build @@ -5,7 +5,7 @@ # TODO: Parameterize the versions, builddirs, etc... # Script configs -PYVERSION=2.3.2 +PYVERSION=2.3.5 PYVER=2.3 BUILDNUM=1 DOCLEANUP=no diff --git a/Mac/OSX/Dist/build.panther b/Mac/OSX/Dist/build.panther index e97ea1cf5647..812b0f59d562 100755 --- a/Mac/OSX/Dist/build.panther +++ b/Mac/OSX/Dist/build.panther @@ -8,7 +8,7 @@ # Script configs PYVERSION=2.3 PYVER=2.3 -BUILDNUM=2 +BUILDNUM=3 DOCLEANUP=no PROGDIR="`dirname \"$0\"`" diff --git a/Mac/OSX/Dist/resources.panther/ReadMe.txt b/Mac/OSX/Dist/resources.panther/ReadMe.txt index 80c41dea9bf7..c660fc8e372b 100644 --- a/Mac/OSX/Dist/resources.panther/ReadMe.txt +++ b/Mac/OSX/Dist/resources.panther/ReadMe.txt @@ -1,4 +1,4 @@ -This package will install the second build of +This package will install the third build of the MacPython 2.3 additions for Mac OS X 10.3. Installation requires approximately 3.3 MB of disk @@ -21,6 +21,20 @@ The PythonIDE application has a Help command that gets you started quickly with MacPython and contains references to other documentation. +Changes since the second build: +- Package Manager has been updated to version 0.4: + - added commands to open database description page + and standard experimental database. + - the scrollbar had a mind of its own. Fixed. + - show all packages in case of an error message. + - easier maintainance (mainly important for me:-) + in the light of micro-releases of OSX. +- IDE fixes: + - better handling of various end-of-line schemes. + - fixed "run with commandline python" to use pythonw. + - fixed a crash with very big scripts folders. + - fixed the double-scroll problem when you single-clicked. + Changes since the first build: - The startup crash of the IDE some people experienced has been fixed. The IDE Scripts folder is now in diff --git a/Mac/OSX/Dist/resources.panther/Welcome.rtf b/Mac/OSX/Dist/resources.panther/Welcome.rtf index 6c591c28c925..017e7d1fa265 100644 --- a/Mac/OSX/Dist/resources.panther/Welcome.rtf +++ b/Mac/OSX/Dist/resources.panther/Welcome.rtf @@ -4,7 +4,7 @@ \paperw11904\paperh16835\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 the second build of the +\f0\fs24 \cf0 This package will install the third build of the \f1\b MacPython 2.3 \f0\b0 additions for \f1\b Mac OS X 10.3 diff --git a/Mac/OSX/Dist/resources/ReadMe.txt b/Mac/OSX/Dist/resources/ReadMe.txt index a01725e73476..d0aea205ac8e 100644 --- a/Mac/OSX/Dist/resources/ReadMe.txt +++ b/Mac/OSX/Dist/resources/ReadMe.txt @@ -1,6 +1,7 @@ -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.3.5 for Mac OS X +10.2. Installation on the Panther (10.3) works but may +interfere with operation of Apple-installed Python. +Installation 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. diff --git a/Mac/OSX/Dist/resources/Welcome.rtf b/Mac/OSX/Dist/resources/Welcome.rtf index b565ba82093a..9338fd2a31e7 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.3.5 \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.\ +\f0\b0 . Installation on Panther (10.3) works, but may interfere with Apple-installed Python. Installation 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).\ \ diff --git a/Mac/OSX/Makefile.panther b/Mac/OSX/Makefile.panther index 624cdf44a262..2dff9159fea1 100644 --- a/Mac/OSX/Makefile.panther +++ b/Mac/OSX/Makefile.panther @@ -3,7 +3,7 @@ # ommitted from Apple's installation of Python 2.3. # all: install_waste install_IDE install_PackageManager install_IDLE \ - install_BuildApplet installextras install_PythonLauncher + install_BuildApplet installextras install_PythonLauncher install_pimpupdate VERSION=2.3 DESTDIR= @@ -52,4 +52,7 @@ installextras: install_PythonLauncher: ln -fsn $(APPLE_PYTHONLAUNCHER) $(DESTDIR)$(PYTHONAPPSDIR)/PythonLauncher - \ No newline at end of file + +install_pimpupdate: + cp ../../Lib/plat-mac/pimp.py $(DESTDIR)/Library/Python/2.3/pimp_update.py + diff --git a/Mac/OSXResources/app/Info.plist b/Mac/OSXResources/app/Info.plist index d961976af169..8234a28baca5 100644 --- a/Mac/OSXResources/app/Info.plist +++ b/Mac/OSXResources/app/Info.plist @@ -21,13 +21,13 @@ Python CFBundleGetInfoString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. CFBundleLongVersionString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. NSHumanReadableCopyright - Copyright 2003 Python Software Foundation. + Copyright 2004 Python Software Foundation. CFBundleShortVersionString - 2.3.2 + 2.3.5 CFBundleHelpBookFolder @@ -52,7 +52,7 @@ CFBundleSignature PytX CFBundleVersion - 2.3.2 + 2.3.5 LSRequiresCarbon CSResourcesFileMapped diff --git a/Mac/OSXResources/framework/version.plist b/Mac/OSXResources/framework/version.plist index a5169f89ffd8..7cab2721d086 100644 --- a/Mac/OSXResources/framework/version.plist +++ b/Mac/OSXResources/framework/version.plist @@ -5,14 +5,14 @@ BuildVersion 1 CFBundleShortVersionString - 2.3.2 + 2.3.5 CFBundleVersion - 2.3.2 + 2.3.5 ProjectName Python ReleaseStatus final SourceVersion - 2.3.2 + 2.3.5 diff --git a/Mac/Tools/IDE/PackageManager.plist b/Mac/Tools/IDE/PackageManager.plist index 9d582d6a3d96..ba88bfea561c 100644 --- a/Mac/Tools/IDE/PackageManager.plist +++ b/Mac/Tools/IDE/PackageManager.plist @@ -11,13 +11,13 @@ PackageManager CFBundleGetInfoString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. CFBundleLongVersionString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. NSHumanReadableCopyright - Copyright 2003 Python Software Foundation. + Copyright 2004 Python Software Foundation. CFBundleShortVersionString - 2.3.2 + 2.3.5 CFBundleIconFile PackageManager.icns @@ -32,7 +32,7 @@ CFBundleSignature Pide CFBundleVersion - 2.3.2 + 2.3.5 LSRequiresCarbon CSResourcesFileMapped diff --git a/Mac/Tools/IDE/PythonIDE.plist b/Mac/Tools/IDE/PythonIDE.plist index 37956d58a581..bf1388b0b69b 100644 --- a/Mac/Tools/IDE/PythonIDE.plist +++ b/Mac/Tools/IDE/PythonIDE.plist @@ -27,13 +27,13 @@ PythonIDE CFBundleGetInfoString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. CFBundleLongVersionString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. NSHumanReadableCopyright - Copyright 2003 Python Software Foundation. + Copyright 2004 Python Software Foundation. CFBundleShortVersionString - 2.3.2 + 2.3.5 CFBundleHelpBookFolder @@ -57,7 +57,7 @@ CFBundleSignature Pide CFBundleVersion - 2.3.2 + 2.3.5 LSRequiresCarbon CSResourcesFileMapped diff --git a/Mac/scripts/BuildApplet.plist b/Mac/scripts/BuildApplet.plist index 1301dd467d21..6d6a04cfe47e 100644 --- a/Mac/scripts/BuildApplet.plist +++ b/Mac/scripts/BuildApplet.plist @@ -27,13 +27,13 @@ BuildApplet CFBundleGetInfoString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. CFBundleLongVersionString - 2.3.2, (c) 2003 Python Software Foundation. + 2.3.5, (c) 2004 Python Software Foundation. NSHumanReadableCopyright - Copyright 2003 Python Software Foundation. + Copyright 2004 Python Software Foundation. CFBundleShortVersionString - 2.3.2 + 2.3.5 CFBundleIconFile BuildApplet.icns @@ -48,7 +48,7 @@ CFBundleSignature Pide CFBundleVersion - 2.3.2 + 2.3.5 LSRequiresCarbon CSResourcesFileMapped