From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sat, 1 Nov 2003 23:14:41 +0000 (+0000)
Subject: Allow for the documentation to be inside PythonIDE as well as in
X-Git-Tag: v2.3.3c1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8759ee97c6c0e11f822fd38e37dd3113ff3953f8;p=thirdparty%2FPython%2Fcpython.git

Allow for the documentation to be inside PythonIDE as well as in
the Python.app inside the framework (the original location for 2.3).

This enables us to install the documentation on Panther too.
---

diff --git a/Mac/Tools/IDE/PythonIDE.plist b/Mac/Tools/IDE/PythonIDE.plist
index 5c33965d829d..37956d58a581 100644
--- a/Mac/Tools/IDE/PythonIDE.plist
+++ b/Mac/Tools/IDE/PythonIDE.plist
@@ -35,6 +35,15 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.3.2</string>
 
+	<key>CFBundleHelpBookFolder</key>
+	<array>
+		<string>PythonDocumentation</string>
+	</array>
+	<key>CFBundleHelpBookName</key>
+	<string>Python Help</string>
+	<key>CFBundleHelpTOCFile</key>
+	<string>index.html</string>
+
 	<key>CFBundleIconFile</key>
 	<string>PythonIDE.icns</string>
 	<key>CFBundleIdentifier</key>
diff --git a/Mac/Tools/IDE/PythonIDEMain.py b/Mac/Tools/IDE/PythonIDEMain.py
index 6641fcdfe4e9..3ad35b725f1f 100644
--- a/Mac/Tools/IDE/PythonIDEMain.py
+++ b/Mac/Tools/IDE/PythonIDEMain.py
@@ -37,7 +37,6 @@ class PythonIDE(Wapplication.Application):
 				home = os.getenv("HOME")
 				if home:
 					os.chdir(home)
-		print "We are in", os.getcwd()
 		self.preffilepath = os.path.join("Python", "PythonIDE preferences")
 		Wapplication.Application.__init__(self, 'Pide')
 		from Carbon import AE
@@ -455,11 +454,31 @@ class PythonIDE(Wapplication.Application):
 		# is located in the framework, but there's a symlink in Python.app.
 		# And as AHRegisterHelpBook wants a bundle (with the right bits in
 		# the plist file) we refer it to Python.app
+		#
+		# To make matters worse we have to look in two places: first in the IDE
+		# itself, then in the Python application inside the framework.
+		has_help = False
+		has_doc = False
+		ide_path_components = sys.argv[0].split("/")
+		if ide_path_components[-3:] == ["Contents", "Resources", "PythonIDE.py"]:
+			ide_app = "/".join(ide_path_components[:-3])
+			help_source = os.path.join(ide_app, 'Contents/Resources/English.lproj/Documentation')
+			doc_source = os.path.join(ide_app, 'Contents/Resources/English.lproj/PythonDocumentation')
+			has_help = os.path.isdir(help_source)
+			has_doc = os.path.isdir(doc_source)
+			if has_help or has_doc:
+				try:
+					from Carbon import AH
+					AH.AHRegisterHelpBook(ide_app)
+				except (ImportError, MacOS.Error), arg:
+					pass # W.Message("Cannot register Python Documentation: %s" % str(arg))
 		python_app = os.path.join(sys.prefix, 'Resources/Python.app')
-		help_source = os.path.join(python_app, 'Contents/Resources/English.lproj/Documentation')
-		doc_source = os.path.join(python_app, 'Contents/Resources/English.lproj/PythonDocumentation')
-		has_help = os.path.isdir(help_source)
-		has_doc = os.path.isdir(doc_source)
+		if not has_help:
+			help_source = os.path.join(python_app, 'Contents/Resources/English.lproj/Documentation')
+			has_help = os.path.isdir(help_source)
+		if not has_doc:
+			doc_source = os.path.join(python_app, 'Contents/Resources/English.lproj/PythonDocumentation')
+			has_doc = os.path.isdir(doc_source)
 		if has_help or has_doc:
 			try:
 				from Carbon import AH