mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-22 16:33:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix for issue 9392: without this patch a framework build will not install

Browse source 
2to3-2.7, while a versioned copy is installed of other tools and a versioned copy of2to3 is installed by python 2.6, 3.1 and the 3.2 alpha.
This commit is contained in:
Ronald Oussoren 2010-07-29 13:18:19 +00:00
parent a4f79f97db
commit 0969c67bf5
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mac/Makefile.in
View file

@ -70,9 +70,10 @@ installunixtools:
if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \ if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\ $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
fi fi
for fn in python pythonw idle pydoc python-config smtpd.py \ for fn in python pythonw idle pydoc python-config smtpd.py 2to3 \
python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py ;\ pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py \
2to3-$(VERSION) ;\
do \ do \
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
done done
@ -90,6 +91,7 @@ altinstallunixtools:
do \ do \
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
done done
ln -fs "$(prefix)/bin/2to3-$(VERSION)" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/2to3-$(VERSION)" ;\
# By default most tools are installed without a version in their basename, to # By default most tools are installed without a version in their basename, to
# make it easier to install (and use) several python versions side-by-side move # make it easier to install (and use) several python versions side-by-side move
@ -112,6 +114,10 @@ install_versionedtools:
mv "$(DESTDIR)$(prefix)/bin/smtpd.py" "$(DESTDIR)$(prefix)/bin/smtpd$(VERSION).py" ;\ 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/smtpd.py" ;\
fi 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" ;\
fi
pythonw: $(srcdir)/Tools/pythonw.c Makefile pythonw: $(srcdir)/Tools/pythonw.c Makefile

2
Misc/NEWS
View file

@ -83,6 +83,8 @@ Build
- Issue #9275: The OSX installer once again installs links to binaries in ``/usr/local/bin`` - Issue #9275: The OSX installer once again installs links to binaries in ``/usr/local/bin``
- Issue #9392: A framework build on OSX will once again use a versioned name of the ``2to3`` tool, that is you can use ``2to3-2.7`` to select the Python 2.7 edition of 2to3.
Tests Tests
----- -----