From 38b7f7949258aeadf8bc45525be91340bb732a2a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc It removes 0.5 MB of data from the target plus the pydoc script itself. Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett --- Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ setup.py | 9 +++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index c1cfb96767..403380e181 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1864,7 +1864,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 +ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) +endif -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ @@ -1915,7 +1917,6 @@ LIBSUBDIRS= asyncio \ lib2to3 lib2to3/fixes lib2to3/pgen2 \ logging \ multiprocessing multiprocessing/dummy \ - pydoc_data \ re \ site-packages \ sqlite3 \ @@ -2008,6 +2009,10 @@ TESTSUBDIRS= ctypes/test \ tkinter/test/test_ttk \ unittest/test unittest/test/testmock +ifeq (@PYDOC@,yes) +LIBSUBDIRS += pydoc_data +endif + TEST_MODULES=@TEST_MODULES@ libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac index 5a6a1fe608..f68ea72321 100644 --- a/configure.ac +++ b/configure.ac @@ -4171,6 +4171,12 @@ AS_VAR_IF([posix_threads], [stub], [ AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) ]) +AC_SUBST(PYDOC) + +AC_ARG_ENABLE(pydoc, + AS_HELP_STRING([--disable-pydoc], [disable pydoc]), + [ PYDOC="${enableval}" ], [ PYDOC=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 0e04944ce0..3e55f5b2e0 100644 --- a/setup.py +++ b/setup.py @@ -1593,6 +1593,12 @@ class DummyProcess: # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) + + scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', + 'Lib/smtpd.py'] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/pydoc3' ] + setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], @@ -1617,8 +1623,7 @@ class DummyProcess: # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in - scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", - "Tools/scripts/2to3"] + scripts = scripts ) # --install-platlib -- 2.34.1