Merged revisions 65368 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65368 | martin.v.loewis | 2008-08-01 16:10:26 +0200 (Fr, 01 Aug 2008) | 3 lines

  Generate the PatternGrammar pickle during "make install".
  Fixes part of #3131.
........
This commit is contained in:
Martin v. Löwis 2008-08-01 14:15:22 +00:00
parent 4aab7119b7
commit 4fe5ed8f25
2 changed files with 14 additions and 1 deletions

View File

@ -890,7 +890,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
-d $(LIBDEST)/site-packages -f \ -d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram" ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
# Create the PLATDIR source directory, if one wasn't distributed.. # Create the PLATDIR source directory, if one wasn't distributed..
$(srcdir)/Lib/$(PLATDIR): $(srcdir)/Lib/$(PLATDIR):

View File

@ -26,9 +26,22 @@ Library
file name rather than a ZipInfo instance, so files are extracted with file name rather than a ZipInfo instance, so files are extracted with
mode 0600 rather than 000 under Unix. mode 0600 rather than 000 under Unix.
<<<<<<< .working
- Issue #2523: Fix quadratic behaviour when read()ing a binary file without - Issue #2523: Fix quadratic behaviour when read()ing a binary file without
asking for a specific length. asking for a specific length.
=======
Build
-----
>>>>>>> .merge-right.r65368
<<<<<<< .working
=======
- Generate the PatternGrammar pickle during "make install".
What's New in Python 2.6 beta 2?
================================
>>>>>>> .merge-right.r65368
What's new in Python 3.0b2? What's new in Python 3.0b2?
=========================== ===========================