[Python-checkins] cpython (3.2): Issue #15645: Ensure 2to3 grammar pickles are properly installed.
ned.deily
python-checkins at python.org
Thu Aug 23 08:36:57 CEST 2012
http://hg.python.org/cpython/rev/a377a4298b4e
changeset: 78715:a377a4298b4e
branch: 3.2
parent: 78703:526c6262d91f
user: Ned Deily <nad at acm.org>
date: Wed Aug 22 23:27:26 2012 -0700
summary:
Issue #15645: Ensure 2to3 grammar pickles are properly installed.
(Patch by Ronald Oussoren)
files:
Makefile.pre.in | 6 +++---
Misc/NEWS | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -937,6 +937,8 @@
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 @@
./$(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 @@
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:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -482,6 +482,8 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list