From c5df56304172d2d825fab27db97e6e90660cf7ef Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sun, 19 Feb 2012 02:19:12 +0100
Subject: Issue #12627: Implement PEP 394 for OS X framework builds. OS X
 framework builds already created versioned symlinks for all executables and
 scripts installed in the framework bin directory, of the general form ${cmd}
 - ${cmd}2.7.  The changes here add a hierarchy of ${cmd} -> ${cmd}2 ->
 ${cmd}2.7.  Per previous practice, all of the links are created in the
 framework bin directory for both the install and altinstall targets.  This is
 consistent with the long-standing recommendation to manage multiple framework
 versions by adding and ordering framework bin directories on $PATH.  Also,
 per past practice, symlinks to all framework bin entries are created in
 $prefix/bin (by default, /usr/local/bin) for the install target and only
 versioned links are created for altinstall, although the use of these links
 is not recommended for framework builds and their installation is optional
 with the standard OS X installers.

---
 Mac/Makefile.in | 29 ++++++++++++++++++-----------
 Misc/NEWS       |  2 ++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 0e4e070..a6d78fb 100644
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -52,13 +52,17 @@ installapps: install_Python install_pythonw install_BuildApplet install_PythonLa
 install_pythonw: pythonw
 	$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)"
 	$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/python$(VERSION)"
-	ln -sf python$(VERSION) "$(DESTDIR)$(prefix)/bin/python"
-	ln -sf pythonw$(VERSION) "$(DESTDIR)$(prefix)/bin/pythonw"
+	ln -sf python$(VERSION) "$(DESTDIR)$(prefix)/bin/python2"
+	ln -sf python2 "$(DESTDIR)$(prefix)/bin/python"
+	ln -sf pythonw$(VERSION) "$(DESTDIR)$(prefix)/bin/pythonw2"
+	ln -sf pythonw2 "$(DESTDIR)$(prefix)/bin/pythonw"
 ifneq ($(LIPO_32BIT_FLAGS),)
 	lipo $(LIPO_32BIT_FLAGS) -output $(DESTDIR)$(prefix)/bin/python$(VERSION)-32 pythonw
 	lipo $(LIPO_32BIT_FLAGS) -output $(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-32 pythonw
-	ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python-32"
-	ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw-32"
+	ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python2-32"
+	ln -sf python2-32 "$(DESTDIR)$(prefix)/bin/python-32"
+	ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw2-32"
+	ln -sf pythonw2-32 "$(DESTDIR)$(prefix)/bin/pythonw-32"
 endif
 
 
@@ -71,6 +75,9 @@ installunixtools:
 		$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
 	fi
 	for fn in python pythonw idle pydoc python-config smtpd.py 2to3 \
+		  python2 pythonw2 idle2 \
+		  pydoc2 python2-config smtpd2.py \
+		  2to3-2 \
 		  python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
 		  pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py \
 		  2to3-$(VERSION) ;\
@@ -79,6 +86,7 @@ installunixtools:
 	done
 ifneq ($(LIPO_32BIT_FLAGS),)
 	for fn in python-32 pythonw-32 \
+		  python2-32 pythonw2-32 \
 		  python$(VERSION)-32 pythonw$(VERSION)-32 ;\
 	do \
 		ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
@@ -117,19 +125,18 @@ install_versionedtools:
 			continue ;\
 		fi ;\
 		mv "$(DESTDIR)$(prefix)/bin/$${fn}" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)"  ;\
-		ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}" ;\
+		ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}2" ;\
+		ln -sf "$${fn}2" "$(DESTDIR)$(prefix)/bin/$${fn}" ;\
 	done
-	if [ ! -h "$(DESTDIR)$(prefix)/bin/python-config" ]; then \
-		mv "$(DESTDIR)$(prefix)/bin/python-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\
-		ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python-config" ; \
-	fi
 	if [ ! -h "$(DESTDIR)$(prefix)/bin/smtpd.py" ]; then \
 		mv "$(DESTDIR)$(prefix)/bin/smtpd.py" "$(DESTDIR)$(prefix)/bin/smtpd$(VERSION).py"  ;\
-		ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd.py" ;\
+		ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd2.py" ;\
+		ln -sf "smtpd2.py" "$(DESTDIR)$(prefix)/bin/smtpd.py" ;\
 	fi
 	if [ ! -h "$(DESTDIR)$(prefix)/bin/2to3" ]; then \
 		mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)"  ;\
-		ln -sf "2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3" ;\
+		ln -sf "2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3-2" ;\
+		ln -sf "2to3-2" "$(DESTDIR)$(prefix)/bin/2to3" ;\
 	fi
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
index a02641f..22adf56 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -507,6 +507,8 @@ Extension Modules
 Build
 -----
 
+- Issue #12627: Implement PEP 394 for Python 2.7 ("python2").
+
 - Issue #8746: Correct faulty configure checks so that os.chflags() and
   os.lchflags() are once again built on systems that support these
   functions (*BSD and OS X).  Also add new stat file flags for OS X
-- 
cgit v0.12