diff options
| author | Ned Deily <nad@acm.org> | 2012-08-23 06:27:26 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2012-08-23 06:27:26 (GMT) |
| commit | 01d183732ef458e046c3c3d16282120aa4fe3136 (patch) | |
| tree | ef82ec64d13ada52a6883479db321b04d62576c6 | |
| parent | eb61f8b3a726a8cd1ae3bc3794623e7fe4dd5703 (diff) | |
| download | cpython-01d183732ef458e046c3c3d16282120aa4fe3136.zip cpython-01d183732ef458e046c3c3d16282120aa4fe3136.tar.gz cpython-01d183732ef458e046c3c3d16282120aa4fe3136.tar.bz2 | |
Issue #15645: Ensure 2to3 grammar pickles are properly installed.
(Patch by Ronald Oussoren)
| -rw-r--r-- | Makefile.pre.in | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index e5c2a3f..318bbad 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -937,6 +937,8 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ unittest unittest/test \ curses pydoc_data $(MACHDEPS) libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \ @@ -1014,8 +1016,6 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c ./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): @@ -1256,7 +1256,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 Modules/_testembed profile-removal: @@ -482,6 +482,8 @@ Tests Build ----- +- Issue #15645: Ensure 2to3 grammar pickles are properly installed. + - Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. - Issue #8847: Disable COMDAT folding in Windows PGO builds. |