From 39f79cf0b14472796945d8f880aeab0497384d8c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 Jan 2014 06:42:51 +0800 Subject: [PATCH 12/12] Add an option to disable IDLE IDLE is an IDE embedded into python, written using Tk, so it isn't very useful on embedded targets (which typically have no screen, and are anyway not used to do development on the target). Signed-off-by: Maxime Ripard Signed-off-by: Thomas Petazzoni --- Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ setup.py | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index a0181cd..8e07548 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1079,7 +1079,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 +ifeq (@IDLE@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) +endif -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) @@ -1127,7 +1129,6 @@ LIBSUBDIRS= \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ - idlelib idlelib/Icons \ distutils distutils/command \ importlib \ turtledemo \ @@ -1202,6 +1203,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif +ifeq (@IDLE@,yes) +LIBSUBDIRS += idlelib idlelib/Icons +endif + ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac index 79c0122..ea775c9 100644 --- a/configure.ac +++ b/configure.ac @@ -2708,6 +2708,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) +AC_SUBST(IDLE) + +AC_ARG_ENABLE(idle3, + AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]), + [ IDLE="${enableval}" ], [ IDLE=yes ]) + # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py index 575c2e8..0851e50 100644 --- a/setup.py +++ b/setup.py @@ -2185,11 +2185,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) - scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] + scripts = ['Lib/smtpd.py'] if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/pydoc3' ] if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/2to3' ] + if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/idle3' ] setup(# PyPI Metadata (PEP 301) name = "Python", -- 1.8.3.2