From dd614fdc51fca690be1d7c1f44d06e235f6ba1e7 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Fri, 4 Jul 2003 13:06:14 +0000 Subject: Fixed lots of minor issues found by Edward Moy: incorrect version strings, non-standard naming of things in bundles, etc. --- Mac/OSX/Makefile | 2 +- Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj | 10 ++++++---- Mac/OSXResources/app/Info.plist | 10 ++++++---- Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings | 8 ++++---- Mac/OSXResources/framework/English.lproj/InfoPlist.strings | 4 ++-- Mac/OSXResources/framework/version.plist | 6 +++--- Mac/Tools/IDE/PythonIDE.plist | 8 ++++---- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile index c7a8b05..ecd2000 100644 --- 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 badee87..06e45dc 100755 --- 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 @@ CFBundleExecutable PythonLauncher CFBundleGetInfoString - Python Launcher + 2.3, © 2001-2003 Python Software Foundation CFBundleIconFile PythonInterpreter.icns CFBundleIdentifier @@ -372,13 +371,15 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Python Launcher + PythonLauncher CFBundlePackageType APPL + CFBundleShortVersionString + 2.3 CFBundleSignature PytL CFBundleVersion - 2.3a0 + 2.3 NSMainNibFile MainMenu NSPrincipalClass @@ -386,6 +387,7 @@ "; + shouldUseHeadermap = 0; }; 2A37F4C7FDCFA73011CA2CEA = { buildActionMask = 2147483647; diff --git a/Mac/OSXResources/app/Info.plist b/Mac/OSXResources/app/Info.plist index c8fb6ee..0f74e12 100644 --- a/Mac/OSXResources/app/Info.plist +++ b/Mac/OSXResources/app/Info.plist @@ -18,14 +18,14 @@ CFBundleExecutable - python + Python CFBundleGetInfoString - Python Interpreter version 2.3, (c) 2002 Python Software Foundation. + 2.3, (c) 2003 Python Software Foundation. CFBundleLongVersionString - 2.3, (c) 2002 Python Software Foundation. + 2.3, (c) 2003 Python Software Foundation. NSHumanReadableCopyright - Copyright 2002 Python Software Foundation. + Copyright 2003 Python Software Foundation. CFBundleShortVersionString 2.3 @@ -57,5 +57,7 @@ CSResourcesFileMapped + NSAppleScriptEnabled + diff --git a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings index 5f8924e..c1d1dfd 100644 --- 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 be3c641..7f981a3 100644 --- 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 2a1913e..21c314c 100644 --- a/Mac/OSXResources/framework/version.plist +++ b/Mac/OSXResources/framework/version.plist @@ -5,14 +5,14 @@ BuildVersion 1 CFBundleShortVersionString - 2.2 + 2.3 CFBundleVersion - Python 2.2 + 2.3 ProjectName Python ReleaseStatus final SourceVersion - 2.2 + 2.3 diff --git a/Mac/Tools/IDE/PythonIDE.plist b/Mac/Tools/IDE/PythonIDE.plist index 4a1a602..8bebe37 100644 --- a/Mac/Tools/IDE/PythonIDE.plist +++ b/Mac/Tools/IDE/PythonIDE.plist @@ -24,14 +24,14 @@ CFBundleExecutable - python + PythonIDE CFBundleGetInfoString - Python IDE version 2.3, (c) 2002 Python Software Foundation. + 2.3, (c) 2003 Python Software Foundation. CFBundleLongVersionString - 2.3, (c) 2002 Python Software Foundation. + 2.3, (c) 2003 Python Software Foundation. NSHumanReadableCopyright - Copyright 2002 Python Software Foundation. + Copyright 2003 Python Software Foundation. CFBundleShortVersionString 2.3 -- cgit v0.12