Fixed lots of minor issues found by Edward Moy: incorrect version

strings, non-standard naming of things in bundles, etc.

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index c7a8b058ded0ba6e4ea70431a97e42daeeaac2f8..ecd200095273faee71014fb2440158b392a00a46 100644 (file)
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -106,7 +106,7 @@ install_Python:
                        esac; \
                done; \
        done
-       $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/python 
+       $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/Python 
        
 install_IDE:
        @if ! $(BUILDPYTHON) -c "import waste"; then  \

diff --git a/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj b/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj
index badee8785b5b176f39f217f7044ccd15328cd95d..06e45dc4fccb0b1004cd3ebee348fae140d5eac2 100755 (executable)
--- a/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj
+++ b/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj
@@ -132,7 +132,6 @@
                                4A9504D0FFE6A4CB11CA0CBA,
                                4A9504D1FFE6A4CB11CA0CBA,
                        );
-                       hasScannedForEncodings = 1;
                        isa = PBXProject;
                        mainGroup = 2A37F4AAFDCFA73011CA2CEA;
                        projectDirPath = "";
@@ -364,7 +363,7 @@
        <key>CFBundleExecutable</key>
        <string>PythonLauncher</string>
        <key>CFBundleGetInfoString</key>
-       <string>Python Launcher</string>
+       <string>2.3, © 2001-2003 Python Software Foundation</string>
        <key>CFBundleIconFile</key>
        <string>PythonInterpreter.icns</string>
        <key>CFBundleIdentifier</key>
@@ -372,13 +371,15 @@
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
-       <string>Python Launcher</string>
+       <string>PythonLauncher</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
+       <key>CFBundleShortVersionString</key>
+       <string>2.3</string>
        <key>CFBundleSignature</key>
        <string>PytL</string>
        <key>CFBundleVersion</key>
-       <string>2.3a0</string>
+       <string>2.3</string>
        <key>NSMainNibFile</key>
        <string>MainMenu</string>
        <key>NSPrincipalClass</key>
@@ -386,6 +387,7 @@
 </dict>
 </plist>
 ";
+                       shouldUseHeadermap = 0;
                };
                2A37F4C7FDCFA73011CA2CEA = {
                        buildActionMask = 2147483647;

diff --git a/Mac/OSXResources/app/Info.plist b/Mac/OSXResources/app/Info.plist
index c8fb6ee9d947b8d5b950d2c4586074e8e66fe1bd..0f74e122ed53a0cc0540cb8a7e45aa62bdf6a162 100644 (file)
--- a/Mac/OSXResources/app/Info.plist
+++ b/Mac/OSXResources/app/Info.plist
@@ -18,14 +18,14 @@
                </dict>
        </array>
        <key>CFBundleExecutable</key>
-       <string>python</string>
+       <string>Python</string>
 
        <key>CFBundleGetInfoString</key>
-       <string>Python Interpreter version 2.3, (c) 2002 Python Software Foundation.</string>
+       <string>2.3, (c) 2003 Python Software Foundation.</string>
        <key>CFBundleLongVersionString</key>
-       <string>2.3, (c) 2002 Python Software Foundation.</string>
+       <string>2.3, (c) 2003 Python Software Foundation.</string>
        <key>NSHumanReadableCopyright</key>
-       <string>Copyright 2002 Python Software Foundation.</string>
+       <string>Copyright 2003 Python Software Foundation.</string>
        <key>CFBundleShortVersionString</key>
        <string>2.3</string>
 
@@ -57,5 +57,7 @@
     <true/>
        <key>CSResourcesFileMapped</key>
        <true/>
+       <key>NSAppleScriptEnabled</key>
+       <true/>
 </dict>
 </plist>

diff --git a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
index 5f8924e1261e7307a204e51a7ce88bb778643118..c1d1dfdcf0d4860017d5e441944607e54344b5d0 100644 (file)
--- a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
+++ b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
@@ -1,7 +1,7 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Python";
-CFBundleShortVersionString = "Python Interpreter version 2.3";
-CFBundleGetInfoString = "Python Interpreter version 2.3, (c) 2002 Python Software Foundation.";
-CFBundleLongVersionString = "2.3, (c) 2002 Python Software Foundation.";
-NSHumanReadableCopyright = "Copyright 2002 Python Software Foundation.";
+CFBundleShortVersionString = "2.3";
+CFBundleGetInfoString = "2.3, (c) 2003 Python Software Foundation.";
+CFBundleLongVersionString = "2.3, (c) 2003 Python Software Foundation.";
+NSHumanReadableCopyright = "Copyright 2003 Python Software Foundation.";

diff --git a/Mac/OSXResources/framework/English.lproj/InfoPlist.strings b/Mac/OSXResources/framework/English.lproj/InfoPlist.strings
index be3c641ed72ee54e48f72175c623f8619bdf9366..7f981a381a65d373625baa94f05ee57f524dade0 100644 (file)
--- a/Mac/OSXResources/framework/English.lproj/InfoPlist.strings
+++ b/Mac/OSXResources/framework/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Python";
-CFBundleShortVersionString = "2.2a1";
-CFBundleGetInfoString = "Python Runtime and Library";
+CFBundleShortVersionString = "2.3";
+CFBundleGetInfoString = "2.3, (c) 2003 Python Software Foundation";

diff --git a/Mac/OSXResources/framework/version.plist b/Mac/OSXResources/framework/version.plist
index 2a1913e3b955ec5dc73147cfde81570eb19da77c..21c314c2eaf8e4f96d0499a021523f87c0cb8f1e 100644 (file)
--- a/Mac/OSXResources/framework/version.plist
+++ b/Mac/OSXResources/framework/version.plist
@@ -5,14 +5,14 @@
        <key>BuildVersion</key>
        <string>1</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.2</string>
+       <string>2.3</string>
        <key>CFBundleVersion</key>
-       <string>Python 2.2</string>
+       <string>2.3</string>
        <key>ProjectName</key>
        <string>Python</string>
        <key>ReleaseStatus</key>
        <string>final</string>
        <key>SourceVersion</key>
-       <string>2.2</string>
+       <string>2.3</string>
 </dict>
 </plist>

diff --git a/Mac/Tools/IDE/PythonIDE.plist b/Mac/Tools/IDE/PythonIDE.plist
index 4a1a602d731c5e583c757cc72bbf38ec78aca373..8bebe3794676fa83cb6ac682cd83d93f10aef587 100644 (file)
--- a/Mac/Tools/IDE/PythonIDE.plist
+++ b/Mac/Tools/IDE/PythonIDE.plist
@@ -24,14 +24,14 @@
                </dict>
        </array>
        <key>CFBundleExecutable</key>
-       <string>python</string>
+       <string>PythonIDE</string>
 
        <key>CFBundleGetInfoString</key>
-       <string>Python IDE version 2.3, (c) 2002 Python Software Foundation.</string>
+       <string>2.3, (c) 2003 Python Software Foundation.</string>
        <key>CFBundleLongVersionString</key>
-       <string>2.3, (c) 2002 Python Software Foundation.</string>
+       <string>2.3, (c) 2003 Python Software Foundation.</string>
        <key>NSHumanReadableCopyright</key>
-       <string>Copyright 2002 Python Software Foundation.</string>
+       <string>Copyright 2003 Python Software Foundation.</string>
        <key>CFBundleShortVersionString</key>
        <string>2.3</string>