[Python-checkins] r88374 - in python/branches/py3k: Mac/BuildScript/resources/ReadMe.txt Mac/Extras.ReadMe.txt Mac/Makefile.in Misc/NEWS
ned.deily
python-checkins at python.org
Mon Feb 7 17:44:19 CET 2011
Author: ned.deily
Date: Mon Feb 7 17:44:19 2011
New Revision: 88374
Log:
Issue #11079: The /Applications/Python x.x folder created by the Mac
OS X installers no longer includes an Extras directory. The Tools
directory is now installed in the framework under share/doc.
Removed:
python/branches/py3k/Mac/Extras.ReadMe.txt
Modified:
python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt
python/branches/py3k/Mac/Makefile.in
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt
==============================================================================
--- python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt (original)
+++ python/branches/py3k/Mac/BuildScript/resources/ReadMe.txt Mon Feb 7 17:44:19 2011
@@ -24,7 +24,7 @@
*******************
The installer puts applications, an "Update Shell Profile" command,
-and an Extras folder containing demo programs and tools into the
+and a link to the optionally installed Python Documentation into the
"Python $VERSION" subfolder of the system Applications folder,
and puts the underlying machinery into the folder
$PYTHONFRAMEWORKINSTALLDIR. It can
Deleted: python/branches/py3k/Mac/Extras.ReadMe.txt
==============================================================================
--- python/branches/py3k/Mac/Extras.ReadMe.txt Mon Feb 7 17:44:19 2011
+++ (empty file)
@@ -1,5 +0,0 @@
-This folder contains examples of Python usage and useful scripts and tools.
-
-You should be aware that these are not Macintosh-specific but are shared
-among Python on all platforms, so there are some that only run on Windows
-or Unix or another platform, and/or make little sense on a Macintosh.
Modified: python/branches/py3k/Mac/Makefile.in
==============================================================================
--- python/branches/py3k/Mac/Makefile.in (original)
+++ python/branches/py3k/Mac/Makefile.in Mon Feb 7 17:44:19 2011
@@ -177,11 +177,11 @@
$(INSTALLED_PYTHONAPP): install_Python
-installextras: $(srcdir)/Extras.ReadMe.txt $(srcdir)/Extras.install.py
- $(INSTALL) -d "$(DESTDIR)$(PYTHONAPPSDIR)/Extras"
- $(INSTALL) $(srcdir)/Extras.ReadMe.txt "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe.txt"
+installextras: $(srcdir)/Extras.install.py
+ $(INSTALL) -d "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples"
$(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/../Tools \
- "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Tools"
+ "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples/Tools" ; \
+ chmod -R ugo+rX,go-w "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples/Tools"
checkapplepython: $(srcdir)/Tools/fixapplepython23.py
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Mon Feb 7 17:44:19 2011
@@ -29,6 +29,11 @@
Build
-----
+- Issue #11079: The /Applications/Python x.x folder created by the Mac
+ OS X installers now includes a link to the installed documentation
+ and no longer includes an Extras directory. The Tools directory is
+ now installed in the framework under share/doc.
+
- Issue #11121: Fix building with --enable-shared.
Tests
More information about the Python-checkins
mailing list