* 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.

diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
index 20ed8278b535cd0c02e5aa8873d3993062dcf8cb..2ce87d75a0c85bdc9614b9c52921a50f39434dfc 100644 (file)
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -1104,6 +1104,7 @@ class ConfigDialog(Toplevel):
     def DeactivateCurrentConfig(self):
         #Before a config is saved, some cleanup of current
         #config must be done - remove the previous keybindings
+        print self.parent, type(self.parent)
         winInstances = self.parent.instance_dict.keys()
         for instance in winInstances:
             instance.RemoveKeybindings()

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 3cd9d2dfa59223643ea39aa16362f791a5ef252b..d6a8618e9743f3c11e72a3f1e5416aafe2ddc643 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -225,7 +225,7 @@ PKG_RECIPES = [
             is not necessary to use Python.
             """,
         required=False,
-        selected='unselected',
+        selected='selected',
     ),
     dict(
         name="PythonDocumentation",

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 4d55e4b5661d131dfe64c10c226c0b26418198d6..7d88c4a0d34602f45c557d9a45a0f14839419218 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -91,7 +91,8 @@ installunixtools:
        fi
        for fn in python3 pythonw3 idle3 pydoc3 python3-config \
                  python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
-                 pydoc$(VERSION) python$(VERSION)-config ;\
+                 pydoc$(VERSION) python$(VERSION)-config 2to3 \
+                 2to3-$(VERSION) ;\
        do \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
@@ -109,7 +110,7 @@ altinstallunixtools:
                $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
        fi
        for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
-                 pydoc$(VERSION) python$(VERSION)-config ;\
+                 pydoc$(VERSION) python$(VERSION)-config 2to3-$(VERSION);\
        do \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
@@ -130,6 +131,8 @@ install_versionedtools:
                mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)"  ;\
                ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\
        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 \
                mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\
                ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \