mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Adapt framework install makefiles to 2to3 tool 

* Re-enable installation of files in /usr/local/bin in the OSX installer
  because those files no longer clash with a 2.x install.
This commit is contained in:
Ronald Oussoren 2009-05-26 21:18:59 +00:00
parent 220a9fbde4
commit afbca49cbe
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/idlelib/configDialog.py
View File

@ -1104,6 +1104,7 @@ def SaveAllChangedConfigs(self):
def DeactivateCurrentConfig(self): def DeactivateCurrentConfig(self):
#Before a config is saved, some cleanup of current #Before a config is saved, some cleanup of current
#config must be done - remove the previous keybindings #config must be done - remove the previous keybindings
print self.parent, type(self.parent)
winInstances = self.parent.instance_dict.keys() winInstances = self.parent.instance_dict.keys()
for instance in winInstances: for instance in winInstances:
instance.RemoveKeybindings() instance.RemoveKeybindings()

2
Mac/BuildScript/build-installer.py
View File

@ -225,7 +225,7 @@ def library_recipes():
is not necessary to use Python. is not necessary to use Python.
""", """,
required=False, required=False,
selected='unselected', selected='selected',
), ),
dict( dict(
name="PythonDocumentation", name="PythonDocumentation",

7
Mac/Makefile.in
View File

@ -91,7 +91,8 @@ installunixtools:
fi fi
for fn in python3 pythonw3 idle3 pydoc3 python3-config \ for fn in python3 pythonw3 idle3 pydoc3 python3-config \
python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
pydoc$(VERSION) python$(VERSION)-config ;\ pydoc$(VERSION) python$(VERSION)-config 2to3 \
2to3-$(VERSION) ;\
do \ do \
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
done done
@ -109,7 +110,7 @@ altinstallunixtools:
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\ $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
fi fi
for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
pydoc$(VERSION) python$(VERSION)-config ;\ pydoc$(VERSION) python$(VERSION)-config 2to3-$(VERSION);\
do \ do \
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
done done
@ -130,6 +131,8 @@ install_versionedtools:
mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\ mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\
ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\ ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\
done done
mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)"
ln -sf "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3"
if [ ! -h "$(DESTDIR)$(prefix)/bin/python3-config" ]; then \ if [ ! -h "$(DESTDIR)$(prefix)/bin/python3-config" ]; then \
mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\ mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\
ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \ ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \