[Python-checkins] r72779 - in python/branches/py3k/Mac: BuildScript BuildScript/build-installer.py Makefile.in Resources/app/Resources/English.lproj

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue May 19 13:27:25 2009
New Revision: 72779

Log:
MACOSX

* Remove junk documentation resources from the Python.app inside the framework
  (This is a left-over from the ancient Python IDE, which was removed before 2.5)
* Ensure that the documentation is installed in a location where IDLE will see it


Removed:
   python/branches/py3k/Mac/Resources/app/Resources/English.lproj/
Modified:
   python/branches/py3k/Mac/BuildScript/   (props changed)
   python/branches/py3k/Mac/BuildScript/build-installer.py
   python/branches/py3k/Mac/Makefile.in

Modified: python/branches/py3k/Mac/BuildScript/build-installer.py
==============================================================================
--- python/branches/py3k/Mac/BuildScript/build-installer.py	(original)
+++ python/branches/py3k/Mac/BuildScript/build-installer.py	Tue May 19 13:27:25 2009
@@ -614,10 +614,9 @@
     runCommand('make update')
     runCommand('make html')
     os.chdir(curDir)
-    if not os.path.exists(docdir):
-        os.mkdir(docdir)
-    os.rename(os.path.join(buildDir, 'build', 'html'),
-            os.path.join(docdir, 'python-docs-html'))
+    if os.path.exists(docdir):
+        os.rmdir(docdir)
+    os.rename(os.path.join(buildDir, 'build', 'html'), docdir)
 
 
 def buildPython():
@@ -663,7 +662,7 @@
     runCommand("make")
 
     print "Running make frameworkinstall"
-    runCommand("make frameworkinstall DESTDIR=%s"%(
+    runCommand("make install DESTDIR=%s"%(
         shellQuote(rootDir)))
 
     print "Running make frameworkinstallextras"

Modified: python/branches/py3k/Mac/Makefile.in
==============================================================================
--- python/branches/py3k/Mac/Makefile.in	(original)
+++ python/branches/py3k/Mac/Makefile.in	Tue May 19 13:27:25 2009
@@ -38,12 +38,7 @@
 CPMAC=/Developer/Tools/CpMac
 
 APPTEMPLATE=$(srcdir)/Resources/app
-APPSUBDIRS=MacOS Resources Resources/English.lproj \
-	Resources/English.lproj/Documentation \
-	Resources/English.lproj/Documentation/doc \
-	Resources/English.lproj/Documentation/ide
-DOCDIR=$(srcdir)/Resources/app/Resources/English.lproj/Documentation
-DOCINDEX=$(DOCDIR)/"Documentation idx"
+APPSUBDIRS=MacOS Resources 
 compileall=$(srcdir)/../Lib/compileall.py
 
 installapps: install_Python install_PythonLauncher install_IDLE \
@@ -157,9 +152,6 @@
 	cd PythonLauncher && make install DESTDIR=$(DESTDIR)
 
 install_Python:
-	@if test ! -f $(DOCINDEX); then \
-		echo WARNING: you should run Apple Help Indexing Tool on $(DOCDIR); \
-	fi
 	@for i in "$(PYTHONAPPSDIR)" "$(APPINSTALLDIR)" "$(APPINSTALLDIR)/Contents"; do \
 		if test ! -d "$(DESTDIR)$$i"; then \
 			echo "Creating directory $(DESTDIR)$$i"; \