- Install a symlink to the documentation (which lives in the framework)

  in Python.app, and refer to it in Info.plist. This makes Apple Help
  Viewer recognize the Python documentation.
- Changed the externally visible name of Python.app to "Python" (was PythonW).

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index ec51d029a383906148289c9e0a726bb1ccfe81f7..699407c62e8b3ff7eda44d586896365b385d3a9d 100644 (file)
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -25,6 +25,7 @@ INSTALL_SYMLINK=/usr/bin/install -l as
 INSTALL_PROGRAM=${INSTALL}
 INSTALL_SCRIPT= ${INSTALL_PROGRAM}
 INSTALL_DATA=  ${INSTALL} -m 644
+LN=ln
 STRIPFLAG=-s
 OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
        -fno-common -dynamic
@@ -116,6 +117,9 @@ install_Python: $(PYTHON)
        fi
        $(REZ) -useDF -o $(RESOURCEFILE) dialogs.r errors.r 
        $(INSTALL_DATA) $(RESOURCEFILE) $(APPINSTALLDIR)/Contents/Resources/$(RESOURCEFILE)
+# Finally create the documentation symlink
+       $(LN) -fsn ../../../../English.lproj/Documentation $(APPINSTALLDIR)/Contents/Resources/English.lproj/Documentation
+       
        
 install_IDE: $(INSTALLED_PYTHONW)
        @if $(INSTALLED_PYTHONW) -c "import waste"; then ; else \

diff --git a/Mac/OSXResources/app/Info.plist b/Mac/OSXResources/app/Info.plist
index 7fd5117aaf9b3c84209633013ebc4be5b19d515b..6022db7e39e2c2b281972b4987247b21612210d8 100644 (file)
--- a/Mac/OSXResources/app/Info.plist
+++ b/Mac/OSXResources/app/Info.plist
@@ -29,14 +29,21 @@
        <key>CFBundleShortVersionString</key>
        <string>2.3</string>
 
+       <key>CFBundleHelpBookFolder</key>
+       <string>Documentation</string>
+       <key>CFBundleHelpBookName</key>
+       <string>Python Help</string>
+       <key>CFBundleHelpTOCFile</key>
+       <string>index.html</string>
+
        <key>CFBundleIconFile</key>
        <string>PythonInterpreter.icns</string>
        <key>CFBundleIdentifier</key>
-       <string>org.python.pythonw</string>
+       <string>org.python.python</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
-       <string>PythonW</string>
+       <string>Python</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleSignature</key>

diff --git a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
index 20235b4b7aaca8a7cdef5671c85799a6231466aa..5f8924e1261e7307a204e51a7ce88bb778643118 100644 (file)
--- a/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
+++ b/Mac/OSXResources/app/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "PythonW";
+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.";