From: Ned Deily Date: Thu, 23 Aug 2012 06:34:13 +0000 (-0700) Subject: Issue #15645: Ensure 2to3 grammar pickles are properly installed. X-Git-Tag: v3.3.0rc1~32 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fc81d7eec3d3ee412fcfd4b0719e825c9b94f4a;p=python Issue #15645: Ensure 2to3 grammar pickles are properly installed. (Patch by Ronald Oussoren) --- diff --git a/Makefile.pre.in b/Makefile.pre.in index adffa03865..f715711d9e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1017,6 +1017,8 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ venv venv/scripts venv/scripts/posix \ curses pydoc_data $(MACHDEPS) libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \ @@ -1094,8 +1096,6 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): @@ -1340,7 +1340,7 @@ clean: pycremoval find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' find build -name 'fficonfig.h' -exec rm -f {} ';' || true find build -name 'fficonfig.py' -exec rm -f {} ';' || true - -rm -f Lib/lib2to3/*Grammar*.pickle + -rm -f $(srcdir)/Lib/lib2to3/*Grammar*.pickle -rm -f $(SYSCONFIGDATA) -rm -f Modules/_testembed Modules/_freeze_importlib diff --git a/Misc/NEWS b/Misc/NEWS index 16442cca91..2b872d2ee4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -105,6 +105,11 @@ Tests - Issue #15615: Add some tests for the json module's handling of invalid input data. Patch by Kushal Das. +Build +----- + +- Issue #15645: Ensure 2to3 grammar pickles are properly installed. + What's New in Python 3.3.0 Beta 2? ==================================